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

upgrade all the deps #144

Merged
merged 1 commit into from
May 16, 2017
Merged
Show file tree
Hide file tree
Changes from all 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
14 changes: 0 additions & 14 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,8 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.js]
indent_style = space
indent_size = 2

[*.hbs]
insert_final_newline = false
indent_style = space
indent_size = 2

[*.css]
indent_style = space
indent_size = 2

[*.html]
indent_style = space
indent_size = 2

[*.{diff,md}]
trim_trailing_whitespace = false
13 changes: 13 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
env: {
browser: true
},
rules: {
}
};
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 @@ -13,5 +13,5 @@
/connect.lock
/coverage/*
/libpeerconnection.log
npm-debug.log
npm-debug.log*
testem.log
16 changes: 16 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/bower_components
/config/ember-try.js
/dist
/tests
/tmp
**/.gitkeep
.bowerrc
.editorconfig
.ember-cli
.gitignore
.eslintrc.js
.watchmanconfig
.travis.yml
bower.json
ember-cli-build.js
testem.js
26 changes: 16 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,28 @@
---
sudo: false

language: node_js
node_js:
- "4"
- "6"
- "7"

sudo: false

cache:
yarn: true

matrix:
fast_finish: true
allow_failures:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
# prevent the npm loading indicator
- npm config --global set spin false
# if npm version is less 3.0.0 (lets say 1.x or 2.x) we should attempt to upgrade to 3
- if [[ $(npm -v | cut -d '.' -f 1) -lt 3 ]]; then npm i -g npm@^3; fi
- curl -o- -L https://yarnpkg.com/install.sh | bash
- export PATH=$HOME/.yarn/bin:$PATH
- yarn global add phantomjs-prebuilt
- phantomjs --version

install:
- npm install -g bower
- npm install
- bower install
- yarn install --no-lockfile

script:
- npm test
- yarn run test
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp"]
"ignore_dirs": ["tmp", "dist"]
}
3 changes: 1 addition & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ environment:
matrix:
- nodejs_version: "4"
- nodejs_version: "6"
- nodejs_version: "7"

cache:
- '%APPDATA%\npm-cache'
Expand All @@ -26,8 +27,6 @@ install:
- npm install phantomjs-prebuilt
- npm install mocha-appveyor-reporter
- npm install --no-optional
- npm install -g bower
- bower install

# Post-install test scripts.
test_script:
Expand Down
13 changes: 0 additions & 13 deletions bower.json

This file was deleted.

91 changes: 91 additions & 0 deletions config/ember-try.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/* eslint-env node */
module.exports = {
scenarios: [
{
name: 'ember-lts-2.4',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-4'
},
resolutions: {
'ember': 'lts-2-4'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-release',
bower: {
dependencies: {
'ember': 'components/ember#release'
},
resolutions: {
'ember': 'release'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-beta',
bower: {
dependencies: {
'ember': 'components/ember#beta'
},
resolutions: {
'ember': 'beta'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-canary',
bower: {
dependencies: {
'ember': 'components/ember#canary'
},
resolutions: {
'ember': 'canary'
}
},
npm: {
devDependencies: {
'ember-source': null
}
}
},
{
name: 'ember-default',
npm: {
devDependencies: {}
}
}
]
};
2 changes: 1 addition & 1 deletion config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*jshint node:true*/
/* eslint-env node */
'use strict';

module.exports = function(/* environment, appConfig */) {
Expand Down
16 changes: 8 additions & 8 deletions node-tests/addon-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"bar.js": `var bar = function bar() {};`,
"foo.js": `var foo = function foo() {};`,
"bar.js": `define("bar", [], function () {\n "use strict";\n\n var bar = function bar() {};\n});`,
"foo.js": `define("foo", [], function () {\n "use strict";\n\n var foo = function foo() {};\n});`,
});
}));

Expand Down Expand Up @@ -99,7 +99,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": contents
"foo.js": `define('foo', ['@glimmer/env'], function (_env) {\n 'use strict';\n\n if (_env.DEBUG) {\n console.log('debug mode!');\n }\n});`
});
}));

Expand All @@ -122,7 +122,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `\nif (true) {\n console.log('debug mode!');\n}`
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n if (true) {\n console.log('debug mode!');\n }\n});`
});
}));

Expand All @@ -144,7 +144,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `(true && Ember.assert('stuff here', isNotBad()));`
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n (true && Ember.assert('stuff here', isNotBad()));\n});`
});
}));
});
Expand All @@ -168,11 +168,11 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `\nif (false) {\n console.log('debug mode!');\n}`
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n if (false) {\n console.log('debug mode!');\n }\n});`
});
}));

it("should replace debug macros by default ", co.wrap(function* () {
it('should replace debug macros by default ', co.wrap(function* () {
process.env.EMBER_ENV = 'production';

input.write({
Expand All @@ -190,7 +190,7 @@ describe('ember-cli-babel', function() {
expect(
output.read()
).to.deep.equal({
"foo.js": `(false && Ember.assert('stuff here', isNotBad()));`
"foo.js": `define('foo', [], function () {\n 'use strict';\n\n (false && Ember.assert('stuff here', isNotBad()));\n});`
});
}));
});
Expand Down
34 changes: 18 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,38 +36,40 @@
},
"dependencies": {
"amd-name-resolver": "0.0.6",
"babel-plugin-debug-macros": "^0.1.6",
"babel-plugin-debug-macros": "^0.1.7",
"babel-plugin-transform-es2015-modules-amd": "^6.24.0",
"babel-polyfill": "^6.16.0",
"babel-preset-env": "^1.2.0",
"broccoli-babel-transpiler": "^6.0.0",
"broccoli-funnel": "^1.0.0",
"broccoli-source": "^1.1.0",
"clone": "^2.0.0",
"ember-cli-version-checker": "^1.2.0"
"ember-cli-version-checker": "^2.0.0"
},
"devDependencies": {
"broccoli-test-helper": "^1.1.0",
"chai": "^3.5.0",
"co": "^4.6.0",
"common-tags": "^1.4.0",
"console-ui": "^1.0.2",
"core-object": "^2.0.6",
"ember-cli": "^2.6.2",
"ember-cli-dependency-checker": "^1.2.0",
"ember-cli-htmlbars": "^1.0.8",
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.1",
"ember-cli-inject-live-reload": "^1.3.1",
"ember-cli-qunit": "^3.0.2",
"ember-export-application-global": "^1.0.3",
"ember-load-initializers": "0.5.1",
"ember-resolver": "^2.1.0",
"loader.js": "4.0.11",
"mocha": "^3.2.0",
"resolve": "^1.3.2"
"core-object": "^3.1.0",
"ember-cli": "2.13.1",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.0.0",
"ember-cli-shims": "^1.1.0",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "^2.13.0",
"loader.js": "^4.4.0",
"mocha": "^3.4.1",
"resolve": "^1.3.3"
},
"engines": {
"node": "^4.5 || 6.* || 7.*"
"node": "=> 4"
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
6 changes: 3 additions & 3 deletions testem.json → testem.js
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"framework": "qunit",
/* eslint-env node */
module.exports = {
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
Expand All @@ -9,4 +9,4 @@
"PhantomJS",
"Chrome"
]
}
};
5 changes: 5 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
env: {
embertest: true
}
};
8 changes: 4 additions & 4 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import Ember from 'ember';
import Resolver from 'ember/resolver';
import loadInitializers from 'ember/load-initializers';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

var App;
let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver: Resolver
Resolver
});

loadInitializers(App, config.modulePrefix);
Expand Down
Loading