Skip to content

Commit

Permalink
Merge pull request #58 from calvinlough/update-deps
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
calvinlough authored Jan 25, 2019
2 parents 5f21b62 + d3919e3 commit 48994d4
Show file tree
Hide file tree
Showing 7 changed files with 6,122 additions and 2,023 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ module.exports = {
'node': true
},
globals: {
'window': true,
'EMBER_CLI_CONDITIONAL_COMPILE_INJECTIONS': true,
'ENABLE_FOO': true,
'ENABLE_BAR': true,
'visit': true,
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
language: node_js
node_js:
- "7"
- "10"

sudo: false
cache: yarn
Expand Down
9 changes: 3 additions & 6 deletions app/initializers/ember-cli-conditional-compile-features.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import Ember from 'ember';

var initializer = {
const initializer = {
name: 'ember-cli-conditional-compile-features',
initialize: function(application) {
Ember.Logger.info('Initializing feature flags');
}
initialize: function() {}
};

var feature_flags = EMBER_CLI_CONDITIONAL_COMPILE_INJECTIONS;
const feature_flags = EMBER_CLI_CONDITIONAL_COMPILE_INJECTIONS;
Object.keys(feature_flags).map(function(flag) {
window[flag] = feature_flags[flag];
})
Expand Down
67 changes: 32 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,46 +20,43 @@
"author": "",
"license": "MIT",
"devDependencies": {
"babel-eslint": "~7.2.0",
"bower": "^1.8.2",
"broccoli-asset-rev": "~2.5.0",
"broccoli-test-helper": "^1.1.0",
"chai": "^4.0.1",
"babel-eslint": "~10.0.1",
"broccoli-asset-rev": "~3.0.0",
"broccoli-test-helper": "^2.0.0",
"chai": "^4.2.0",
"co": "^4.6.0",
"common-tags": "^1.4.0",
"ember-cli-dependency-checker": "~2.0.0",
"ember-cli-eslint": "~3.1.0",
"ember-cli-htmlbars-inline-precompile": "~0.4.3",
"ember-cli-htmlbars": "~2.0.1",
"ember-cli-ic-ajax": "1.0.0",
"ember-cli-inject-live-reload": "~1.6.0",
"ember-cli-qunit": "~4.0.0",
"ember-cli-release": "~0.2.0",
"ember-cli-shims": "1.1.0",
"ember-cli-test-loader": "~2.1.0",
"ember-cli-uglify": "~1.2.0",
"ember-cli": "~2.13.2",
"ember-disable-prototype-extensions": "~1.1.0",
"ember-disable-proxy-controllers": "~1.0.1",
"ember-load-initializers": "1.0.0",
"ember-resolver": "~4.1.0",
"ember-source": "^2.13.3",
"eslint-plugin-ember": "^3.1.2",
"eslint": "~3.19.0",
"glob": "~7.1.0",
"loader.js": "4.4.0",
"mocha": "^3.4.2"
"common-tags": "^1.8.0",
"ember-cli": "~3.7.1",
"ember-cli-dependency-checker": "~3.1.0",
"ember-cli-eslint": "~5.1.0",
"ember-cli-htmlbars": "~3.0.1",
"ember-cli-htmlbars-inline-precompile": "~2.1.0",
"ember-cli-inject-live-reload": "~2.0.1",
"ember-cli-qunit": "~4.4.0",
"ember-cli-release": "~1.0.0-beta.2",
"ember-cli-shims": "1.2.0",
"ember-cli-test-loader": "~2.2.0",
"ember-cli-uglify": "~2.1.0",
"ember-load-initializers": "2.0.0",
"ember-resolver": "~5.0.1",
"ember-source": "^3.7.2",
"ember-try": "^1.1.0",
"eslint": "~5.12.1",
"eslint-plugin-ember": "^6.1.0",
"glob": "~7.1.3",
"loader.js": "4.7.0",
"mocha": "^5.2.0"
},
"dependencies": {
"babel-plugin-inline-replace-variables": "1.3.1",
"broccoli-babel-transpiler": "^6.0.0",
"broccoli-funnel": "~1.2.0",
"broccoli-babel-transpiler": "^7.1.1",
"broccoli-funnel": "~2.0.1",
"broccoli-replace": "0.12.0",
"chalk": "~1.1.0",
"ember-cli-babel": "~6.4.1",
"ember-cli-version-checker": "~2.0.0",
"lodash.merge": "~4.6.0",
"object-hash": "^1.1.8"
"chalk": "~2.4.2",
"ember-cli-babel": "~7.4.0",
"ember-cli-version-checker": "~3.0.1",
"lodash.merge": "~4.6.1",
"object-hash": "^1.3.1"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
29 changes: 29 additions & 0 deletions testem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-env node */
module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
launch_in_ci: [
'Chrome'
],
launch_in_dev: [
'Chrome'
],
browser_start_timeout: 60,
browser_disconnect_timeout: 1000,
parallel: -1,
browser_args: {
Chrome: [
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--disable-web-security',
'--headless',
'--incognito',
'--mute-audio',
'--no-sandbox',
'--remote-debugging-address=0.0.0.0',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
}
};
12 changes: 0 additions & 12 deletions testem.json

This file was deleted.

Loading

0 comments on commit 48994d4

Please sign in to comment.