Skip to content

Commit 6497d3e

Browse files
committed
update to v3.28 with ember-cli-update
1 parent 4086737 commit 6497d3e

25 files changed

+3870
-1402
lines changed

.editorconfig

Lines changed: 0 additions & 1 deletion
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

.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: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
35
parser: 'babel-eslint',
46
parserOptions: {
57
ecmaVersion: 2018,
6-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
712
},
813
plugins: ['ember'],
914
extends: ['eslint:recommended', 'plugin:ember/recommended'],
@@ -36,28 +41,31 @@ module.exports = {
3641
// node files
3742
{
3843
files: [
39-
'.eslintrc.js',
40-
'.template-lintrc.js',
41-
'ember-cli-build.js',
42-
'index.js',
43-
'testem.js',
44-
'blueprints/*/index.js',
45-
'config/**/*.js',
46-
'test/**/*.js',
47-
'tests/dummy/config/**/*.js'
44+
'./.eslintrc.js',
45+
'./.prettierrc.js',
46+
'./.template-lintrc.js',
47+
'./ember-cli-build.js',
48+
'./index.js',
49+
'./testem.js',
50+
'./blueprints/*/index.js',
51+
'./config/**/*.js',
52+
'./tests/dummy/config/**/*.js',
4853
],
4954
excludedFiles: ['app/**', 'addon-test-support/**', 'addon/**', 'tests/dummy/app/**'],
5055
parserOptions: {
51-
sourceType: 'script'
56+
sourceType: 'script',
5257
},
5358
env: {
5459
browser: false,
55-
node: true
60+
node: true,
5661
},
5762
plugins: ['node'],
58-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
59-
// add your custom rules and overrides for node files here
60-
})
63+
extends: ['plugin:node/recommended'],
64+
},
65+
{
66+
// Test files:
67+
files: ['tests/**/*-test.{js,ts}'],
68+
extends: ['plugin:qunit/recommended'],
6169
},
6270
// node tests
6371
{
@@ -70,5 +78,5 @@ module.exports = {
7078
'node/no-extraneous-require': 'off'
7179
}
7280
}
73-
]
81+
],
7482
};

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
needs: ember-tests
8989

9090
strategy:
91-
fail-fast: true
91+
fail-fast: false
9292
matrix:
9393
ember-try-scenario:
9494
- ember-lts-3.4

.gitignore

Lines changed: 1 addition & 0 deletions
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

.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
@@ -25,6 +27,7 @@
2527
/npm-debug.log*
2628
/testem.js
2729
/tests/
30+
/yarn-error.log
2831
/yarn.lock
2932
/yarn-error.log
3033
.gitkeep

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

config/ember-try.js

Lines changed: 45 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: [
@@ -50,57 +51,75 @@ module.exports = async function() {
5051
name: 'ember-lts-3.24',
5152
npm: {
5253
devDependencies: {
53-
'ember-source': '~3.24.0'
54+
'ember-source': '~3.24.3'
5455
}
5556
}
5657
},
58+
{
59+
name: 'ember-lts-3.28',
60+
npm: {
61+
devDependencies: {
62+
'ember-source': '~3.28.0',
63+
},
64+
},
65+
},
5766
{
5867
name: 'ember-release',
5968
npm: {
6069
devDependencies: {
61-
'ember-source': await getChannelURL('release')
62-
}
63-
}
70+
'ember-source': await getChannelURL('release'),
71+
},
72+
},
6473
},
6574
{
6675
name: 'ember-beta',
6776
npm: {
6877
devDependencies: {
69-
'ember-source': await getChannelURL('beta')
70-
}
71-
}
78+
'ember-source': await getChannelURL('beta'),
79+
},
80+
},
7281
},
7382
{
7483
name: 'ember-canary',
7584
npm: {
7685
devDependencies: {
77-
'ember-source': await getChannelURL('canary')
78-
}
79-
}
86+
'ember-source': await getChannelURL('canary'),
87+
},
88+
},
8089
},
81-
// The default `.travis.yml` runs this scenario via `npm test`,
82-
// not via `ember try`. It's still included here so that running
83-
// `ember try:each` manually or from a customized CI config will run it
84-
// along with all the other scenarios.
8590
{
86-
name: 'ember-default',
91+
name: 'ember-default-with-jquery',
92+
env: {
93+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
94+
'jquery-integration': true,
95+
}),
96+
},
8797
npm: {
88-
devDependencies: {}
89-
}
98+
devDependencies: {
99+
'@ember/jquery': '^1.1.0',
100+
},
101+
},
90102
},
91103
{
92-
name: 'ember-default-with-jquery',
104+
name: 'ember-classic',
93105
env: {
94106
EMBER_OPTIONAL_FEATURES: JSON.stringify({
95-
'jquery-integration': true
96-
})
107+
'application-template-wrapper': true,
108+
'default-async-observers': false,
109+
'template-only-glimmer-components': false,
110+
}),
97111
},
98112
npm: {
99113
devDependencies: {
100-
'@ember/jquery': '^0.5.1'
101-
}
102-
}
103-
}
104-
]
114+
'ember-source': '~3.28.0',
115+
},
116+
ember: {
117+
edition: 'classic',
118+
},
119+
},
120+
},
121+
embroiderSafe(),
122+
embroiderOptimized(),
123+
],
105124
};
106125
};

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

0 commit comments

Comments
 (0)