Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to [email protected] #460

Merged
merged 17 commits into from
Aug 2, 2017
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions .eslintrc → .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
{
"extends": ["frost-standard"],
"globals": {
"URL": false
},
"rules": {
module.exports = {
extends: 'frost-standard',
rules: {
"ocd/sort-import-declarations": [
2,
{
"localPrefixes": [
localPrefixes: [
"../",
"./",
"dummy/",
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
Expand All @@ -14,7 +14,7 @@
/coverage/*
/libpeerconnection.log
coverage.json
npm-debug.log
npm-debug.log*
testem.log
.idea
ge.json
Expand Down
21 changes: 11 additions & 10 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.travis/
bower_components/
coverage/
dist/
node_modules/
tests/
tmp/
/.travis
/bower_components
/config/ember-try.js
/coverage
/dist
/tests
/tmp

**/.gitkeep

Expand All @@ -13,14 +13,15 @@ tmp/
.editorconfig
.ember-cli
.eslintignore
.eslintrc
.eslintrc.js
.gitignore
.idea
.npmignore
.pullapprove.yml
.remarkrc
.sass-lint.yml
.travis.yml
.watchmanconfig
bower.json
Brocfile.js
ember-cli-build.js
testem.js
testem.json
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ addons:
firefox: 'latest-esr'
cache:
directories:
- node_modules
- node_module
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be node_modules

env:
matrix:
- EMBER_TRY_SCENARIO=ember-2-8
- EMBER_TRY_SCENARIO=default
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-default
global:
- CXX=g++-4.8
- secure: UAeyuAKSROuXqFhNeMMMKhSTwyO7J1o/dyT7p/nVVlxagujCD2A4ggzREg+HBCWDurDqdmN5tVYTC+crVVgjmX9lIpukDGAomXR5wln8niSlu4H0rxqBdbjuCKFbS8EPKy56c/n50TNMjMCkCejAU8sdZLbJT8OMHpLMdl+WkyCGEzBgNiTbxUFu5AkuVAhhS0xBChiBh6uCLXqOku9B2UDIs9U9qYV99B0HLOeksZS/errOtVpaJr+qQOP0tm+cbtUxeI+Ub+uEnnuoKjbEtJwnzaToZPA2i9X+Xe9WR0sIXFmS/vF1syVYdvZE2z/fCCydjwczM93Td/Oq9KluFikwX+y807MmgjFiv1rSeBRLob8wKQBlNoEc+NydDsRdQjsFjOQWG0yc/C78Xqi7PHipZw/Wf5GzOgxmxqjOvM2s16VBI9UJPcMme7FykDeHwoROi4xCGvjFLyxJ3UjsthwY+uRS1YVmGIlqMUJEdSUquAeVevRaEaPmH4n6qdXsTjMw+75UPfw4SgBZuO0DFnC8Tgr4UZY6IkL7NQxWenZZje1pkjTkBHLy7SitNjugEYqukVf5SGUyC2mtMbbBDOlZBQML9/s7jbmGFENbAc2+EtvVq2Hu+u+DciN9IRSwZtmI06p8d1ifCwoU1NU7RCdchu22n0D8/EG6aDuOwDI=
Expand Down Expand Up @@ -49,7 +49,7 @@ deploy:
secure: ESPMbZwhsrfGfO/p+f5ykZFWImTxNHe8Wab2+EZge87P8ZojO0JhkpnpCM8p9mrHOz+gp2exzGViyjS1FoIRw8yr0kV2fbuCUhZy014nft9WtGnwGs/f9y7odFBOGIlRg4i23VtRjKtE9xsNdS6bOORtxg6IK/b9l25sd+dEhhPG29HkWmGGnjCeWFGTRum0jF7HMCRAp1FSKvELIdDegBs9qxMuv5yu5ozGRyjufwXRSkWd9o0FQDTweJPqGF+izkf5am8q0jbYRlZdUBCMw4Ew4bhtmx1oDOmUO+WgPUCPzfXirvwsMTQaaK2em5PIF78S2yQNh8PTziRcOOMmXGnKmZwcypsQ2Bd6GDOOG6vsXZ9cMpWpnCpPPx44bR2jwuwUrSfjSPv3OJgZIo4RP75NIPv46tST0JdFqth+kEBtCzHNgpQWyBUUFIyoqSjkTKk4WHA/JVHIrOamp0WoZnG/e9CwuC3IXh4fIlyjI6rTMjP9U82Z+rxNmk149WoQ9ilYqlcVv+xUjQsb4zRda7LGeHGzG5f4onwdv4Pg0BiHkKAwYLClwV1GAK6+oQsyw2jpyW4dRuR79zp0dw+cluad78x4mKhqJkf5HmqTsrwDdfAn27WzOW8YT12iaULnn/IE1xBfVNEp8AqMUAxPcEUjusOx3o+TAb4m9ale7cg=
on:
all_branches: true
condition: "$EMBER_TRY_SCENARIO = 'default'"
condition: "$EMBER_TRY_SCENARIO = 'ember-default'"
node: '6.9.1'
tags: true
notifications:
Expand Down
2 changes: 1 addition & 1 deletion .travis/maybe-bump-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ then
exit 0
fi

if [ "$EMBER_TRY_SCENARIO" != "default" ]
if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
then
echo "Skipping version bump for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
exit 0
Expand Down
2 changes: 1 addition & 1 deletion .travis/maybe-publish-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ then
exit 0
fi

if [ "$EMBER_TRY_SCENARIO" != "default" ]
if [ "$EMBER_TRY_SCENARIO" != "ember-default" ]
then
echo "Skipping coverage publish for EMBER_TRY_SCENARIO ${EMBER_TRY_SCENARIO}"
exit 0
Expand Down
157 changes: 37 additions & 120 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -1,140 +1,36 @@
/* eslint-env node */

module.exports = {
scenarios: [
{
name: 'default',
bower: {
dependencies: { }
}
},
{
name: 'ember-1-12',
bower: {
dependencies: {
'ember': '~1.12.0'
},
resolutions: {
'ember': '~1.12.0'
}
}
},
{
name: 'ember-1-13',
bower: {
dependencies: {
'ember': '~1.13.0'
},
resolutions: {
'ember': '~1.13.0'
}
}
},
{
name: 'ember-2-0',
bower: {
dependencies: {
'ember': '~2.0.0'
},
resolutions: {
'ember': '~2.0.0'
}
}
},
{
name: 'ember-2-1',
bower: {
dependencies: {
'ember': '~2.1.0'
},
resolutions: {
'ember': '~2.1.0'
}
}
},
{
name: 'ember-2-2',
bower: {
dependencies: {
'ember': '~2.2.0'
},
resolutions: {
'ember': '~2.2.0'
}
}
},
{
name: 'ember-2-3',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': '~2.3.0'
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': '~2.3.0'
'ember': 'lts-2-8'
}
}
},
{
name: 'ember-2-4',
bower: {
dependencies: {
'ember': '~2.4.0'
},
resolutions: {
'ember': '~2.4.0'
}
}
},
{
name: 'ember-2-5',
bower: {
dependencies: {
'ember': '~2.5.0'
},
resolutions: {
'ember': '~2.5.0'
}
}
},
{
name: 'ember-2-6',
bower: {
dependencies: {
'ember': '~2.6.0'
},
resolutions: {
'ember': '~2.6.0'
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-2-7',
name: 'ember-lts-2.12',
bower: {
dependencies: {
'ember': '~2.7.0'
'ember': 'components/ember#lts-2-12'
},
resolutions: {
'ember': '~2.7.0'
'ember': 'lts-2-12'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be updated to:

{
      name: 'ember-lts-2.12',
      npm: {
        devDependencies: {
          'ember-source': '~2.12.0'
        }
      }
    },

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed that one. Thanks for the catch.

}
}
},
{
name: 'ember-2-8',
bower: {
dependencies: {
'ember': '~2.8.0'
},
resolutions: {
'ember': '~2.8.0'
}
}
},
{
name: 'ember-2-9',
bower: {
dependencies: {
'ember': '~2.9.0'
},
resolutions: {
'ember': '~2.9.0'
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
Expand All @@ -147,6 +43,11 @@ module.exports = {
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -158,6 +59,11 @@ module.exports = {
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
Expand All @@ -169,6 +75,17 @@ module.exports = {
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
Expand Down
1 change: 1 addition & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-env node */
'use strict'

module.exports = function (/* environment, appConfig */) {
Expand Down
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* global require, module */
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon')
/* eslint-env node */
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon')

module.exports = function (defaults) {
var app = new EmberAddon(defaults, {
Expand Down
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* globals module */

/* eslint-env node */
'use strict'

module.exports = {
Expand Down
Loading