Skip to content

Commit

Permalink
Upgrade to Ember v3
Browse files Browse the repository at this point in the history
  • Loading branch information
zoltan-nz committed Mar 1, 2018
1 parent a1b1fb8 commit 0561f10
Show file tree
Hide file tree
Showing 16 changed files with 3,852 additions and 3,763 deletions.
29 changes: 27 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,35 @@ module.exports = {
ecmaVersion: 6,
sourceType: 'module'
},
extends: 'eslint:recommended',
plugins: [
'ember'
],
extends: [
'eslint:recommended',
'plugin:ember/recommended'
],
env: {
browser: true
},
rules: {
}
},
overrides: [
// node files
{
files: [
'ember-cli-build.js',
'testem.js',
'config/**/*.js',
'lib/*/index.js'
],
parserOptions: {
sourceType: 'script',
ecmaVersion: 2015
},
env: {
browser: false,
node: true
}
}
]
};
18 changes: 10 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ node_js:
- "6"

sudo: false
dist: trusty

addons:
chrome: stable

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

env:
global:
# See https://git.io/vdao3 for details.
- JOBS=1

before_install:
- npm config set spin false
- npm install -g bower phantomjs-prebuilt
- bower --version
- phantomjs --version

install:
- npm install
- bower install

script:
- npm run lint:js
- npm test
7 changes: 4 additions & 3 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-env node */
'use strict';

module.exports = function(environment) {
var ENV = {
let ENV = {
modulePrefix: 'product-app',
environment: environment,
rootURL: '/',
Expand Down Expand Up @@ -40,10 +40,11 @@ module.exports = function(environment) {
ENV.APP.LOG_VIEW_LOOKUPS = false;

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 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
};
5 changes: 3 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/* eslint-env node*/
'use strict';

const EmberApp = require('ember-cli/lib/broccoli/ember-app');

module.exports = function(defaults) {
var app = new EmberApp(defaults, {
let app = new EmberApp(defaults, {
// Add options here
});

Expand Down
Loading

0 comments on commit 0561f10

Please sign in to comment.