-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #104 from villander/upgrate-octane
Update addon to [email protected]
- Loading branch information
Showing
9 changed files
with
2,178 additions
and
384 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 |
|---|---|---|
| @@ -1,13 +1,45 @@ | ||
| module.exports = { | ||
| root: true, | ||
| parserOptions: { | ||
| ecmaVersion: 2017, | ||
| ecmaVersion: 2018, | ||
| sourceType: 'module' | ||
| }, | ||
| extends: 'eslint: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' | ||
| }, | ||
| 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 |
|---|---|---|
| @@ -1,83 +1,74 @@ | ||
| /* eslint-env node */ | ||
| module.exports = { | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-2.8', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#lts-2-8' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'lts-2-8' | ||
| 'use strict'; | ||
|
|
||
| const getChannelURL = require('ember-source-channel-url'); | ||
|
|
||
| module.exports = async function() { | ||
| return { | ||
| useYarn: true, | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-3.4', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~3.4.0' | ||
| } | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-lts-2.12', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.12.0' | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-release', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#release' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'release' | ||
| { | ||
| name: 'ember-lts-3.8', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~3.8.0' | ||
| } | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| { | ||
| name: 'ember-release', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': await getChannelURL('release') | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#beta' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'beta' | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': await getChannelURL('beta') | ||
| } | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| { | ||
| name: 'ember-canary', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': await getChannelURL('canary') | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#canary' | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'canary' | ||
| }, | ||
| // The default `.travis.yml` runs this scenario via `yarn 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: {} | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| { | ||
| 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: {} | ||
| } | ||
| } | ||
| ] | ||
| ] | ||
| }; | ||
| }; |
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 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,21 @@ | ||
| { | ||
| "schemaVersion": "1.0.0", | ||
| "packages": [ | ||
| { | ||
| "name": "ember-cli", | ||
| "version": "3.12.0", | ||
| "blueprints": [ | ||
| { | ||
| "name": "addon", | ||
| "outputRepo": "https://github.com/ember-cli/ember-addon-output", | ||
| "codemodsSource": "ember-addon-codemods-manifest@1", | ||
| "isBaseBlueprint": true, | ||
| "options": [ | ||
| "--yarn", | ||
| "--no-welcome" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
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.