Skip to content

Commit 30cb2b1

Browse files
Gaurav0Gaurav0
committed
ember-cli-update
1 parent d450722 commit 30cb2b1

15 files changed

+3816
-665
lines changed

‎.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

‎.eslintrc.js

+6-1
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: [
914
'ember'

‎.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane'
55
};

‎.travis.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ 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-
- "8"
6+
- "10"
77

8-
sudo: false
9-
dist: trusty
8+
dist: bionic
109

1110
addons:
1211
chrome: stable
@@ -27,29 +26,37 @@ branches:
2726
- /^v\d+\.\d+\.\d+/
2827

2928
jobs:
30-
fail_fast: true
29+
fast_finish: true
3130
allow_failures:
3231
- env: EMBER_TRY_SCENARIO=ember-canary
3332

3433
include:
3534
# runs linting and tests with current locked deps
36-
3735
- stage: "Tests"
3836
name: "Tests"
3937
script:
40-
- npm run lint:hbs
41-
- npm run lint:js
42-
- npm test
38+
- yarn lint:hbs
39+
- yarn lint:js
40+
- yarn test:ember
41+
42+
- stage: "Additional Tests"
43+
name: "Floating Dependencies"
44+
install:
45+
- yarn install --no-lockfile --non-interactive
46+
script:
47+
- yarn test:ember
4348

4449
# we recommend new addons test the current and previous LTS
4550
# as well as latest stable release (bonus points to beta/canary)
46-
- stage: "Additional Tests"
4751
env: EMBER_TRY_SCENARIO=ember-lts-3.4
4852
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
53+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
54+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
4955
- env: EMBER_TRY_SCENARIO=ember-release
5056
- env: EMBER_TRY_SCENARIO=ember-beta
5157
- env: EMBER_TRY_SCENARIO=ember-canary
5258
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
59+
- env: EMBER_TRY_SCENARIO=ember-classic
5360

5461
script:
5562
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@
2323
* `ember serve`
2424
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2525

26-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
26+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎config/ember-try.js

+32
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const getChannelURL = require('ember-source-channel-url');
44

55
module.exports = async function() {
66
return {
7+
useYarn: true,
78
scenarios: [
89
{
910
name: 'ember-lts-3.4',
@@ -21,6 +22,22 @@ module.exports = async function() {
2122
}
2223
}
2324
},
25+
{
26+
name: 'ember-lts-3.12',
27+
npm: {
28+
devDependencies: {
29+
'ember-source': '~3.12.0'
30+
}
31+
}
32+
},
33+
{
34+
name: 'ember-lts-3.16',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': '~3.16.0'
38+
}
39+
}
40+
},
2441
{
2542
name: 'ember-release',
2643
npm: {
@@ -67,6 +84,21 @@ module.exports = async function() {
6784
'@ember/jquery': '^0.5.1'
6885
}
6986
}
87+
},
88+
{
89+
name: 'ember-classic',
90+
env: {
91+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
92+
'application-template-wrapper': true,
93+
'default-async-observers': false,
94+
'template-only-glimmer-components': false
95+
})
96+
},
97+
npm: {
98+
ember: {
99+
edition: 'classic'
100+
}
101+
}
70102
}
71103
]
72104
};

‎package.json

+29-21
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-cli-deploy-s3-pack",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "An ember-cli-deploy plugin pack to implement a simple S3 deployment pattern",
55
"keywords": [
66
"ember-addon",
@@ -14,12 +14,14 @@
1414
"test": "tests"
1515
},
1616
"scripts": {
17-
"build": "ember build",
17+
"build": "ember build --environment=production",
18+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
1819
"lint:hbs": "ember-template-lint .",
1920
"lint:js": "eslint .",
2021
"start": "ember serve",
21-
"test": "ember test",
22-
"test:all": "ember try:each"
22+
"test": "npm-run-all lint:* test:*",
23+
"test:ember": "ember test",
24+
"test:ember-compatibility": "ember try:each"
2325
},
2426
"dependencies": {
2527
"ember-cli-deploy-build": "^2.0.0",
@@ -28,39 +30,45 @@
2830
"ember-cli-deploy-manifest": "^1.1.0",
2931
"ember-cli-deploy-revision-data": "^1.0.0",
3032
"ember-cli-deploy-s3": "^1.4.0",
31-
"ember-cli-deploy-s3-index": "^1.0.1",
32-
"ember-cli-htmlbars": "^4.0.8"
33+
"ember-cli-deploy-s3-index": "^1.0.1"
3334
},
3435
"devDependencies": {
35-
"@ember/optional-features": "^1.1.0",
36-
"babel-eslint": "^10.0.3",
36+
"@ember/optional-features": "^1.3.0",
37+
"@glimmer/component": "^1.0.0",
38+
"@glimmer/tracking": "^1.0.0",
39+
"babel-eslint": "^10.1.0",
3740
"broccoli-asset-rev": "^3.0.0",
38-
"ember-cli": "~3.13.1",
39-
"ember-cli-babel": "^7.12.0",
41+
"ember-auto-import": "^1.5.3",
42+
"ember-cli": "~3.18.0",
43+
"ember-cli-babel": "^7.19.0",
4044
"ember-cli-dependency-checker": "^3.2.0",
41-
"ember-cli-eslint": "^5.1.0",
42-
"ember-cli-htmlbars-inline-precompile": "^3.0.1",
45+
"ember-cli-htmlbars": "^4.3.1",
4346
"ember-cli-inject-live-reload": "^2.0.2",
4447
"ember-cli-sri": "^2.1.1",
45-
"ember-cli-template-lint": "^1.0.0-beta.3",
4648
"ember-cli-uglify": "^3.0.0",
4749
"ember-cli-update": "^0.43.8",
4850
"ember-disable-prototype-extensions": "^1.1.3",
49-
"ember-export-application-global": "^2.0.0",
51+
"ember-export-application-global": "^2.0.1",
5052
"ember-load-initializers": "^2.1.1",
5153
"ember-maybe-import-regenerator": "^0.1.6",
5254
"ember-qunit": "^4.6.0",
53-
"ember-resolver": "^5.3.0",
54-
"ember-source": "~3.14.1",
55+
"ember-resolver": "^8.0.0",
56+
"ember-source": "~3.18.0",
5557
"ember-source-channel-url": "^2.0.1",
56-
"ember-try": "^1.2.1",
57-
"eslint-plugin-ember": "^7.4.1",
58-
"eslint-plugin-node": "^10.0.0",
58+
"ember-template-lint": "^2.6.0",
59+
"ember-try": "^1.4.0",
60+
"eslint": "^6.8.0",
61+
"eslint-plugin-ember": "^8.4.0",
62+
"eslint-plugin-node": "^11.1.0",
5963
"loader.js": "^4.7.0",
60-
"qunit-dom": "^0.9.1"
64+
"npm-run-all": "^4.1.5",
65+
"qunit-dom": "^1.2.0"
6166
},
6267
"engines": {
63-
"node": "8.* || >= 10.*"
68+
"node": "10.* || >= 12"
69+
},
70+
"ember": {
71+
"edition": "octane"
6472
},
6573
"ember-addon": {
6674
"configPath": "tests/dummy/config",

‎testem.js

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
module.exports = {
24
test_page: 'tests/index.html?hidepassed',
35
disable_watching: true,
@@ -7,6 +9,7 @@ module.exports = {
79
launch_in_dev: [
810
'Chrome'
911
],
12+
browser_start_timeout: 120,
1013
browser_args: {
1114
Chrome: {
1215
ci: [

‎tests/dummy/app/app.js

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
export default class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
13-
14-
export default App;

‎tests/dummy/app/resolver.js

-3
This file was deleted.

‎tests/dummy/app/router.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = EmberRouter.extend({
5-
location: config.locationType,
6-
rootURL: config.rootURL
7-
});
4+
export default class Router extends EmberRouter {
5+
location = config.locationType;
6+
rootURL = config.rootURL;
7+
}
88

99
Router.map(function() {
1010
});
11-
12-
export default Router;

‎tests/dummy/app/templates/components/.gitkeep

Whitespace-only changes.

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

+21
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.18.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/optional-features.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"jquery-integration": false
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": false,
5+
"template-only-glimmer-components": true
36
}

0 commit comments

Comments
 (0)