Skip to content
This repository was archived by the owner on Oct 9, 2024. It is now read-only.

Commit d61b11b

Browse files
Ember 3.21 (#162)
1 parent 52db428 commit d61b11b

11 files changed

Lines changed: 320 additions & 238 deletions

File tree

.eslintrc.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ module.exports = {
2020
env: {
2121
browser: true
2222
},
23-
rules: {
24-
'ember/no-jquery': 'error'
25-
},
23+
rules: {},
2624
overrides: [
2725
// node files
2826
{
@@ -51,9 +49,7 @@ module.exports = {
5149
node: true
5250
},
5351
plugins: ['node'],
54-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
55-
// add your custom rules and overrides for node files here
56-
})
52+
extends: ['plugin:node/recommended']
5753
}
5854
]
5955
};

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ node_js:
55
# so that your addon works for all apps
66
- "10"
77

8-
dist: trusty
8+
dist: xenial
99

1010
addons:
1111
chrome: stable
@@ -46,8 +46,8 @@ jobs:
4646

4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
49-
- env: EMBER_TRY_SCENARIO=ember-3.13
5049
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5151
- env: EMBER_TRY_SCENARIO=ember-release
5252
- env: EMBER_TRY_SCENARIO=ember-beta
5353
- env: EMBER_TRY_SCENARIO=ember-canary
@@ -60,8 +60,5 @@ before_install:
6060
- curl -o- -L https://yarnpkg.com/install.sh | bash
6161
- export PATH=$HOME/.yarn/bin:$PATH
6262

63-
install:
64-
- yarn install --non-interactive
65-
6663
script:
6764
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ This project is packaged as an [EmberCLI](http://www.ember-cli.com) addon.
1515
Compatibility
1616
------------------------------------------------------------------------------
1717

18-
* Ember.js v3.13 or above
18+
* Ember.js v3.16 or above
1919
* Ember CLI v2.13 or above
2020
* Node.js v10 or above
2121

config/ember-try.js

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ module.exports = async function() {
77
useYarn: true,
88
scenarios: [
99
{
10-
name: 'ember-3.13',
10+
name: 'ember-lts-3.16',
1111
npm: {
1212
devDependencies: {
13-
'ember-source': '~3.13.0'
13+
'ember-source': '~3.16.0'
1414
}
1515
}
1616
},
1717
{
18-
name: 'ember-lts-3.16',
18+
name: 'ember-lts-3.20',
1919
npm: {
2020
devDependencies: {
21-
'ember-source': '~3.16.0'
21+
'ember-source': '~3.20.5'
2222
}
2323
}
2424
},
@@ -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: {
@@ -65,7 +55,7 @@ module.exports = async function() {
6555
},
6656
npm: {
6757
devDependencies: {
68-
'@ember/jquery': '^0.5.1'
58+
'@ember/jquery': '^1.1.0'
6959
}
7060
}
7161
},

package.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,39 @@
3535
},
3636
"dependencies": {
3737
"@ember/render-modifiers": "^1.0.2",
38-
"ember-cli-babel": "^7.19.0",
39-
"ember-cli-htmlbars": "^5.1.1",
38+
"ember-cli-babel": "^7.22.1",
39+
"ember-cli-htmlbars": "^5.3.1",
4040
"ember-cli-node-assets": "^0.2.2",
4141
"prismjs": "^1.19.0"
4242
},
4343
"devDependencies": {
4444
"@ember/optional-features": "^2.0.0",
45-
"@glimmer/component": "^1.0.0",
46-
"@glimmer/tracking": "^1.0.0",
45+
"@glimmer/component": "^1.0.1",
46+
"@glimmer/tracking": "^1.0.1",
4747
"babel-eslint": "^10.1.0",
4848
"broccoli-asset-rev": "^3.0.0",
49-
"ember-auto-import": "^1.5.3",
50-
"ember-cli": "~3.18.0",
49+
"ember-auto-import": "^1.6.0",
50+
"ember-cli": "~3.21.2",
5151
"ember-cli-dependency-checker": "^3.2.0",
5252
"ember-cli-inject-live-reload": "^2.0.2",
5353
"ember-cli-sri": "^2.1.1",
54-
"ember-cli-uglify": "^3.0.0",
54+
"ember-cli-terser": "^4.0.0",
5555
"ember-disable-prototype-extensions": "^1.1.3",
5656
"ember-export-application-global": "^2.0.1",
5757
"ember-load-initializers": "^2.1.1",
5858
"ember-maybe-import-regenerator": "^0.1.6",
5959
"ember-qunit": "^4.6.0",
60-
"ember-resolver": "^8.0.0",
61-
"ember-source": "~3.21.0",
60+
"ember-resolver": "^8.0.2",
61+
"ember-source": "~3.21.1",
6262
"ember-source-channel-url": "^3.0.0",
63-
"ember-template-lint": "^2.6.0",
63+
"ember-template-lint": "^2.11.0",
6464
"ember-try": "^1.4.0",
65-
"eslint": "^7.2.0",
65+
"eslint": "^7.8.0",
6666
"eslint-plugin-ember": "^9.0.0",
6767
"eslint-plugin-node": "^11.1.0",
6868
"loader.js": "^4.7.0",
6969
"npm-run-all": "^4.1.5",
70-
"qunit-dom": "^1.2.0",
70+
"qunit-dom": "^1.4.0",
7171
"release-it": "^14.0.1",
7272
"release-it-lerna-changelog": "^2.3.0"
7373
},

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;

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.18.0",
6+
"version": "3.21.2",
77
"blueprints": [
88
{
99
"name": "addon",

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)