Skip to content

Commit 20dc10f

Browse files
ember-cli 4.3 (#224)
1 parent 1c776dc commit 20dc10f

File tree

17 files changed

+1505
-4014
lines changed

17 files changed

+1505
-4014
lines changed

.ember-cli

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55

66
Setting `disableAnalytics` to true will prevent any data from being sent.
77
*/
8-
"disableAnalytics": false
8+
"disableAnalytics": false,
9+
10+
/**
11+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
12+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
13+
*/
14+
"isTypeScriptProject": false
915
}

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,7 @@
1919
# ember-try
2020
/.node_modules.ember-try/
2121
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2223
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = {
5252
extends: ['plugin:node/recommended'],
5353
},
5454
{
55-
// Test files:
55+
// test files
5656
files: ['tests/**/*-test.{js,ts}'],
5757
extends: ['plugin:qunit/recommended'],
5858
rules: {

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
pull_request: {}
99

1010
concurrency:
11-
group: ci-${{ github.head_ref || github.ref }}
12-
cancel-in-progress: true
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
1515
test:
@@ -48,7 +48,7 @@ jobs:
4848
try-scenarios:
4949
name: ${{ matrix.try-scenario }}
5050
runs-on: ubuntu-latest
51-
needs: 'test'
51+
needs: "test"
5252

5353
strategy:
5454
fail-fast: false
@@ -60,7 +60,6 @@ jobs:
6060
- ember-beta
6161
- ember-canary
6262
- ember-classic
63-
- ember-default-with-jquery
6463
- embroider-safe
6564
- embroider-optimized
6665

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@
2424
/.node_modules.ember-try/
2525
/bower.json.ember-try
2626
/package.json.ember-try
27+
28+
# broccoli-debug
29+
/DEBUG/

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
/.eslintignore
1515
/.eslintrc.js
1616
/.git/
17+
/.github/
1718
/.gitignore
1819
/.prettierignore
1920
/.prettierrc.js
@@ -33,4 +34,7 @@
3334
# ember-try
3435
/.node_modules.ember-try/
3536
/bower.json.ember-try
37+
/npm-shrinkwrap.json.ember-try
3638
/package.json.ember-try
39+
/package-lock.json.ember-try
40+
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@
1414
/coverage/
1515
!.*
1616
.eslintcache
17+
.lint-todo/
1718

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
22+
/npm-shrinkwrap.json.ember-try
2123
/package.json.ember-try
24+
/package-lock.json.ember-try
25+
/yarn.lock.ember-try

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222
* `ember serve`
2323
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

25-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

config/ember-try.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,6 @@ module.exports = async function () {
4747
},
4848
},
4949
},
50-
{
51-
name: 'ember-default-with-jquery',
52-
env: {
53-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54-
'jquery-integration': true,
55-
}),
56-
},
57-
npm: {
58-
devDependencies: {
59-
'@ember/jquery': '^1.1.0',
60-
},
61-
},
62-
},
6350
{
6451
name: 'ember-classic',
6552
env: {

package.json

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
"test:ember-compatibility": "ember try:each"
3232
},
3333
"dependencies": {
34-
"broccoli-funnel": "^3.0.3",
34+
"broccoli-funnel": "^3.0.8",
3535
"broccoli-merge-trees": "^4.2.0",
36-
"ember-cli-babel": "^7.26.10",
37-
"ember-cli-htmlbars": "^5.7.2",
36+
"ember-cli-babel": "^7.26.11",
37+
"ember-cli-htmlbars": "^6.0.1",
3838
"fastboot-transform": "^0.1.3",
3939
"glob": "^7.1.6",
4040
"mock-socket": "^7.1.0",
@@ -44,13 +44,13 @@
4444
"devDependencies": {
4545
"@ember/optional-features": "^2.0.0",
4646
"@ember/test-helpers": "^2.6.0",
47-
"@embroider/test-setup": "^0.48.1",
47+
"@embroider/test-setup": "^1.5.0",
4848
"@glimmer/component": "^1.0.4",
4949
"@glimmer/tracking": "^1.0.4",
5050
"babel-eslint": "^10.1.0",
5151
"broccoli-asset-rev": "^3.0.0",
5252
"ember-auto-import": "^2.4.1",
53-
"ember-cli": "~3.28.5",
53+
"ember-cli": "~4.3.0",
5454
"ember-cli-code-coverage": "^1.0.3",
5555
"ember-cli-dependency-checker": "^3.2.0",
5656
"ember-cli-inject-live-reload": "^2.1.0",
@@ -59,25 +59,24 @@
5959
"ember-disable-prototype-extensions": "^1.1.3",
6060
"ember-export-application-global": "^2.0.1",
6161
"ember-load-initializers": "^2.1.2",
62-
"ember-maybe-import-regenerator": "^0.1.6",
63-
"ember-page-title": "^6.2.2",
62+
"ember-page-title": "^7.0.0",
6463
"ember-qunit": "^5.1.5",
6564
"ember-resolver": "^8.0.3",
66-
"ember-source": "~3.28.8",
65+
"ember-source": "~4.3.0",
6766
"ember-source-channel-url": "^3.0.0",
6867
"ember-template-lint": "^4.7.0",
69-
"ember-try": "^1.4.0",
68+
"ember-try": "^2.0.0",
7069
"eslint": "^7.32.0",
71-
"eslint-config-prettier": "^8.3.0",
72-
"eslint-plugin-ember": "^10.5.8",
70+
"eslint-config-prettier": "^8.5.0",
71+
"eslint-plugin-ember": "^10.5.9",
7372
"eslint-plugin-node": "^11.1.0",
74-
"eslint-plugin-prettier": "^3.4.1",
75-
"eslint-plugin-qunit": "^6.2.0",
73+
"eslint-plugin-prettier": "^4.0.0",
74+
"eslint-plugin-qunit": "^7.2.0",
7675
"loader.js": "^4.7.0",
7776
"npm-run-all": "^4.1.5",
78-
"prettier": "^2.5.1",
79-
"qunit": "^2.17.2",
80-
"qunit-dom": "^1.6.0",
77+
"prettier": "^2.6.1",
78+
"qunit": "^2.18.0",
79+
"qunit-dom": "^2.0.0",
8180
"release-it": "^14.2.1",
8281
"release-it-lerna-changelog": "^4.0.1",
8382
"webpack": "^5.72.1"

0 commit comments

Comments
 (0)