Skip to content

Commit

Permalink
Ember 3.12, bump some deps (#401)
Browse files Browse the repository at this point in the history
* Ember 2.12

* Bump some deps

* Set ember-href-to to previous version again

* Bump more deps

* Yarn upgrade

* Bump more deps
  • Loading branch information
RobbieTheWagner authored Aug 20, 2019
1 parent 900b09b commit f0a4c6c
Show file tree
Hide file tree
Showing 6 changed files with 2,640 additions and 2,840 deletions.
5 changes: 2 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
},
root: true,
parserOptions: {
ecmaVersion: 2017,
ecmaVersion: 2018,
sourceType: 'module'
},
plugins: [
Expand Down Expand Up @@ -46,8 +46,7 @@ module.exports = {
'tests/dummy/app/**'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2017
sourceType: 'script'
},
env: {
browser: false,
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ jobs:
- stage: versioned tests
env: EMBER_TRY_SCENARIO=ember-lts-2.12
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
- env: EMBER_TRY_SCENARIO=ember-release
- env: EMBER_TRY_SCENARIO=ember-beta
- env: EMBER_TRY_SCENARIO=ember-canary
Expand Down
8 changes: 8 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ module.exports = function() {
}
}
},
{
name: 'ember-lts-3.8',
npm: {
devDependencies: {
'ember-source': '~3.8.0'
}
}
},
{
name: 'ember-release',
npm: {
Expand Down
64 changes: 32 additions & 32 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,20 @@
"prepare": "./scripts/link-them.sh"
},
"dependencies": {
"@glimmer/syntax": "^0.36.4",
"@glimmer/syntax": "^0.42.0",
"broccoli-bridge": "^1.0.0",
"broccoli-caching-writer": "^3.0.3",
"broccoli-debug": "^0.6.4",
"broccoli-filter": "^1.2.4",
"broccoli-funnel": "^2.0.1",
"broccoli-funnel": "^2.0.2",
"broccoli-merge-trees": "^3.0.1",
"broccoli-persistent-filter": "^2.0.0",
"broccoli-persistent-filter": "^2.3.1",
"broccoli-plugin": "^1.3.1",
"broccoli-source": "^1.1.0",
"broccoli-stew": "^2.0.0",
"chalk": "^2.4.2",
"ember-auto-import": "^1.2.19",
"ember-assign-polyfill": "^2.6.0",
"ember-auto-import": "^1.5.2",
"ember-cli-autoprefixer": "^0.8.1",
"ember-cli-babel": "^7.7.3",
"ember-cli-clipboard": "^0.11.1",
Expand All @@ -48,54 +49,53 @@
"ember-cli-string-utils": "^1.1.0",
"ember-cli-tailwind": "^0.6.2",
"ember-code-snippet": "^2.4.1",
"ember-component-css": "^0.6.7",
"ember-component-css": "^0.7.4",
"ember-concurrency": "^0.9.0 || ^0.10.0 || ^1.0.0",
"ember-data": "2.x - 3.x",
"ember-fetch": "^6.2.0",
"ember-fetch": "^6.7.0",
"ember-fetch-adapter": "^0.4.3",
"ember-href-to": "^1.15.1",
"ember-keyboard": "^4.0.0",
"ember-modal-dialog": "3.0.0-beta.3",
"ember-responsive": "^3.0.1",
"ember-router-generator": "^1.2.3",
"ember-router-scroll": "^1.0.0",
"ember-svg-jar": "^1.2.2",
"ember-modal-dialog": "^3.0.0-beta.4",
"ember-responsive": "^3.0.5",
"ember-router-generator": "^2.0.0",
"ember-router-scroll": "^1.2.1",
"ember-svg-jar": "^2.1.0",
"ember-tether": "^1.0.0-beta.2",
"ember-truth-helpers": "^2.1.0",
"esm": "^3.2.4",
"esm": "^3.2.25",
"execa": "^1.0.0",
"fs-extra": "^7.0.0",
"git-repo-info": "^2.0.0",
"git-repo-info": "^2.1.0",
"highlight.js": "^9.14.2",
"hosted-git-info": "^2.7.1",
"html-entities": "^1.2.1",
"inflected": "^2.0.3",
"jsdom": "^11.12.0",
"json-api-serializer": "^1.13.0",
"liquid-fire": "^0.29.5 || ^0.30.0",
"lodash": "^4.17.11",
"lunr": "^2.3.3",
"lodash": "^4.17.15",
"lunr": "^2.3.6",
"marked": "^0.5.0",
"pad-start": "^1.0.2",
"parse-git-config": "^2.0.3",
"quick-temp": "^0.1.8",
"resolve": "^1.8.1",
"sass": "^1.17.0",
"resolve": "^1.12.0",
"sass": "^1.22.10",
"semver": "^5.5.1",
"striptags": "^3.1.1",
"walk-sync": "^0.3.3",
"yuidocjs": "^0.10.2"
},
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.1.2",
"@ember/optional-features": "^0.7.0",
"babel-eslint": "^10.0.1",
"broccoli-asset-rev": "^3.0.0",
"chai": "^4.2.0",
"common-tags": "^1.8.0",
"ember-classy-page-object": "^0.5.0",
"ember-cli": "~3.10.0",
"ember-cli-addon-docs-esdoc": "^0.2.1",
"ember-cli": "~3.12.0",
"ember-cli-addon-docs-esdoc": "^0.2.2",
"ember-cli-addon-docs-yuidoc": "^0.2.1",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-dependency-checker": "^3.1.0",
Expand All @@ -106,33 +106,33 @@
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-mirage": "^0.4.14",
"ember-cli-mirage": "^0.4.15",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.2",
"ember-cli-uglify": "^2.1.0",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-uglify": "^3.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.0.0",
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
"ember-qunit": "^4.4.1",
"ember-qunit": "^4.5.1",
"ember-resolver": "^5.0.1",
"ember-source": "~3.10.0",
"ember-source": "~3.12.0",
"ember-source-channel-url": "^2.0.0",
"ember-test-selectors": "^1.0.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^6.2.0",
"eslint-plugin-node": "^8.0.1",
"ember-try": "^1.2.1",
"eslint-plugin-ember": "^6.9.1",
"eslint-plugin-node": "^9.0.1",
"loader.js": "^4.7.0",
"mocha": "^6.0.2",
"qunit-dom": "^0.8.4"
"mocha": "^6.2.0",
"qunit-dom": "^0.9.0"
},
"resolutions": {
"**/tough-cookie": "~2.4.0",
"ember-cli-clipboard": "^0.11.1",
"ember-assign-polyfill": "^2.5.0"
"ember-assign-polyfill": "^2.6.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
"node": "8.* || >= 10.*"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
1 change: 0 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ module.exports = {
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down
Loading

0 comments on commit f0a4c6c

Please sign in to comment.