Skip to content

Commit 79f90f5

Browse files
kategenglerNullVoxPopuli
kategengler
authored and
NullVoxPopuli
committed
Update to 5.12
Keep ember-data at 4.6
1 parent aeb98b8 commit 79f90f5

13 files changed

Lines changed: 990 additions & 1933 deletions

File tree

‎.ember-cli‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

‎.eslintignore‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# data git checkout
2014
/ember-api-docs-data/
2115

2216
# ember-try
2317
/.node_modules.ember-try/
24-
/bower.json.ember-try
25-
/npm-shrinkwrap.json.ember-try
26-
/package.json.ember-try
27-
/package-lock.json.ember-try
28-
/yarn.lock.ember-try

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
cache: pnpm
3131
node-version: ${{ env.NODE_VERSION }}
3232
- name: Install Dependencies
33-
run: pnpm install
33+
run: pnpm install --frozen-lockfile
3434
- name: Lint
3535
run: pnpm run lint
3636

@@ -46,7 +46,7 @@ jobs:
4646
with:
4747
cache: pnpm
4848
node-version: ${{ env.NODE_VERSION }}
49-
- run: pnpm install
49+
- run: pnpm install --frozen-lockfile
5050
- run: pnpm run clone
5151
- name: Run Tests
5252
env:

‎.gitignore‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
3-
/concat-stats-for
4-
5-
# Terraform
6-
terraform.tfstate
7-
terraform.tfstate.backup
8-
.env
9-
.envrc
10-
111
# compiled output
122
/dist/
13-
/tmp/
3+
/declarations/
144

155
# dependencies
16-
/bower_components/
176
/node_modules/
187

198
# misc
20-
/.projectile
219
/.env*
2210
/.pnp*
23-
/.sass-cache
2411
/.eslintcache
25-
/connect.lock
2612
/coverage/
27-
/libpeerconnection.log
2813
/npm-debug.log*
2914
/testem.log
15+
/yarn-error.log
16+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/npm-shrinkwrap.json.ember-try
20+
/package.json.ember-try
21+
/package-lock.json.ember-try
22+
/yarn.lock.ember-try
23+
24+
# broccoli-debug
25+
/DEBUG/
26+
3027

3128
public/json-docs/
3229
public/rev-index/
@@ -39,14 +36,3 @@ local.log
3936
# ember-api-docs-data checkout
4037
/ember-api-docs-data/
4138
/ember-api-docs-data
42-
43-
# ember-try
44-
/.node_modules.ember-try/
45-
/bower.json.ember-try
46-
/npm-shrinkwrap.json.ember-try
47-
/package.json.ember-try
48-
/package-lock.json.ember-try
49-
/yarn.lock.ember-try
50-
51-
# broccoli-debug
52-
/DEBUG/

‎.prettierignore‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
1810

1911
# ember-try
2012
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
13+
14+
15+
.eslintcache
16+
.lint-todo/
2617

2718
# Misc files
2819
*.md

‎.watchmanconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎app/deprecation-workflow.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import setupDeprecationWorkflow from 'ember-cli-deprecation-workflow';
22

33
setupDeprecationWorkflow({
4-
throwOnUnhandled: true,
4+
throwOnUnhandled: false,
55
workflow: [
66
{ handler: 'throw', matchId: 'ember.component.reopen' },
77
{ handler: 'throw', matchId: 'implicit-injections' },

‎app/templates/project-version/classes/class.hbs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,31 +96,31 @@
9696
data-test-checkbox="inherited"
9797
type="checkbox"
9898
checked={{this.filterData.showInherited}}
99-
onchange={{action "updateFilter" "showInherited"}}>
99+
onchange={{fn this.updateFilter "showInherited"}}>
100100
Inherited
101101
</label>
102102
<label class="access-checkbox">
103103
<input id="protected-toggle"
104104
data-test-checkbox="protected"
105105
type="checkbox"
106106
checked={{this.filterData.showProtected}}
107-
onchange={{action "updateFilter" "showProtected"}}>
107+
onchange={{fn this.updateFilter "showProtected"}}>
108108
Protected
109109
</label>
110110
<label class="access-checkbox">
111111
<input id="private-toggle"
112112
data-test-checkbox="private"
113113
type="checkbox"
114114
checked={{this.filterData.showPrivate}}
115-
onchange={{action "updateFilter" "showPrivate"}}>
115+
onchange={{fn this.updateFilter "showPrivate"}}>
116116
Private
117117
</label>
118118
<label class="access-checkbox">
119119
<input id="deprecated-toggle"
120120
data-test-checkbox="deprecated"
121121
type="checkbox"
122122
checked={{this.filterData.showDeprecated}}
123-
onchange={{action "updateFilter" "showDeprecated"}}>
123+
onchange={{fn this.updateFilter "showDeprecated"}}>
124124
Deprecated
125125
</label>
126126
</section>
@@ -147,4 +147,4 @@
147147
</ApiIndex>
148148
</ApiIndexFilter>
149149
{{/if}}
150-
</div>
150+
</div>

‎config/ember-cli-update.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "4.12.3",
6+
"version": "5.12.0",
77
"blueprints": [
88
{
99
"name": "app",
1010
"outputRepo": "https://github.com/ember-cli/ember-new-output",
1111
"codemodsSource": "ember-app-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": ["--no-welcome", "--pnpm"]
13+
"options": [
14+
"--no-welcome",
15+
"--pnpm"
16+
]
1417
}
1518
]
1619
}

‎config/optional-features.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"application-template-wrapper": false,
33
"default-async-observers": true,
44
"jquery-integration": false,
5-
"template-only-glimmer-components": true
5+
"template-only-glimmer-components": true,
6+
"no-implicit-route-model": true
67
}

0 commit comments

Comments
 (0)