Skip to content

Commit

Permalink
chore: Update ember-cli (#184)
Browse files Browse the repository at this point in the history
* chore(package): Bump to ember-cli@2.14.2

* chore(package): Bump to ember-themed-syntax@0.1.1

* chore(package): Bump to ember-css-modules@0.7.3
  • Loading branch information
ynnoj committed Aug 25, 2017
1 parent 1cf9800 commit 6b4a4dd
Show file tree
Hide file tree
Showing 18 changed files with 2,400 additions and 1,844 deletions.
4 changes: 0 additions & 4 deletions .bowerrc

This file was deleted.

2 changes: 1 addition & 1 deletion .eslintrc.js
@@ -1,7 +1,7 @@
module.exports = {
root: true,
parserOptions: {
ecmaVersion: 6,
ecmaVersion: 2017,
sourceType: 'module'
},
extends: 'eslint:recommended',
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -14,4 +14,10 @@
/coverage/*
/libpeerconnection.log
npm-debug.log*
yarn-error.log
testem.log

# ember-try
.node_modules.ember-try/
bower.json.ember-try
package.json.ember-try
24 changes: 12 additions & 12 deletions .travis.yml
@@ -1,19 +1,20 @@
---
language: node_js
node_js:
- "6"
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- "4"

sudo: false

cache:
directories:
- $HOME/.npm
- $HOME/.cache # includes bowers cache
yarn: true

env:
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.4
# we recommend new addons test the current and previous LTS
# as well as latest stable release (bonus points to beta/canary)
- EMBER_TRY_SCENARIO=ember-lts-2.8
- EMBER_TRY_SCENARIO=ember-lts-2.12
- EMBER_TRY_SCENARIO=ember-release
- EMBER_TRY_SCENARIO=ember-beta
- EMBER_TRY_SCENARIO=ember-canary
Expand All @@ -25,16 +26,15 @@ matrix:
- env: EMBER_TRY_SCENARIO=ember-canary

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- 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
- bower install
- yarn install --no-lockfile --non-interactive

script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup
3 changes: 1 addition & 2 deletions addon/services/notification-messages-service.js
Expand Up @@ -7,7 +7,6 @@ const globals = config['ember-cli-notifications']; // Import app config object
const {
ArrayProxy,
A,
Object,
isEmpty,
getWithDefault,
run
Expand All @@ -23,7 +22,7 @@ const NotificationMessagesService = ArrayProxy.extend({
throw new Error("No notification message set");
}

const notification = Object.create({
const notification = Ember.Object.create({
message: options.message,
type: options.type || 'info',
autoClear: (isEmpty(options.autoClear) ? getWithDefault(globals, 'autoClear', false) : options.autoClear),
Expand Down
9 changes: 0 additions & 9 deletions bower.json

This file was deleted.

18 changes: 5 additions & 13 deletions config/ember-try.js
Expand Up @@ -2,13 +2,13 @@
module.exports = {
scenarios: [
{
name: 'ember-lts-2.4',
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-4'
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-4'
'ember': 'lts-2-8'
}
},
npm: {
Expand All @@ -18,18 +18,10 @@ module.exports = {
}
},
{
name: 'ember-lts-2.8',
bower: {
dependencies: {
'ember': 'components/ember#lts-2-8'
},
resolutions: {
'ember': 'lts-2-8'
}
},
name: 'ember-lts-2.12',
npm: {
devDependencies: {
'ember-source': null
'ember-source': '~2.12.0'
}
}
},
Expand Down
4 changes: 3 additions & 1 deletion ember-cli-build.js
@@ -1,8 +1,10 @@
/* eslint-env node */
'use strict';

const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');

module.exports = function(defaults) {
var app = new EmberAddon(defaults, {
let app = new EmberAddon(defaults, {
cssModules: {
plugins: [
require('postcss-import')
Expand Down
33 changes: 18 additions & 15 deletions package.json
Expand Up @@ -27,9 +27,9 @@
},
"dependencies": {
"broccoli-funnel": "^1.2.0",
"ember-cli-babel": "^5.1.7",
"ember-cli-htmlbars": "^1.1.1",
"ember-css-modules": "0.7.2",
"ember-cli-babel": "^6.3.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-css-modules": "^0.7.3",
"ember-get-config": "0.2.2",
"ember-runtime-enumerable-includes-polyfill": "^2.0.0",
"font-awesome": "^4.7.0",
Expand All @@ -46,29 +46,32 @@
"basscss-darken": "^1.1.0",
"basscss-forms": "^1.0.0",
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^2.4.1",
"ember-cli": "2.12.2",
"code-highlight-linenums": "^0.2.1",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.14.2",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-eslint": "^3.0.0",
"ember-cli-github-pages": "0.1.2",
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^3.1.0",
"ember-cli-shims": "^1.0.2",
"ember-cli-qunit": "^4.0.0",
"ember-cli-shims": "^1.1.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.6.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-radio-button": "1.1.1",
"ember-resolver": "^2.0.3",
"ember-source": "~2.12.0",
"ember-themed-syntax": "0.0.7",
"ember-resolver": "^4.0.0",
"ember-source": "~2.14.1",
"ember-themed-syntax": "^0.1.1",
"highlightjs": "^9.10.0",
"hljs-themes": "^1.0.0",
"loader.js": "^4.2.3",
"postcss-import": "^10.0.0"
},
"engines": {
"node": ">= 4"
"node": "^4.5 || 6.* || >= 7.*"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
14 changes: 7 additions & 7 deletions testem.js
@@ -1,12 +1,12 @@
/* eslint-env node */
module.exports = {
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: [
'PhantomJS'
],
"launch_in_dev": [
"PhantomJS",
"Chrome"
launch_in_dev: [
'PhantomJS',
'Chrome'
]
};
6 changes: 1 addition & 5 deletions tests/dummy/app/app.js
Expand Up @@ -3,11 +3,7 @@ import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

let App;

Ember.MODEL_FACTORY_INJECTIONS = true;

App = Ember.Application.extend({
const App = Ember.Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand Down
Empty file removed tests/dummy/app/styles/.gitkeep
Empty file.
Empty file removed tests/dummy/app/views/.gitkeep
Empty file.
5 changes: 3 additions & 2 deletions tests/dummy/config/environment.js
@@ -1,9 +1,10 @@
/* eslint-env node */
'use strict';

module.exports = function(environment) {
var ENV = {
let ENV = {
modulePrefix: 'dummy',
environment: environment,
environment,
rootURL: '/',
locationType: 'auto',
EmberENV: {
Expand Down
9 changes: 9 additions & 0 deletions tests/dummy/config/targets.js
@@ -0,0 +1,9 @@
/* eslint-env node */
module.exports = {
browsers: [
'ie 9',
'last 1 Chrome versions',
'last 1 Firefox versions',
'last 1 Safari versions'
]
};
4 changes: 2 additions & 2 deletions tests/helpers/module-for-acceptance.js
Expand Up @@ -3,7 +3,7 @@ import Ember from 'ember';
import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app';

const { RSVP: { Promise } } = Ember;
const { RSVP: { resolve } } = Ember;

export default function(name, options = {}) {
module(name, {
Expand All @@ -17,7 +17,7 @@ export default function(name, options = {}) {

afterEach() {
let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
return Promise.resolve(afterEach).then(() => destroyApp(this.application));
return resolve(afterEach).then(() => destroyApp(this.application));
}
});
}
2 changes: 2 additions & 0 deletions tests/test-helper.js
Expand Up @@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
import {
setResolver
} from 'ember-qunit';
import { start } from 'ember-cli-qunit';

setResolver(resolver);
start();

0 comments on commit 6b4a4dd

Please sign in to comment.