Skip to content

Commit 0ba41e7

Browse files
authored
⬆️ Upgrading To Ember-3.28 (#537)
* ⬆️ Ember-Cli 3.25.0 -> 3.26.1 * ⬆️ Ember-Cli v3.26.1...v3.27.0 * ⬆️ Ember-Cli v3.27.0...v3.28.5
1 parent 9af885a commit 0ba41e7

File tree

25 files changed

+208
-200
lines changed

25 files changed

+208
-200
lines changed

.eslintignore

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

1819
# ember-try
1920
/.node_modules.ember-try/
2021
/bower.json.ember-try
2122
/package.json.ember-try
23+
24+
# https://www.ember-cli-mirage.com/docs/getting-started/installation#note-for-prettier-users
25+
/mirage/mirage

.eslintrc.js

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ 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/**'],
33+
// excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
3434
parserOptions: {
3535
sourceType: 'script',
3636
},
@@ -41,5 +41,10 @@ module.exports = {
4141
plugins: ['node'],
4242
extends: ['plugin:node/recommended'],
4343
},
44+
{
45+
// Test files:
46+
files: ['tests/**/*-test.{js,ts}'],
47+
extends: ['plugin:qunit/recommended'],
48+
},
4449
],
4550
};

.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

.prettierrc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"trailingComma": "es5",
66
"overrides": [
77
{
8-
"files": "*.hbs",
8+
"files": "**/*.hbs",
99
"options": {
10-
"parser": "glimmer",
1110
"singleQuote": false
1211
}
1312
}

.template-lintrc.js

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

33
module.exports = {
4-
extends: 'octane',
4+
extends: ['recommended'],
55
rules: {
6-
'no-curly-component-invocation': { allow: ['viewer.main', 'viewer.nav', 'demo.example'] },
6+
'no-curly-component-invocation': { allow: ['autocomplete', 'viewer.main', 'viewer.nav', 'demo.example'] },
7+
'no-autofocus-attribute': false,
78
},
89
};

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nodejs 16.13.2
1+
nodejs 12.22.7

.travis.yml

Lines changed: 5 additions & 3 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

@@ -47,13 +47,15 @@ jobs:
4747

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

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Ember Data driven `autocomplete.js` text input.
66

77
## Compatibility
88

9-
- Ember.js v3.16 or above
10-
- Ember CLI v2.13 or above
11-
- Node.js v10 or above
9+
- Ember.js v3.24 or above
10+
- Ember CLI v3.24 or above
11+
- Node.js v12 or above
1212

1313
## Docs
1414

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.24',
1112
npm: {
1213
devDependencies: {
13-
'ember-source': '~3.16.0',
14+
'ember-source': '~3.24.3',
1415
},
1516
},
1617
},
1718
{
18-
name: 'ember-lts-3.20',
19+
name: 'ember-lts-3.28',
1920
npm: {
2021
devDependencies: {
21-
'ember-source': '~3.20.5',
22+
'ember-source': '~3.28.0',
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
@@ -14,5 +14,12 @@ 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, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1825
};

0 commit comments

Comments
 (0)