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

DEPENDENCY: update to latest ember-cli/babel #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
3 changes: 1 addition & 2 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* eslint-env node */
'use strict'
'use strict';

module.exports = function (/* environment, appConfig */) {
return {}
Expand Down
3 changes: 2 additions & 1 deletion ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* eslint-env node */
'use strict';

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

module.exports = function (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 @@
/* eslint-env node */
'use strict'
'use strict';

module.exports = {
name: 'lodash',
Expand Down
8,968 changes: 4,968 additions & 4,000 deletions package-lock.json

Large diffs are not rendered by default.

37 changes: 22 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
"scripts": {
"build": "ember build",
"lint": "lint-all-the-things",
"start": "ember server",
"test": "npm run lint && npm run test-addon",
"lint:js": "eslint ./*.js addon addon-test-support app blueprints config lib server test-support tests",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each",
"test-addon": "EMBER_TRY_SCENARIO=${EMBER_TRY_SCENARIO:=ember-default} && ember try:one $EMBER_TRY_SCENARIO --- COVERAGE=true ember test"
},
"repository": {
Expand All @@ -30,24 +32,29 @@
"bower": "^1.8.2",
"broccoli-asset-rev": "^2.4.5",
"chai-jquery": "^2.0.0",
"ember-cli": "2.12.3",
"ember-cli": "^3.1.4",
"ember-cli-chai": "0.4.3",
"ember-cli-dependency-checker": "^1.3.0",
"ember-cli-htmlbars": "^1.1.1",
"ember-cli-htmlbars-inline-precompile": "0.3.12",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-mocha": "0.14.4",
"ember-cli-shims": "^1.0.2",
"ember-cli-uglify": "^1.2.0",
"ember-disable-prototype-extensions": "^1.1.0",
"ember-export-application-global": "^1.0.5",
"ember-cli-shims": "^1.2.0",
"ember-cli-uglify": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-frost-test": "^4.0.1",
"ember-hook": "1.4.2",
"ember-load-initializers": "^0.6.0",
"ember-resolver": "^2.0.3",
"ember-load-initializers": "^1.0.0",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-resolver": "^4.0.0",
"ember-sinon": "^0.7.0",
"ember-source": "~2.12.0",
"ember-source": "~3.1.1",
"ember-source-channel-url": "^1.0.1",
"ember-test-utils": "^8.1.1",
"ember-try": "^0.2.23",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-node": "^6.0.1",
"loader.js": "^4.2.3",
"sinon-chai": "^2.14.0"
},
Expand All @@ -59,12 +66,12 @@
"utility"
],
"dependencies": {
"ember-cli-babel": "^5.1.7"
"ember-cli-babel": "^6.8.2"
},
"ember-addon": {
"after": [
"ember-lodash"
],
"configPath": "tests/dummy/config"
}
}
}
26 changes: 17 additions & 9 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
/* eslint-env node */
const Reporter = require('ember-test-utils/reporter')

module.exports = {
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
framework: 'mocha',
launch_in_ci: [
'Chrome',
'Firefox'
'Chrome'
],
launch_in_dev: [
'Chrome'
],
reporter: new Reporter(),
test_page: 'tests/index.html?hidepassed'
}
browser_args: {
Chrome: {
mode: 'ci',
args: [
// --no-sandbox is needed when running Chrome inside a container
process.env.TRAVIS ? '--no-sandbox' : null,

'--disable-gpu',
'--headless',
'--remote-debugging-port=0',
'--window-size=1440,900'
].filter(Boolean)
}
}
};
16 changes: 5 additions & 11 deletions tests/dummy/app/app.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
import Ember from 'ember'
const {Application} = Ember
import loadInitializers from 'ember-load-initializers'
import Application from '@ember/application';
import Resolver from './resolver';
import loadInitializers from 'ember-load-initializers';
import config from './config/environment';

import config from './config/environment'
import Resolver from './resolver'

let App

Ember.MODEL_FACTORY_INJECTIONS = true

App = Application.extend({
const App = Application.extend({
modulePrefix: config.modulePrefix,
podModulePrefix: config.podModulePrefix,
Resolver
Expand Down
6 changes: 2 additions & 4 deletions tests/dummy/app/router.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import Ember from 'ember'
const {Router: EmberRouter} = Ember

import config from './config/environment'
import EmberRouter from '@ember/routing/router';
import config from './config/environment';

const Router = EmberRouter.extend({
location: config.locationType,
Expand Down
7 changes: 4 additions & 3 deletions tests/dummy/config/environment.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-env node */
'use strict';

module.exports = function (environment) {
const ENV = {
Expand Down Expand Up @@ -39,11 +39,12 @@ module.exports = function (environment) {
ENV.APP.LOG_ACTIVE_GENERATION = false
ENV.APP.LOG_VIEW_LOOKUPS = false

ENV.APP.rootElement = '#ember-testing'
ENV.APP.rootElement = '#ember-testing';
ENV.APP.autoboot = false;
}

if (environment === 'production') {

// here you can enable a production-specific feature
}

return ENV
Expand Down
18 changes: 18 additions & 0 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -0,0 +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
};
15 changes: 0 additions & 15 deletions tests/dummy/public/crossdomain.xml

This file was deleted.

Empty file added tests/helpers/.gitkeep
Empty file.