Skip to content

Commit bb34340

Browse files
committed
Upgrade to Ember CLI v3.3.0
1 parent 6b11d81 commit bb34340

File tree

8 files changed

+2059
-280
lines changed

8 files changed

+2059
-280
lines changed

.eslintignore

+18-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1-
tmp/
2-
dist/
3-
node_modules/
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
12+
# misc
13+
/coverage/
14+
15+
# ember-try
16+
/.node_modules.ember-try/
17+
/bower.json.ember-try
18+
/package.json.ember-try

.eslintrc.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,20 @@ module.exports = {
2828
// node files
2929
{
3030
files: [
31+
'.template-lintrc.js',
32+
'ember-cli-build.js',
3133
'index.js',
3234
'testem.js',
33-
'ember-cli-build.js',
35+
'blueprints/*/index.js',
3436
'config/**/*.js',
3537
'lib/**/*.js',
3638
'tests/dummy/config/**/*.js',
3739
'tests-node/**/*.js'
3840
],
3941
excludedFiles: [
40-
'app/**',
4142
'addon/**',
43+
'addon-test-support/**',
44+
'app/**',
4245
'tests/dummy/app/**'
4346
],
4447
parserOptions: {

.gitignore

+11-12
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
1212
/.sass-cache
1313
/connect.lock
14-
/coverage/*
14+
/coverage/
1515
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
16+
/npm-debug.log*
17+
/testem.log
18+
/yarn-error.log
1919

2020
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
24-
2521
.DS_Store
22+
/.node_modules.ember-try/
23+
/bower.json.ember-try
24+
/package.json.ember-try

.npmignore

+25-19
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,32 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.eslintignore
13+
/.eslintrc.js
14+
/.gitignore
15+
/.watchmanconfig
16+
/.travis.yml
17+
/bower.json
218
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.eslintrc.js
11-
.gitignore
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
19+
/ember-cli-build.js
20+
/testem.js
21+
/tests/
22+
/yarn.lock
23+
.gitkeep
1724

1825
# sandbox examples
1926
/lib/sandbox
2027

2128
# ember-try
22-
.node_modules.ember-try/
23-
bower.json.ember-try
24-
package.json.ember-try
25-
29+
/.node_modules.ember-try/
30+
/bower.json.ember-try
31+
/package.json.ember-try
2632
/test-apps

package.json

+23-22
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
"ember-addon",
77
"ember-cli-deploy-plugin"
88
],
9+
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
910
"license": "MIT",
1011
"author": "",
1112
"directories": {
1213
"doc": "doc",
1314
"test": "tests"
1415
},
15-
"repository": "https://github.com/ember-learn/ember-cli-addon-docs",
1616
"scripts": {
1717
"build": "ember build",
1818
"lint:js": "eslint .",
1919
"start": "ember serve",
20-
"test": "ember try:each",
20+
"test": "ember test",
21+
"test:all": "ember try:each",
2122
"test:browser": "ember test --test-port=0",
2223
"test:node": "qunit tests-node",
2324
"test:test-apps": "cd test-apps/new-addon && yarn test",
@@ -36,9 +37,9 @@
3637
"broccoli-source": "^1.1.0",
3738
"broccoli-stew": "^1.5.0",
3839
"ember-cli-autoprefixer": "^0.8.1",
39-
"ember-cli-babel": "^6.11.0",
40+
"ember-cli-babel": "^6.16.0",
4041
"ember-cli-clipboard": "^0.8.1",
41-
"ember-cli-htmlbars": "^2.0.3",
42+
"ember-cli-htmlbars": "^3.0.0",
4243
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
4344
"ember-cli-sass": "7.1.7",
4445
"ember-cli-string-helpers": "^1.7.0",
@@ -81,42 +82,42 @@
8182
},
8283
"devDependencies": {
8384
"@ember-decorators/babel-transforms": "^2.0.0",
85+
"@ember/optional-features": "^0.6.3",
8486
"babel-eslint": "^8.2.2",
85-
"broccoli-asset-rev": "^2.6.0",
87+
"broccoli-asset-rev": "^2.7.0",
8688
"common-tags": "^1.7.2",
8789
"ember-classy-page-object": "^0.4.6",
88-
"ember-cli": "~3.0.0",
90+
"ember-cli": "~3.3.0",
8991
"ember-cli-addon-docs-esdoc": "^0.2.0",
9092
"ember-cli-addon-docs-yuidoc": "^0.2.0",
91-
"ember-cli-dependency-checker": "^2.1.0",
93+
"ember-cli-dependency-checker": "^3.0.0",
9294
"ember-cli-deploy": "^1.0.2",
9395
"ember-cli-deploy-build": "^1.1.1",
9496
"ember-cli-deploy-git": "^1.3.2",
9597
"ember-cli-deploy-git-ci": "^1.0.1",
9698
"ember-cli-eslint": "^4.2.3",
97-
"ember-cli-inject-live-reload": "^1.7.0",
99+
"ember-cli-inject-live-reload": "^1.8.2",
98100
"ember-cli-mirage": "^0.4.5",
99-
"ember-cli-qunit": "^4.3.0",
100-
"ember-cli-shims": "^1.2.0",
101-
"ember-cli-sri": "^2.1.0",
102-
"ember-cli-uglify": "^2.0.0",
101+
"ember-cli-qunit": "^4.3.2",
102+
"ember-cli-sri": "^2.1.1",
103+
"ember-cli-uglify": "^2.1.0",
103104
"ember-disable-prototype-extensions": "^1.1.3",
104105
"ember-export-application-global": "^2.0.0",
105-
"ember-load-initializers": "^1.0.0",
106+
"ember-load-initializers": "^1.1.0",
106107
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
107-
"ember-resolver": "^4.5.0",
108-
"ember-source": "~3.0.0",
109-
"ember-source-channel-url": "^1.0.1",
108+
"ember-resolver": "^5.0.1",
109+
"ember-source": "~3.4.0",
110+
"ember-source-channel-url": "^1.1.0",
110111
"ember-test-selectors": "^0.3.8",
111-
"ember-try": "^0.2.23",
112-
"eslint-plugin-ember": "^5.0.3",
113-
"eslint-plugin-node": "^5.2.1",
114-
"loader.js": "^4.6.0",
112+
"ember-try": "^1.0.0",
113+
"eslint-plugin-ember": "^5.2.0",
114+
"eslint-plugin-node": "^7.0.1",
115+
"loader.js": "^4.7.0",
115116
"qunit": "^2.5.0",
116-
"qunit-dom": "^0.5.0"
117+
"qunit-dom": "^0.7.1"
117118
},
118119
"engines": {
119-
"node": "6.* || >= 7.*"
120+
"node": "6.* || 8.* || >= 10.*"
120121
},
121122
"ember-addon": {
122123
"configPath": "tests/dummy/config",

testem.js

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ module.exports = {
88
],
99
browser_args: {
1010
Chrome: {
11-
mode: 'ci',
12-
args: [
11+
ci: [
1312
// --no-sandbox is needed when running Chrome inside a container
14-
process.env.TRAVIS ? '--no-sandbox' : null,
15-
16-
'--disable-gpu',
13+
process.env.CI ? '--no-sandbox' : null,
1714
'--headless',
15+
'--disable-gpu',
16+
'--disable-dev-shm-usage',
17+
'--disable-software-rasterizer',
18+
'--mute-audio',
1819
'--remote-debugging-port=0',
1920
'--window-size=1440,900'
2021
].filter(Boolean)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": false
3+
}

0 commit comments

Comments
 (0)