Skip to content

Commit 1033aac

Browse files
authored
Merge pull request #252 from josemarluedke/upgrade
Upgrade Project Dependencies
2 parents 6b11d81 + 2273b73 commit 1033aac

File tree

11 files changed

+3331
-1824
lines changed

11 files changed

+3331
-1824
lines changed

.eslintignore

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

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

Lines changed: 11 additions & 12 deletions
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

Lines changed: 25 additions & 19 deletions
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

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
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 .",
@@ -24,99 +24,100 @@
2424
"prepare": "./scripts/link-them.sh"
2525
},
2626
"dependencies": {
27-
"@glimmer/syntax": "^0.30.5",
27+
"@glimmer/syntax": "^0.36.4",
2828
"broccoli-bridge": "^1.0.0",
2929
"broccoli-caching-writer": "^3.0.3",
3030
"broccoli-debug": "^0.6.4",
3131
"broccoli-filter": "^1.2.4",
3232
"broccoli-funnel": "^2.0.1",
33-
"broccoli-merge-trees": "^2.0.0",
34-
"broccoli-persistent-filter": "^1.4.3",
35-
"broccoli-plugin": "^1.3.0",
33+
"broccoli-merge-trees": "^3.0.1",
34+
"broccoli-persistent-filter": "^2.0.0",
35+
"broccoli-plugin": "^1.3.1",
3636
"broccoli-source": "^1.1.0",
37-
"broccoli-stew": "^1.5.0",
37+
"broccoli-stew": "^2.0.0",
3838
"ember-cli-autoprefixer": "^0.8.1",
39-
"ember-cli-babel": "^6.11.0",
40-
"ember-cli-clipboard": "^0.8.1",
41-
"ember-cli-htmlbars": "^2.0.3",
42-
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
39+
"ember-cli-babel": "^6.16.0",
40+
"ember-cli-clipboard": "^0.9.0",
41+
"ember-cli-htmlbars": "^3.0.0",
42+
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
4343
"ember-cli-sass": "7.1.7",
44-
"ember-cli-string-helpers": "^1.7.0",
44+
"ember-cli-string-helpers": "^1.9.0",
4545
"ember-cli-tailwind": "^0.6.2",
46-
"ember-code-snippet": "^2.2.0",
46+
"ember-code-snippet": "^2.3.1",
4747
"ember-component-css": "0.6.5",
48-
"ember-concurrency": "^0.8.16",
48+
"ember-concurrency": "^0.8.21",
4949
"ember-data": "2.x - 3.x",
50-
"ember-fetch": "^4.0.2",
51-
"ember-fetch-adapter": "^0.4.2",
50+
"ember-fetch": "^5.1.3",
51+
"ember-fetch-adapter": "^0.4.3",
5252
"ember-href-to": "^1.15.1",
53-
"ember-keyboard": "^3.0.0",
53+
"ember-keyboard": "^4.0.0",
5454
"ember-modal-dialog": "2.4.3",
5555
"ember-responsive": "^3.0.0-beta.1",
56-
"ember-router-scroll": "^0.7.1",
57-
"ember-svg-jar": "^1.2.1",
56+
"ember-router-scroll": "^1.0.0",
57+
"ember-svg-jar": "^1.2.2",
5858
"ember-tether": "^1.0.0-beta.2",
59-
"ember-truth-helpers": "^2.0.0",
60-
"execa": "^0.9.0",
61-
"fs-extra": "^5.0.0",
62-
"git-repo-info": "^1.4.1",
59+
"ember-truth-helpers": "^2.1.0",
60+
"execa": "^1.0.0",
61+
"fs-extra": "^7.0.0",
62+
"git-repo-info": "^2.0.0",
6363
"highlightjs": "^9.10.0",
64-
"hosted-git-info": "^2.5.0",
64+
"hosted-git-info": "^2.7.1",
6565
"html-entities": "^1.2.1",
6666
"inflected": "^2.0.3",
67-
"jsdom": "^11.11.0",
68-
"json-api-serializer": "^1.11.0",
69-
"liquid-fire": "^0.29.1",
70-
"lodash": "^4.17.5",
71-
"lunr": "^2.1.5",
67+
"jsdom": "^11.12.0",
68+
"json-api-serializer": "^1.13.0",
69+
"liquid-fire": "^0.29.5",
70+
"lodash": "^4.17.11",
71+
"lunr": "^2.3.3",
7272
"marked": "^0.5.0",
73-
"parse-git-config": "^1.1.1",
73+
"parse-git-config": "^2.0.3",
7474
"quick-temp": "^0.1.8",
75-
"resolve": "^1.5.0",
76-
"sass": "^1.13.2",
77-
"semver": "^5.5.0",
75+
"resolve": "^1.8.1",
76+
"sass": "^1.14.1",
77+
"semver": "^5.5.1",
7878
"striptags": "^3.1.1",
79-
"walk-sync": "^0.3.2",
79+
"walk-sync": "^0.3.3",
8080
"yuidocjs": "^0.10.2"
8181
},
8282
"devDependencies": {
83-
"@ember-decorators/babel-transforms": "^2.0.0",
84-
"babel-eslint": "^8.2.2",
85-
"broccoli-asset-rev": "^2.6.0",
86-
"common-tags": "^1.7.2",
87-
"ember-classy-page-object": "^0.4.6",
88-
"ember-cli": "~3.0.0",
89-
"ember-cli-addon-docs-esdoc": "^0.2.0",
90-
"ember-cli-addon-docs-yuidoc": "^0.2.0",
91-
"ember-cli-dependency-checker": "^2.1.0",
83+
"@ember-decorators/babel-transforms": "^2.1.2",
84+
"@ember/optional-features": "^0.7.0",
85+
"babel-eslint": "^10.0.1",
86+
"broccoli-asset-rev": "^3.0.0",
87+
"common-tags": "^1.8.0",
88+
"ember-classy-page-object": "^0.5.0",
89+
"ember-cli": "~3.3.0",
90+
"ember-cli-addon-docs-esdoc": "^0.2.1",
91+
"ember-cli-addon-docs-yuidoc": "^0.2.1",
92+
"ember-cli-dependency-checker": "^3.0.0",
9293
"ember-cli-deploy": "^1.0.2",
9394
"ember-cli-deploy-build": "^1.1.1",
94-
"ember-cli-deploy-git": "^1.3.2",
95+
"ember-cli-deploy-git": "^1.3.3",
9596
"ember-cli-deploy-git-ci": "^1.0.1",
9697
"ember-cli-eslint": "^4.2.3",
97-
"ember-cli-inject-live-reload": "^1.7.0",
98-
"ember-cli-mirage": "^0.4.5",
99-
"ember-cli-qunit": "^4.3.0",
98+
"ember-cli-inject-live-reload": "^1.8.2",
99+
"ember-cli-mirage": "^0.4.9",
100+
"ember-cli-qunit": "^4.3.2",
100101
"ember-cli-shims": "^1.2.0",
101-
"ember-cli-sri": "^2.1.0",
102-
"ember-cli-uglify": "^2.0.0",
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",
110-
"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",
115-
"qunit": "^2.5.0",
116-
"qunit-dom": "^0.5.0"
108+
"ember-resolver": "^5.0.1",
109+
"ember-source": "~3.4.0",
110+
"ember-source-channel-url": "^1.1.0",
111+
"ember-test-selectors": "^1.0.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",
116+
"qunit": "^2.6.2",
117+
"qunit-dom": "^0.8.0"
117118
},
118119
"engines": {
119-
"node": "6.* || >= 7.*"
120+
"node": "6.* || 8.* || >= 10.*"
120121
},
121122
"ember-addon": {
122123
"configPath": "tests/dummy/config",

testem.js

Lines changed: 6 additions & 5 deletions
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)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"jquery-integration": false
3+
}

tests/pages/api/class.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ const ClassPage = BaseAddonPage.extend({
2626
})
2727
});
2828

29-
export default ClassPage.create();
29+
export default new ClassPage();

tests/pages/api/module.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const ModulePage = BaseAddonPage.extend({
2929
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
3030
editLink: {
3131
scope: '[data-test-edit-page-link]',
32-
href: attribute('href', 'a'),
32+
href: attribute('href', 'a')
3333
},
3434

3535
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
@@ -42,4 +42,4 @@ const ModulePage = BaseAddonPage.extend({
4242
}
4343
});
4444

45-
export default ModulePage.create();
45+
export default new ModulePage();

tests/pages/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
import BaseAddonPage from './base';
22

3-
export default BaseAddonPage.create();
3+
export default new BaseAddonPage();

0 commit comments

Comments
 (0)