Skip to content

Commit bca8a30

Browse files
committed
Ember CLI v3.15.2...v3.26.1
1 parent a85b5bd commit bca8a30

27 files changed

+409
-470
lines changed

Diff for: .editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

Diff for: .eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/

Diff for: .eslintrc.js

+21-15
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,58 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parserOptions: {
46
ecmaVersion: 2018,
5-
sourceType: 'module'
7+
sourceType: 'module',
8+
ecmaFeatures: {
9+
legacyDecorators: true,
10+
},
611
},
7-
plugins: [
8-
'ember'
9-
],
12+
plugins: ['ember'],
1013
extends: [
1114
'eslint:recommended',
12-
'plugin:ember/recommended'
15+
'plugin:ember/recommended',
16+
'plugin:prettier/recommended',
1317
],
1418
env: {
15-
browser: true
19+
browser: true,
1620
},
1721
rules: {
22+
'ember/no-component-lifecycle-hooks': 0,
23+
'ember/no-classic-classes': 0,
24+
'ember/no-classic-components': 0,
25+
'ember/no-jquery': 0,
1826
},
1927
overrides: [
2028
// node files
2129
{
2230
files: [
2331
'.eslintrc.js',
32+
'.prettierrc.js',
2433
'.template-lintrc.js',
2534
'ember-cli-build.js',
2635
'index.js',
2736
'testem.js',
2837
'blueprints/*/index.js',
2938
'config/**/*.js',
30-
'tests/dummy/config/**/*.js'
39+
'tests/dummy/config/**/*.js',
3140
],
3241
excludedFiles: [
3342
'addon/**',
3443
'addon-test-support/**',
3544
'app/**',
36-
'tests/dummy/app/**'
45+
'tests/dummy/app/**',
3746
],
3847
parserOptions: {
3948
sourceType: 'script',
40-
ecmaVersion: 2015
4149
},
4250
env: {
4351
browser: false,
44-
node: true
52+
node: true,
4553
},
4654
plugins: ['node'],
47-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48-
// add your custom rules and overrides for node files here
49-
})
50-
}
51-
]
55+
extends: ['plugin:node/recommended'],
56+
},
57+
],
5258
};

Diff for: .github/workflows/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ jobs:
154154
ember-beta,
155155
ember-canary,
156156
ember-release-with-jquery,
157-
ember-release-classic
157+
ember-release-classic,
158+
embroider-safe
158159
]
159160
allow-failure: [false]
160161
include:

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# misc
1212
/.sass-cache
13+
/.eslintcache
1314
/connect.lock
1415
/coverage/
1516
/libpeerconnection.log

Diff for: .npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
13+
/.eslintcache
1214
/.eslintignore
1315
/.eslintrc.js
1416
/.gitignore
17+
/.prettierignore
18+
/.prettierrc.js
1519
/.template-lintrc.js
1620
/.travis.yml
1721
/.watchmanconfig

Diff for: .prettierignore

+21
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

Diff for: .prettierrc.js

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

Diff for: .template-lintrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'octane',
5+
};

Diff for: CONTRIBUTING.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

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

1514
## Running tests
1615

@@ -23,4 +22,4 @@
2322
* `ember serve`
2423
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2524

26-
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://ember-cli.com/](https://ember-cli.com/).

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ integration when that feature is enabled.
1212
Compatibility
1313
------------------------------------------------------------------------------
1414

15-
* Ember.js v2.18 or above
15+
* Ember.js v2.16 or above
1616
* Ember CLI v2.13 or above
17-
* Node.js v8 or above
17+
* Node.js v10 or above
1818

1919

2020
Installation

Diff for: config/ember-try.js

+41-34
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,98 @@
11
'use strict';
22

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

5-
module.exports = function() {
6+
module.exports = function () {
67
return Promise.all([
78
getChannelURL('release'),
89
getChannelURL('beta'),
9-
getChannelURL('canary')
10+
getChannelURL('canary'),
1011
]).then((urls) => {
1112
return {
1213
useYarn: true,
1314
scenarios: [
1415
{
1516
name: 'ember-lts-2.16-with-jquery',
1617
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
19+
'jquery-integration': true,
20+
}),
1821
},
1922
npm: {
2023
devDependencies: {
21-
'ember-source': '~2.16.0'
22-
}
23-
}
24+
'ember-source': '~2.16.0',
25+
},
26+
},
2427
},
2528
{
2629
name: 'ember-lts-2.18-with-jquery',
2730
env: {
28-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
31+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
32+
'jquery-integration': true,
33+
}),
2934
},
3035
npm: {
3136
devDependencies: {
32-
'ember-source': '~2.18.0'
33-
}
34-
}
37+
'ember-source': '~2.18.0',
38+
},
39+
},
3540
},
3641
{
3742
name: 'ember-lts-3.4',
3843
npm: {
3944
devDependencies: {
40-
'ember-source': '~3.4.0'
41-
}
42-
}
45+
'ember-source': '~3.4.0',
46+
},
47+
},
4348
},
4449
{
4550
name: 'ember-lts-3.16',
4651
npm: {
4752
devDependencies: {
48-
'ember-source': '~3.16.0'
49-
}
50-
}
53+
'ember-source': '~3.16.0',
54+
},
55+
},
5156
},
5257
{
5358
name: 'ember-lts-3.20',
5459
npm: {
5560
devDependencies: {
56-
'ember-source': '~3.20.0'
57-
}
58-
}
61+
'ember-source': '~3.20.0',
62+
},
63+
},
5964
},
6065
{
6166
name: 'ember-lts-3.24',
6267
npm: {
6368
devDependencies: {
64-
'ember-source': '~3.24.0'
65-
}
66-
}
69+
'ember-source': '~3.24.0',
70+
},
71+
},
6772
},
6873
{
6974
name: 'ember-release',
7075
npm: {
7176
devDependencies: {
72-
'ember-source': urls[0]
73-
}
74-
}
77+
'ember-source': urls[0],
78+
},
79+
},
7580
},
7681
{
7782
name: 'ember-beta',
7883
npm: {
7984
devDependencies: {
80-
'ember-source': urls[1]
81-
}
82-
}
85+
'ember-source': urls[1],
86+
},
87+
},
8388
},
8489
{
8590
name: 'ember-canary',
8691
npm: {
8792
devDependencies: {
88-
'ember-source': urls[2]
89-
}
90-
}
93+
'ember-source': urls[2],
94+
},
95+
},
9196
},
9297
// The default `.travis.yml` runs this scenario via `npm test`,
9398
// not via `ember try`. It's still included here so that running
@@ -96,8 +101,8 @@ module.exports = function() {
96101
{
97102
name: 'ember-default',
98103
npm: {
99-
devDependencies: {}
100-
}
104+
devDependencies: {},
105+
},
101106
},
102107
{
103108
name: 'ember-release-with-jquery',
@@ -130,7 +135,9 @@ module.exports = function() {
130135
},
131136
},
132137
},
133-
]
138+
embroiderSafe(),
139+
embroiderOptimized(),
140+
],
134141
};
135142
});
136143
};

Diff for: config/environment.js

+2-2
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
};

Diff for: ember-cli-build.js

+3-2
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
// Add options here
88
});
@@ -14,5 +14,6 @@ module.exports = function(defaults) {
1414
behave. You most likely want to be modifying `./index.js` or app's build file
1515
*/
1616

17-
return app.toTree();
17+
const { maybeEmbroider } = require('@embroider/test-setup');
18+
return maybeEmbroider(app);
1819
};

0 commit comments

Comments
 (0)