-
Notifications
You must be signed in to change notification settings - Fork 13
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 #82 from billybonks/upgrade-broccoli
Upgrade broccoli
- Loading branch information
Showing
11 changed files
with
120 additions
and
168 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
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,74 +1,70 @@ | ||
| module.exports = { | ||
| 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-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 { | ||
| scenarios: [ | ||
| { | ||
| name: 'ember-lts-2.12', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.12.0' | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'release' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#beta' | ||
| { | ||
| name: 'ember-lts-2.16', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.16.0' | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'beta' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-canary', | ||
| bower: { | ||
| dependencies: { | ||
| 'ember': 'components/ember#canary' | ||
| { | ||
| name: 'ember-lts-2.18', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': '~2.18.0' | ||
| } | ||
| } | ||
| }, | ||
| resolutions: { | ||
| 'ember': 'canary' | ||
| } | ||
| }, | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': null | ||
| { | ||
| name: 'ember-release', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': urls[0] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| name: 'ember-beta', | ||
| npm: { | ||
| devDependencies: { | ||
| 'ember-source': urls[1] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| 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
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,8 +1,18 @@ | ||
| 'use strict'; | ||
|
|
||
| const browsers = [ | ||
| 'last 1 Chrome versions', | ||
| 'last 1 Firefox versions', | ||
| 'last 1 Safari versions' | ||
| ]; | ||
|
|
||
| const isCI = !!process.env.CI; | ||
| const isProduction = process.env.EMBER_ENV === 'production'; | ||
|
|
||
| if (isCI || isProduction) { | ||
| browsers.push('ie 11'); | ||
| } | ||
|
|
||
| module.exports = { | ||
| browsers: [ | ||
| 'ie 9', | ||
| 'last 1 Chrome versions', | ||
| 'last 1 Firefox versions', | ||
| 'last 1 Safari versions' | ||
| ] | ||
| browsers | ||
| }; |
Empty file.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.