-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* fix sinon.stub deprecation * replace deprecated merge() with assign() * add ember-try * bump deps * remove limit to specific branches * remove bower files
- Loading branch information
Showing
18 changed files
with
6,977 additions
and
3,899 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,20 @@ | ||
| # unconventional js | ||
| /blueprints/*/files/ | ||
| /vendor/ | ||
|
|
||
| # compiled output | ||
| /dist/ | ||
| /tmp/ | ||
|
|
||
| # dependencies | ||
| /bower_components/ | ||
| /node_modules/ | ||
|
|
||
| # misc | ||
| /coverage/ | ||
| !.* | ||
|
|
||
| # ember-try | ||
| /.node_modules.ember-try/ | ||
| /bower.json.ember-try | ||
| /package.json.ember-try |
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,13 +1,52 @@ | ||
| module.exports = { | ||
| root: true, | ||
| parserOptions: { | ||
| ecmaVersion: 2017, | ||
| ecmaVersion: 2018, | ||
| sourceType: 'module' | ||
| }, | ||
| extends: 'eslint:recommended', | ||
| plugins: [ | ||
| 'ember' | ||
| ], | ||
| extends: [ | ||
| 'eslint:recommended', | ||
| 'plugin:ember/recommended' | ||
| ], | ||
| env: { | ||
| browser: true | ||
| }, | ||
| rules: { | ||
| } | ||
| }, | ||
| overrides: [ | ||
| // node files | ||
| { | ||
| files: [ | ||
| '.eslintrc.js', | ||
| '.template-lintrc.js', | ||
| '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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,8 @@ | |
| /bower_components | ||
|
|
||
| # misc | ||
| /.env* | ||
| /.pnp* | ||
| /.sass-cache | ||
| /connect.lock | ||
| /coverage/* | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| 'use strict'; | ||
|
|
||
| module.exports = { | ||
| extends: 'recommended' | ||
| }; |
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,84 +1,85 @@ | ||
| /* eslint-env node */ | ||
| module.exports = { | ||
| useYarn: true, | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-2.12', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.12.0' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-lts-2.16', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.16.0' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-lts-2.18', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.18.0' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-release', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#release' | ||
| '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, | ||
| command: "ember test --query 'nolint&nojscs'", | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-2.18', | ||
| env: { | ||
| EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| '@ember/jquery': '^0.5.1', | ||
| 'ember-source': '~2.18.0' | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'release' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#beta' | ||
| { | ||
| name: 'ember-lts-3.4', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~3.4.0' | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'beta' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#canary' | ||
| { | ||
| name: 'ember-release', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': urls[0] | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'canary' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| { | ||
| name: 'ember-beta', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': urls[1] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': urls[2] | ||
| } | ||
| } | ||
| }, | ||
| // The default `.travis.yml` runs this scenario via `npm test`, | ||
| // not via `ember try`. It's still included here so that running | ||
| // `ember try:each` manually or from a customized CI config will run it | ||
| // along with all the other scenarios. | ||
| { | ||
| name: 'ember-default', | ||
| npm: { | ||
| devDependencies: {} | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-default-with-jquery', | ||
| env: { | ||
| EMBER_OPTIONAL_FEATURES: JSON.stringify({ | ||
| 'jquery-integration': true | ||
| }) | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| '@ember/jquery': '^0.5.1' | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-default', | ||
| npm: { | ||
| devDependencies: {} | ||
| } | ||
| } | ||
| ] | ||
| ] | ||
| }; | ||
| }); | ||
| }; |
Oops, something went wrong.