Skip to content
This repository was archived by the owner on Feb 7, 2024. It is now read-only.

Commit 389f2d2

Browse files
committed
Updated Ember-CLI to v2.18.2
1 parent ef758ec commit 389f2d2

29 files changed

+11815
-8811
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.eslintrc.js

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
module.exports = {
2+
root: true,
3+
parserOptions: {
4+
ecmaVersion: 2017,
5+
sourceType: 'module'
6+
},
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
14+
env: {
15+
browser: true
16+
},
17+
rules: {
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'index.js',
24+
'testem.js',
25+
'ember-cli-build.js',
26+
'config/**/*.js',
27+
'tests/dummy/config/**/*.js'
28+
],
29+
excludedFiles: [
30+
'app/**',
31+
'addon/**',
32+
'tests/dummy/app/**'
33+
],
34+
parserOptions: {
35+
sourceType: 'script',
36+
ecmaVersion: 2015
37+
},
38+
env: {
39+
browser: false,
40+
node: true
41+
},
42+
plugins: ['node'],
43+
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
44+
// add your custom rules and overrides for node files here
45+
})
46+
},
47+
48+
// test files
49+
{
50+
files: ['tests/**/*.js'],
51+
excludedFiles: ['tests/dummy/**/*.js'],
52+
env: {
53+
embertest: true
54+
}
55+
}
56+
]
57+
};

.gitignore

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
44
/dist
@@ -13,6 +13,11 @@
1313
/connect.lock
1414
/coverage/*
1515
/libpeerconnection.log
16-
npm-debug.log
17-
testem.log
16+
npm-debug.log*
1817
yarn-error.log
18+
testem.log
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

.jshintrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.npmignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@
77
.bowerrc
88
.editorconfig
99
.ember-cli
10+
.eslintrc.js
1011
.gitignore
11-
.jshintrc
1212
.watchmanconfig
1313
.travis.yml
1414
bower.json
1515
ember-cli-build.js
1616
testem.js
17+
18+
# ember-try
19+
.node_modules.ember-try/
20+
bower.json.ember-try
21+
package.json.ember-try

.travis.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,33 @@
11
---
22
language: node_js
33
node_js:
4+
# we recommend testing addons with the same minimum supported node version as Ember CLI
5+
# so that your addon works for all apps
46
- "4"
57

68
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
713

814
cache:
915
directories:
10-
- node_modules
16+
- $HOME/.npm
1117

1218
env:
13-
- EMBER_TRY_SCENARIO=default
14-
- EMBER_TRY_SCENARIO=ember-1.13
15-
- EMBER_TRY_SCENARIO=ember-release
16-
- EMBER_TRY_SCENARIO=ember-beta
17-
- EMBER_TRY_SCENARIO=ember-canary
19+
global:
20+
# See https://git.io/vdao3 for details.
21+
- JOBS=1
22+
matrix:
23+
# we recommend new addons test the current and previous LTS
24+
# as well as latest stable release (bonus points to beta/canary)
25+
- EMBER_TRY_SCENARIO=ember-lts-2.12
26+
- EMBER_TRY_SCENARIO=ember-lts-2.16
27+
- EMBER_TRY_SCENARIO=ember-release
28+
- EMBER_TRY_SCENARIO=ember-beta
29+
- EMBER_TRY_SCENARIO=ember-canary
30+
- EMBER_TRY_SCENARIO=ember-default
1831

1932
matrix:
2033
fast_finish: true
@@ -23,14 +36,8 @@ matrix:
2336

2437
before_install:
2538
- npm config set spin false
26-
- npm install -g bower
27-
- bower --version
28-
- npm install phantomjs-prebuilt
29-
- node_modules/phantomjs-prebuilt/bin/phantomjs --version
30-
31-
install:
32-
- npm install
33-
- bower install
39+
- npm install -g npm@4
40+
- npm --version
3441

3542
script:
3643
- npm test

bower.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

config/ember-try.js

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
/*jshint node:true*/
21
module.exports = {
32
scenarios: [
43
{
5-
name: 'default',
6-
bower: {
7-
dependencies: { }
4+
name: 'ember-lts-2.12',
5+
npm: {
6+
devDependencies: {
7+
'ember-source': '~2.12.0'
8+
}
89
}
910
},
1011
{
11-
name: 'ember-1.13',
12-
bower: {
13-
dependencies: {
14-
'ember': '~1.13.0'
15-
},
16-
resolutions: {
17-
'ember': '~1.13.0'
12+
name: 'ember-lts-2.16',
13+
npm: {
14+
devDependencies: {
15+
'ember-source': '~2.16.0'
1816
}
1917
}
2018
},
@@ -27,6 +25,11 @@ module.exports = {
2725
resolutions: {
2826
'ember': 'release'
2927
}
28+
},
29+
npm: {
30+
devDependencies: {
31+
'ember-source': null
32+
}
3033
}
3134
},
3235
{
@@ -38,6 +41,11 @@ module.exports = {
3841
resolutions: {
3942
'ember': 'beta'
4043
}
44+
},
45+
npm: {
46+
devDependencies: {
47+
'ember-source': null
48+
}
4149
}
4250
},
4351
{
@@ -49,6 +57,17 @@ module.exports = {
4957
resolutions: {
5058
'ember': 'canary'
5159
}
60+
},
61+
npm: {
62+
devDependencies: {
63+
'ember-source': null
64+
}
65+
}
66+
},
67+
{
68+
name: 'ember-default',
69+
npm: {
70+
devDependencies: {}
5271
}
5372
} */
5473
]

config/environment.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/*jshint node:true*/
21
'use strict';
32

43
module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*jshint node:true*/
2-
/* global require, module */
3-
var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
1+
'use strict';
2+
3+
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

55
module.exports = function(defaults) {
6-
var app = new EmberAddon(defaults, {
6+
let app = new EmberAddon(defaults, {
77
// Add options here
88
});
99

0 commit comments

Comments
 (0)