Skip to content

Commit e611928

Browse files
committed
chore(deps): ember-cli-update to v3.28
1 parent 18fcde1 commit e611928

19 files changed

+178
-105
lines changed

.eslintignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

.eslintrc.js

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
20+
browser: true,
2221
},
2322
rules: {
2423
'ember/no-jquery': 'warn',
@@ -27,30 +26,30 @@ module.exports = {
2726
// node files
2827
{
2928
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'index.js',
34-
'testem.js',
35-
'blueprints/*/index.js',
36-
'config/**/*.js',
37-
'tests/dummy/config/**/*.js'
38-
],
39-
excludedFiles: [
40-
'addon/**',
41-
'addon-test-support/**',
42-
'app/**',
43-
'tests/dummy/app/**'
29+
'./.eslintrc.js',
30+
'./.prettierrc.js',
31+
'./.template-lintrc.js',
32+
'./ember-cli-build.js',
33+
'./index.js',
34+
'./testem.js',
35+
'./blueprints/*/index.js',
36+
'./config/**/*.js',
37+
'./tests/dummy/config/**/*.js',
4438
],
4539
parserOptions: {
46-
sourceType: 'script'
40+
sourceType: 'script',
4741
},
4842
env: {
4943
browser: false,
50-
node: true
44+
node: true,
5145
},
5246
plugins: ['node'],
53-
extends: ['plugin:node/recommended']
54-
}
55-
]
47+
extends: ['plugin:node/recommended'],
48+
},
49+
{
50+
// Test files:
51+
files: ['tests/**/*-test.{js,ts}'],
52+
extends: ['plugin:qunit/recommended'],
53+
},
54+
],
5655
};

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# misc
1212
/.env*
1313
/.sass-cache
14+
/.eslintcache
1415
/connect.lock
1516
/coverage/
1617
/libpeerconnection.log

.npmignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig
@@ -23,6 +26,7 @@
2326
/ember-cli-build.js
2427
/testem.js
2528
/tests/
29+
/yarn-error.log
2630
/yarn.lock
2731
.gitkeep
2832

.prettierignore

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
## Linting
1212

13-
* `npm run lint:hbs`
14-
* `npm run lint:js`
15-
* `npm run lint:js -- --fix`
13+
* `npm run lint` (or `yarn lint`)
14+
* `npm run lint:fix` (or `yarn lint:fix`)
1615

1716
## Running tests
1817

config/ember-try.js

Lines changed: 37 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
'use strict';
22

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

5-
module.exports = async function() {
6+
module.exports = async function () {
67
return {
78
useYarn: true,
89
scenarios: [
@@ -11,69 +12,79 @@ module.exports = async function() {
1112
npm: {
1213
devDependencies: {
1314
'ember-source': '~3.16.0'
14-
}
15+
},
1516
},
1617
},
1718
{
1819
name: 'ember-lts-3.20',
1920
npm: {
2021
devDependencies: {
21-
'ember-source': '~3.20.5'
22-
}
23-
}
22+
'ember-source': '~3.20.5',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-lts-3.24',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~3.24.3',
31+
},
32+
},
2433
},
2534
{
2635
name: 'ember-release',
2736
npm: {
2837
devDependencies: {
29-
'ember-source': await getChannelURL('release')
30-
}
31-
}
38+
'ember-source': await getChannelURL('release'),
39+
},
40+
},
3241
},
3342
{
3443
name: 'ember-beta',
3544
npm: {
3645
devDependencies: {
37-
'ember-source': await getChannelURL('beta')
38-
}
39-
}
46+
'ember-source': await getChannelURL('beta'),
47+
},
48+
},
4049
},
4150
{
4251
name: 'ember-canary',
4352
npm: {
4453
devDependencies: {
45-
'ember-source': await getChannelURL('canary')
46-
}
47-
}
54+
'ember-source': await getChannelURL('canary'),
55+
},
56+
},
4857
},
4958
{
5059
name: 'ember-default-with-jquery',
5160
env: {
5261
EMBER_OPTIONAL_FEATURES: JSON.stringify({
53-
'jquery-integration': true
54-
})
62+
'jquery-integration': true,
63+
}),
5564
},
5665
npm: {
5766
devDependencies: {
58-
'@ember/jquery': '^1.1.0'
59-
}
60-
}
67+
'@ember/jquery': '^1.1.0',
68+
},
69+
},
6170
},
6271
{
6372
name: 'ember-classic',
6473
env: {
6574
EMBER_OPTIONAL_FEATURES: JSON.stringify({
6675
'application-template-wrapper': true,
6776
'default-async-observers': false,
68-
'template-only-glimmer-components': false
69-
})
77+
'template-only-glimmer-components': false,
78+
}),
7079
},
7180
npm: {
7281
ember: {
73-
edition: 'classic'
74-
}
75-
}
76-
}
77-
]
82+
edition: 'classic',
83+
},
84+
},
85+
},
86+
embroiderSafe(),
87+
embroiderOptimized(),
88+
],
7889
};
7990
};

config/environment.js

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

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

ember-cli-build.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Plotly.js uses the `has-hover` package which relies on Node.js' `global` object
88
autoImport: {
@@ -22,5 +22,12 @@ module.exports = function(defaults) {
2222
behave. You most likely want to be modifying `./index.js` or app's build file
2323
*/
2424

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

0 commit comments

Comments
 (0)