Skip to content

Commit 335cb5d

Browse files
Ember 3.20 (#3)
1 parent 2ec513e commit 335cb5d

8 files changed

Lines changed: 1157 additions & 174 deletions

File tree

config/ember-try.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@ module.exports = async function() {
4646
}
4747
}
4848
},
49-
// The default `.travis.yml` runs this scenario via `yarn test`,
50-
// not via `ember try`. It's still included here so that running
51-
// `ember try:each` manually or from a customized CI config will run it
52-
// along with all the other scenarios.
53-
{
54-
name: 'ember-default',
55-
npm: {
56-
devDependencies: {}
57-
}
58-
},
5949
{
6050
name: 'ember-default-with-jquery',
6151
env: {

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
"test:ember-compatibility": "ember try:each"
3131
},
3232
"dependencies": {
33-
"ember-cli-babel": "^7.20.5",
34-
"ember-cli-htmlbars": "^5.1.2"
33+
"ember-cli-babel": "^7.21.0",
34+
"ember-cli-htmlbars": "^5.2.0"
3535
},
3636
"devDependencies": {
3737
"@ember/optional-features": "^1.3.0",
38-
"@glimmer/component": "^1.0.0",
38+
"@glimmer/component": "^1.0.1",
3939
"@glimmer/tracking": "^1.0.0",
4040
"babel-eslint": "^10.1.0",
4141
"broccoli-asset-rev": "^3.0.0",
42-
"ember-auto-import": "^1.5.3",
43-
"ember-cli": "~3.19.0",
42+
"ember-auto-import": "^1.6.0",
43+
"ember-cli": "~3.20.0",
4444
"ember-cli-dependency-checker": "^3.2.0",
4545
"ember-cli-inject-live-reload": "^2.0.2",
4646
"ember-cli-sri": "^2.1.1",
@@ -51,12 +51,12 @@
5151
"ember-maybe-import-regenerator": "^0.1.6",
5252
"ember-qunit": "^4.6.0",
5353
"ember-resolver": "^8.0.0",
54-
"ember-source": "~3.19.0",
54+
"ember-source": "~3.20.2",
5555
"ember-source-channel-url": "^2.0.1",
56-
"ember-template-lint": "^2.8.0",
56+
"ember-template-lint": "^2.9.1",
5757
"ember-try": "^1.4.0",
58-
"eslint": "^7.1.0",
59-
"eslint-plugin-ember": "^8.6.0",
58+
"eslint": "^7.5.0",
59+
"eslint-plugin-ember": "^8.9.1",
6060
"eslint-plugin-node": "^11.1.0",
6161
"loader.js": "^4.7.0",
6262
"npm-run-all": "^4.1.5",

tests/dummy/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Application from '@ember/application';
22
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'dummy/config/environment';
55

66
export default class App extends Application {
77
modulePrefix = config.modulePrefix;

tests/dummy/app/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import EmberRouter from '@ember/routing/router';
2-
import config from './config/environment';
2+
import config from 'dummy/config/environment';
33

44
export default class Router extends EmberRouter {
55
location = config.locationType;
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "3.20.0",
7+
"blueprints": [
8+
{
9+
"name": "addon",
10+
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
11+
"codemodsSource": "ember-addon-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": [
14+
"--yarn",
15+
"--no-welcome"
16+
]
17+
}
18+
]
19+
}
20+
]
21+
}

tests/dummy/config/targets.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const browsers = [
66
'last 1 Safari versions'
77
];
88

9-
const isCI = !!process.env.CI;
9+
const isCI = Boolean(process.env.CI);
1010
const isProduction = process.env.EMBER_ENV === 'production';
1111

1212
if (isCI || isProduction) {

tests/test-helper.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Application from '../app';
2-
import config from '../config/environment';
1+
import Application from 'dummy/app';
2+
import config from 'dummy/config/environment';
33
import { setApplication } from '@ember/test-helpers';
44
import { start } from 'ember-qunit';
55

0 commit comments

Comments
 (0)