Skip to content

Commit 630bc98

Browse files
committed
ember-cli-update to 3.28.4
1 parent 5fa33d1 commit 630bc98

14 files changed

Lines changed: 1342 additions & 300 deletions

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
1617
.eslintcache
1718

1819
# ember-try

.eslintrc.js

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23-
'.eslintrc.js',
24-
'.prettierrc.js',
25-
'.template-lintrc.js',
26-
'ember-cli-build.js',
27-
'index.js',
28-
'testem.js',
29-
'blueprints/*/index.js',
30-
'config/**/*.js',
31-
'tests/dummy/config/**/*.js',
23+
'./.eslintrc.js',
24+
'./.prettierrc.js',
25+
'./.template-lintrc.js',
26+
'./ember-cli-build.js',
27+
'./index.js',
28+
'./testem.js',
29+
'./blueprints/*/index.js',
30+
'./config/**/*.js',
31+
'./tests/dummy/config/**/*.js',
3232
],
33-
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
3433
parserOptions: {
3534
sourceType: 'script',
3635
},
@@ -41,5 +40,10 @@ module.exports = {
4140
plugins: ['node'],
4241
extends: ['plugin:node/recommended'],
4342
},
43+
{
44+
// Test files:
45+
files: ['tests/**/*-test.{js,ts}'],
46+
extends: ['plugin:qunit/recommended'],
47+
},
4448
],
4549
};

.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/.eslintrc.js
1616
/.git/
1717
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1820
/.template-lintrc.js
1921
/.travis.yml
2022
/.watchmanconfig
@@ -24,6 +26,7 @@
2426
/ember-cli-build.js
2527
/testem.js
2628
/tests/
29+
/yarn-error.log
2730
/yarn.lock
2831
.gitkeep
2932

.template-lintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane',
4+
extends: 'recommended',
55
};

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "10"
6+
- "12"
77

88
dist: xenial
99

@@ -46,13 +46,15 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
5049
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.24
5151
- env: EMBER_TRY_SCENARIO=ember-release
5252
- env: EMBER_TRY_SCENARIO=ember-beta
5353
- env: EMBER_TRY_SCENARIO=ember-canary
5454
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5555
- env: EMBER_TRY_SCENARIO=ember-classic
56+
- env: EMBER_TRY_SCENARIO=embroider-safe
57+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5658

5759
before_install:
5860
- curl -o- -L https://yarnpkg.com/install.sh | bash

CONTRIBUTING.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
## Installation
44

55
* `git clone <repository-url>`
6-
* `cd my-addon`
7-
* `npm install`
6+
* `cd ember-basic-tree`
7+
* `yarn install`
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn run lint:hbs`
12+
* `yarn run lint:js`
13+
* `yarn run lint:js --fix`
1414

1515
## Running tests
1616

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ A customizable template-driven tree component
88
Compatibility
99
------------------------------------------------------------------------------
1010

11-
* Ember.js v3.16 or above
12-
* Ember CLI v2.13 or above
13-
* Node.js v10 or above
11+
* Ember.js v3.20 or above
12+
* Ember CLI v3.20 or above
13+
* Node.js v12 or above
1414

1515

1616
Installation

config/ember-try.js

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

56
module.exports = async function () {
67
return {
78
useYarn: true,
89
scenarios: [
910
{
10-
name: 'ember-lts-3.16',
11+
name: 'ember-lts-3.20',
1112
npm: {
1213
devDependencies: {
13-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.20.5',
1415
},
1516
},
1617
},
1718
{
18-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.24',
1920
npm: {
2021
devDependencies: {
21-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.24.3',
2223
},
2324
},
2425
},
@@ -69,11 +70,16 @@ module.exports = async function () {
6970
}),
7071
},
7172
npm: {
73+
devDependencies: {
74+
'ember-source': '~3.28.0',
75+
},
7276
ember: {
7377
edition: 'classic',
7478
},
7579
},
7680
},
81+
embroiderSafe(),
82+
embroiderOptimized(),
7783
],
7884
};
7985
};

ember-cli-build.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,12 @@ module.exports = function (defaults) {
1919
behave. You most likely want to be modifying `./index.js` or app's build file
2020
*/
2121

22-
return app.toTree();
22+
const { maybeEmbroider } = require('@embroider/test-setup');
23+
return maybeEmbroider(app, {
24+
skipBabel: [
25+
{
26+
package: 'qunit',
27+
},
28+
],
29+
});
2330
};

package.json

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"scripts": {
2020
"build": "ember build --environment=production",
21-
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
21+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
2222
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
2323
"lint:hbs": "ember-template-lint .",
2424
"lint:hbs:fix": "ember-template-lint . --fix",
@@ -31,36 +31,37 @@
3131
},
3232
"dependencies": {
3333
"ember-assign-helper": "^0.3.0",
34-
"ember-cli-babel": "^7.23.0",
35-
"ember-cli-htmlbars": "^5.3.1",
34+
"ember-cli-babel": "^7.26.6",
35+
"ember-cli-htmlbars": "^5.7.1",
3636
"ember-cli-sass": "^10.0.1",
3737
"ember-truth-helpers": "^3.0.0",
3838
"sass": "^1.32.5"
3939
},
4040
"devDependencies": {
4141
"@ember/optional-features": "^2.0.0",
42-
"@ember/test-helpers": "^2.1.4",
42+
"@ember/test-helpers": "^2.4.2",
43+
"@embroider/test-setup": "^0.43.5",
4344
"@fortawesome/ember-fontawesome": "^0.2.2",
4445
"@fortawesome/free-solid-svg-icons": "^5.15.2",
45-
"@glimmer/component": "^1.0.3",
46-
"@glimmer/tracking": "^1.0.3",
46+
"@glimmer/component": "^1.0.4",
47+
"@glimmer/tracking": "^1.0.4",
4748
"babel-eslint": "^10.1.0",
4849
"bootstrap-sass": "^3.3.7",
4950
"broccoli-asset-rev": "^3.0.0",
50-
"ember-auto-import": "^1.10.1",
51+
"ember-auto-import": "^1.11.3",
5152
"ember-basic-dropdown": "^3.0.12",
5253
"ember-bootstrap": "^4.6.2",
53-
"ember-cli": "~3.24.0",
54+
"ember-cli": "~3.28.4",
5455
"ember-cli-addon-docs": "^1.0.0",
5556
"ember-cli-addon-docs-yuidoc": "^1.0.0",
5657
"ember-cli-dependency-checker": "^3.2.0",
5758
"ember-cli-deploy": "^1.0.2",
5859
"ember-cli-deploy-build": "^2.0.0",
5960
"ember-cli-deploy-git": "^1.3.4",
6061
"ember-cli-deploy-git-ci": "^1.0.1",
61-
"ember-cli-inject-live-reload": "^2.0.2",
62+
"ember-cli-inject-live-reload": "^2.1.0",
6263
"ember-cli-sri": "^2.1.1",
63-
"ember-cli-terser": "^4.0.1",
64+
"ember-cli-terser": "^4.0.2",
6465
"ember-concurrency": "^1.3.0",
6566
"ember-crumbly": "^3.0.1",
6667
"ember-data": "^3.24.0",
@@ -69,28 +70,29 @@
6970
"ember-load-initializers": "^2.1.2",
7071
"ember-maybe-import-regenerator": "^0.1.6",
7172
"ember-notify": "^6.0.0",
72-
"ember-page-title": "^6.0.3",
73-
"ember-qunit": "^5.1.1",
73+
"ember-page-title": "^6.2.2",
74+
"ember-qunit": "^5.1.4",
7475
"ember-resolver": "^8.0.2",
7576
"ember-simple-set-helper": "^0.1.2",
76-
"ember-source": "~3.24.0",
77+
"ember-source": "~3.28.0",
7778
"ember-source-channel-url": "^3.0.0",
78-
"ember-template-lint": "^2.17.0",
79+
"ember-template-lint": "^3.6.0",
7980
"ember-try": "^1.4.0",
80-
"eslint": "^7.17.0",
81-
"eslint-config-prettier": "^7.1.0",
82-
"eslint-plugin-ember": "^10.1.1",
81+
"eslint": "^7.32.0",
82+
"eslint-config-prettier": "^8.3.0",
83+
"eslint-plugin-ember": "^10.5.4",
8384
"eslint-plugin-node": "^11.1.0",
84-
"eslint-plugin-prettier": "^3.3.1",
85+
"eslint-plugin-prettier": "^3.4.1",
86+
"eslint-plugin-qunit": "^6.2.0",
8587
"faker": "^5.2.0",
8688
"loader.js": "^4.7.0",
8789
"npm-run-all": "^4.1.5",
88-
"prettier": "^2.2.1",
89-
"qunit": "^2.13.0",
90+
"prettier": "^2.3.2",
91+
"qunit": "^2.16.0",
9092
"qunit-dom": "^1.6.0"
9193
},
9294
"engines": {
93-
"node": "10.* || >= 12"
95+
"node": "12.* || 14.* || >= 16"
9496
},
9597
"ember": {
9698
"edition": "octane"

0 commit comments

Comments
 (0)