Skip to content

Commit f0a4c6c

Browse files
Ember 3.12, bump some deps (#401)
* Ember 2.12 * Bump some deps * Set ember-href-to to previous version again * Bump more deps * Yarn upgrade * Bump more deps
1 parent 900b09b commit f0a4c6c

File tree

6 files changed

+2640
-2840
lines changed

6 files changed

+2640
-2840
lines changed

.eslintrc.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = {
44
},
55
root: true,
66
parserOptions: {
7-
ecmaVersion: 2017,
7+
ecmaVersion: 2018,
88
sourceType: 'module'
99
},
1010
plugins: [
@@ -46,8 +46,7 @@ module.exports = {
4646
'tests/dummy/app/**'
4747
],
4848
parserOptions: {
49-
sourceType: 'script',
50-
ecmaVersion: 2017
49+
sourceType: 'script'
5150
},
5251
env: {
5352
browser: false,

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ jobs:
5454
- stage: versioned tests
5555
env: EMBER_TRY_SCENARIO=ember-lts-2.12
5656
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
57+
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
58+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
5759
- env: EMBER_TRY_SCENARIO=ember-release
5860
- env: EMBER_TRY_SCENARIO=ember-beta
5961
- env: EMBER_TRY_SCENARIO=ember-canary

config/ember-try.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ module.exports = function() {
3737
}
3838
}
3939
},
40+
{
41+
name: 'ember-lts-3.8',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': '~3.8.0'
45+
}
46+
}
47+
},
4048
{
4149
name: 'ember-release',
4250
npm: {

package.json

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,20 @@
2525
"prepare": "./scripts/link-them.sh"
2626
},
2727
"dependencies": {
28-
"@glimmer/syntax": "^0.36.4",
28+
"@glimmer/syntax": "^0.42.0",
2929
"broccoli-bridge": "^1.0.0",
3030
"broccoli-caching-writer": "^3.0.3",
3131
"broccoli-debug": "^0.6.4",
3232
"broccoli-filter": "^1.2.4",
33-
"broccoli-funnel": "^2.0.1",
33+
"broccoli-funnel": "^2.0.2",
3434
"broccoli-merge-trees": "^3.0.1",
35-
"broccoli-persistent-filter": "^2.0.0",
35+
"broccoli-persistent-filter": "^2.3.1",
3636
"broccoli-plugin": "^1.3.1",
3737
"broccoli-source": "^1.1.0",
3838
"broccoli-stew": "^2.0.0",
3939
"chalk": "^2.4.2",
40-
"ember-auto-import": "^1.2.19",
40+
"ember-assign-polyfill": "^2.6.0",
41+
"ember-auto-import": "^1.5.2",
4142
"ember-cli-autoprefixer": "^0.8.1",
4243
"ember-cli-babel": "^7.7.3",
4344
"ember-cli-clipboard": "^0.11.1",
@@ -48,54 +49,53 @@
4849
"ember-cli-string-utils": "^1.1.0",
4950
"ember-cli-tailwind": "^0.6.2",
5051
"ember-code-snippet": "^2.4.1",
51-
"ember-component-css": "^0.6.7",
52+
"ember-component-css": "^0.7.4",
5253
"ember-concurrency": "^0.9.0 || ^0.10.0 || ^1.0.0",
5354
"ember-data": "2.x - 3.x",
54-
"ember-fetch": "^6.2.0",
55+
"ember-fetch": "^6.7.0",
5556
"ember-fetch-adapter": "^0.4.3",
5657
"ember-href-to": "^1.15.1",
5758
"ember-keyboard": "^4.0.0",
58-
"ember-modal-dialog": "3.0.0-beta.3",
59-
"ember-responsive": "^3.0.1",
60-
"ember-router-generator": "^1.2.3",
61-
"ember-router-scroll": "^1.0.0",
62-
"ember-svg-jar": "^1.2.2",
59+
"ember-modal-dialog": "^3.0.0-beta.4",
60+
"ember-responsive": "^3.0.5",
61+
"ember-router-generator": "^2.0.0",
62+
"ember-router-scroll": "^1.2.1",
63+
"ember-svg-jar": "^2.1.0",
6364
"ember-tether": "^1.0.0-beta.2",
6465
"ember-truth-helpers": "^2.1.0",
65-
"esm": "^3.2.4",
66+
"esm": "^3.2.25",
6667
"execa": "^1.0.0",
6768
"fs-extra": "^7.0.0",
68-
"git-repo-info": "^2.0.0",
69+
"git-repo-info": "^2.1.0",
6970
"highlight.js": "^9.14.2",
7071
"hosted-git-info": "^2.7.1",
7172
"html-entities": "^1.2.1",
7273
"inflected": "^2.0.3",
7374
"jsdom": "^11.12.0",
7475
"json-api-serializer": "^1.13.0",
7576
"liquid-fire": "^0.29.5 || ^0.30.0",
76-
"lodash": "^4.17.11",
77-
"lunr": "^2.3.3",
77+
"lodash": "^4.17.15",
78+
"lunr": "^2.3.6",
7879
"marked": "^0.5.0",
7980
"pad-start": "^1.0.2",
8081
"parse-git-config": "^2.0.3",
8182
"quick-temp": "^0.1.8",
82-
"resolve": "^1.8.1",
83-
"sass": "^1.17.0",
83+
"resolve": "^1.12.0",
84+
"sass": "^1.22.10",
8485
"semver": "^5.5.1",
8586
"striptags": "^3.1.1",
8687
"walk-sync": "^0.3.3",
8788
"yuidocjs": "^0.10.2"
8889
},
8990
"devDependencies": {
90-
"@ember-decorators/babel-transforms": "^2.1.2",
9191
"@ember/optional-features": "^0.7.0",
9292
"babel-eslint": "^10.0.1",
9393
"broccoli-asset-rev": "^3.0.0",
9494
"chai": "^4.2.0",
9595
"common-tags": "^1.8.0",
9696
"ember-classy-page-object": "^0.5.0",
97-
"ember-cli": "~3.10.0",
98-
"ember-cli-addon-docs-esdoc": "^0.2.1",
97+
"ember-cli": "~3.12.0",
98+
"ember-cli-addon-docs-esdoc": "^0.2.2",
9999
"ember-cli-addon-docs-yuidoc": "^0.2.1",
100100
"ember-cli-blueprint-test-helpers": "^0.19.2",
101101
"ember-cli-dependency-checker": "^3.1.0",
@@ -106,33 +106,33 @@
106106
"ember-cli-deploy-git-ci": "^1.0.1",
107107
"ember-cli-eslint": "^5.1.0",
108108
"ember-cli-inject-live-reload": "^1.8.2",
109-
"ember-cli-mirage": "^0.4.14",
109+
"ember-cli-mirage": "^0.4.15",
110110
"ember-cli-sri": "^2.1.1",
111-
"ember-cli-template-lint": "^1.0.0-beta.2",
112-
"ember-cli-uglify": "^2.1.0",
111+
"ember-cli-template-lint": "^1.0.0-beta.3",
112+
"ember-cli-uglify": "^3.0.0",
113113
"ember-disable-prototype-extensions": "^1.1.3",
114114
"ember-export-application-global": "^2.0.0",
115115
"ember-load-initializers": "^2.0.0",
116116
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
117-
"ember-qunit": "^4.4.1",
117+
"ember-qunit": "^4.5.1",
118118
"ember-resolver": "^5.0.1",
119-
"ember-source": "~3.10.0",
119+
"ember-source": "~3.12.0",
120120
"ember-source-channel-url": "^2.0.0",
121121
"ember-test-selectors": "^1.0.0",
122-
"ember-try": "^1.0.0",
123-
"eslint-plugin-ember": "^6.2.0",
124-
"eslint-plugin-node": "^8.0.1",
122+
"ember-try": "^1.2.1",
123+
"eslint-plugin-ember": "^6.9.1",
124+
"eslint-plugin-node": "^9.0.1",
125125
"loader.js": "^4.7.0",
126-
"mocha": "^6.0.2",
127-
"qunit-dom": "^0.8.4"
126+
"mocha": "^6.2.0",
127+
"qunit-dom": "^0.9.0"
128128
},
129129
"resolutions": {
130130
"**/tough-cookie": "~2.4.0",
131131
"ember-cli-clipboard": "^0.11.1",
132-
"ember-assign-polyfill": "^2.5.0"
132+
"ember-assign-polyfill": "^2.6.0"
133133
},
134134
"engines": {
135-
"node": "6.* || 8.* || >= 10.*"
135+
"node": "8.* || >= 10.*"
136136
},
137137
"ember-addon": {
138138
"configPath": "tests/dummy/config",

testem.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ module.exports = {
1212
// --no-sandbox is needed when running Chrome inside a container
1313
process.env.CI ? '--no-sandbox' : null,
1414
'--headless',
15-
'--disable-gpu',
1615
'--disable-dev-shm-usage',
1716
'--disable-software-rasterizer',
1817
'--mute-audio',

0 commit comments

Comments
 (0)