Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update ember-cli and related dependencies
- Loading branch information
Showing
32 changed files
with
3,542 additions
and
2,098 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/blueprints/*/files/**/*.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,53 @@ | ||
module.exports = { | ||
root: true, | ||
parserOptions: { | ||
ecmaVersion: 6, | ||
ecmaVersion: 2017, | ||
sourceType: 'module' | ||
}, | ||
extends: 'eslint:recommended', | ||
plugins: [ | ||
'ember' | ||
], | ||
extends: [ | ||
'eslint:recommended', | ||
'plugin:ember/recommended' | ||
], | ||
env: { | ||
'browser': true | ||
}, | ||
globals: { | ||
'Tether': false | ||
}, | ||
rules: { | ||
} | ||
}, | ||
overrides: [ | ||
// node files | ||
{ | ||
files: [ | ||
'ember-cli-build.js', | ||
'index.js', | ||
'testem.js', | ||
'blueprints/*/index.js', | ||
'config/**/*.js', | ||
'tests/dummy/config/**/*.js' | ||
], | ||
excludedFiles: [ | ||
'addon/**', | ||
'addon-test-support/**', | ||
'app/**', | ||
'tests/dummy/app/**' | ||
], | ||
parserOptions: { | ||
sourceType: 'script', | ||
ecmaVersion: 2015 | ||
}, | ||
env: { | ||
browser: false, | ||
node: true | ||
}, | ||
plugins: ['node'], | ||
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, { | ||
// add your custom rules and overrides for node files here | ||
}) | ||
} | ||
] | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,48 @@ | ||
--- | ||
language: node_js | ||
node_js: | ||
# we recommend testing addons with the same minimum supported node version as Ember CLI | ||
# so that your addon works for all apps | ||
- "4" | ||
|
||
sudo: false | ||
dist: trusty | ||
sudo: required | ||
|
||
addons: | ||
apt: | ||
sources: | ||
- google-chrome | ||
packages: | ||
- google-chrome-stable | ||
chrome: stable | ||
|
||
cache: | ||
yarn: true | ||
|
||
env: | ||
global: | ||
# See https://git.io/vdao3 for details. | ||
- JOBS=1 | ||
matrix: | ||
# we recommend new addons test the current and previous LTS | ||
# as well as latest stable release (bonus points to beta/canary) | ||
- EMBER_TRY_SCENARIO=ember-lts-2.12 | ||
- EMBER_TRY_SCENARIO=ember-lts-2.16 | ||
- EMBER_TRY_SCENARIO=ember-lts-2.18 | ||
- EMBER_TRY_SCENARIO=ember-release | ||
- EMBER_TRY_SCENARIO=ember-beta | ||
- EMBER_TRY_SCENARIO=ember-canary | ||
- EMBER_TRY_SCENARIO=ember-default | ||
|
||
matrix: | ||
fast_finish: true | ||
allow_failures: | ||
- env: EMBER_TRY_SCENARIO=ember-canary | ||
|
||
before_install: | ||
- "export DISPLAY=:99.0" | ||
- "sh -e /etc/init.d/xvfb start" | ||
- sleep 3 | ||
- curl -o- -L https://yarnpkg.com/install.sh | bash | ||
- export PATH=$HOME/.yarn/bin:$PATH | ||
- yarn global add bower | ||
|
||
install: | ||
- yarn install --no-lockfile | ||
- bower install | ||
- yarn install --no-lockfile --non-interactive | ||
|
||
script: | ||
- yarn lint:js | ||
# Usually, it's ok to finish the test scenario without reverting | ||
# to the addon's original dependency state, skipping "cleanup". | ||
- ember try:each --skip-cleanup | ||
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,91 +1,71 @@ | ||
/* eslint-env node */ | ||
module.exports = { | ||
scenarios: [ | ||
{ | ||
name: 'ember-lts-2.4', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#lts-2-4' | ||
'use strict'; | ||
|
||
const getChannelURL = require('ember-source-channel-url'); | ||
|
||
module.exports = function() { | ||
return Promise.all([ | ||
getChannelURL('release'), | ||
getChannelURL('beta'), | ||
getChannelURL('canary') | ||
]).then((urls) => { | ||
return { | ||
useYarn: true, | ||
scenarios: [ | ||
{ | ||
name: 'ember-lts-2.12', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~2.12.0' | ||
} | ||
} | ||
}, | ||
resolutions: { | ||
'ember': 'lts-2-4' | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-lts-2.8', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#lts-2-8' | ||
{ | ||
name: 'ember-lts-2.16', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~2.16.0' | ||
} | ||
} | ||
}, | ||
resolutions: { | ||
'ember': 'lts-2-8' | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-release', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#release' | ||
{ | ||
name: 'ember-lts-2.18', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': '~2.18.0' | ||
} | ||
} | ||
}, | ||
resolutions: { | ||
'ember': 'release' | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-beta', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#beta' | ||
{ | ||
name: 'ember-release', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': urls[0] | ||
} | ||
} | ||
}, | ||
resolutions: { | ||
'ember': 'beta' | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-canary', | ||
bower: { | ||
dependencies: { | ||
'ember': 'components/ember#canary' | ||
{ | ||
name: 'ember-beta', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': urls[1] | ||
} | ||
} | ||
}, | ||
resolutions: { | ||
'ember': 'canary' | ||
} | ||
}, | ||
npm: { | ||
devDependencies: { | ||
'ember-source': null | ||
{ | ||
name: 'ember-canary', | ||
npm: { | ||
devDependencies: { | ||
'ember-source': urls[2] | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-default', | ||
npm: { | ||
devDependencies: {} | ||
} | ||
} | ||
} | ||
}, | ||
{ | ||
name: 'ember-default', | ||
npm: { | ||
devDependencies: {} | ||
} | ||
} | ||
] | ||
] | ||
}; | ||
}); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
/* eslint-env node */ | ||
'use strict'; | ||
|
||
module.exports = function(/* environment, appConfig */) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.