Skip to content
This repository was archived by the owner on Aug 24, 2022. It is now read-only.

Commit 1539be4

Browse files
authored
Merge pull request #567 from dcyriller/npx-ember-update
`npx ember-cli-update`
2 parents 62cbe11 + 0e6d645 commit 1539be4

24 files changed

Lines changed: 1006 additions & 537 deletions

File tree

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

.eslintrc.js

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
// from ember-cli/ember-cli
2-
31
module.exports = {
42
root: true,
3+
parser: 'babel-eslint',
54
parserOptions: {
6-
ecmaVersion: 2018
5+
ecmaVersion: 2018,
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
710
},
811
plugins: [
912
'ember'
@@ -16,11 +19,14 @@ module.exports = {
1619
browser: true
1720
},
1821
rules: {
22+
'ember/no-jquery': 'error'
1923
},
2024
overrides: [
2125
// node files
2226
{
2327
files: [
28+
'.eslintrc.js',
29+
'.template-lintrc.js',
2430
'ember-cli-build.js',
2531
'index.js',
2632
'testem.js',
@@ -36,8 +42,7 @@ module.exports = {
3642
'tests/dummy/app/**'
3743
],
3844
parserOptions: {
39-
sourceType: 'script',
40-
ecmaVersion: 2015
45+
sourceType: 'script'
4146
},
4247
env: {
4348
browser: false,

.gitignore

Lines changed: 3 additions & 1 deletion
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/
@@ -9,6 +9,8 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
13+
/.pnp*
1214
/.sass-cache
1315
/connect.lock
1416
/coverage/

.npmignore

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
1-
/bower_components
1+
# compiled output
2+
/dist/
3+
/tmp/
4+
5+
# dependencies
6+
/bower_components/
7+
8+
# misc
9+
/.bowerrc
10+
/.editorconfig
11+
/.ember-cli
12+
/.env*
13+
/.eslintignore
14+
/.eslintrc.js
15+
/.git/
16+
/.gitignore
17+
/.template-lintrc.js
18+
/.travis.yml
19+
/.watchmanconfig
20+
/bower.json
221
/config/ember-try.js
3-
/dist
4-
/tests
5-
/tmp
6-
**/.gitkeep
7-
.bowerrc
8-
.editorconfig
9-
.ember-cli
10-
.eslintrc.js
11-
.gitignore
12-
.watchmanconfig
13-
.travis.yml
14-
bower.json
15-
ember-cli-build.js
16-
testem.js
17-
yarn.lock
22+
/CONTRIBUTING.md
23+
/ember-cli-build.js
24+
/testem.js
25+
/tests/
26+
/yarn.lock
1827
/node-tests
28+
.gitkeep
1929

2030
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
31+
/.node_modules.ember-try/
32+
/bower.json.ember-try
33+
/package.json.ember-try

.template-lintrc.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
'use strict';
22

3-
/* eslint-env node */
4-
53
module.exports = {
6-
extends: 'recommended',
4+
extends: 'octane',
75

86
pending: [
97
'dummy/templates/components/foo-bar'

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 Robert Jackson
3+
Copyright (c) 2016-2019 Robert Jackson
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
66

blueprints/ember-cli-template-lint/recommended-files/.template-lintrc.js

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

43
module.exports = {

blueprints/ember-cli-template-lint/recommended-with-bare-strings-files/.template-lintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
/* eslint-env node */
21
'use strict';
32

43
module.exports = {
5-
extends: 'octane'
4+
extends: 'octane',
65

76
rules: {
87
'no-bare-strings': true

config/ember-try.js

Lines changed: 78 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,69 +2,91 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
scenarios: [
13-
{
14-
name: 'ember-lts-2.12',
15-
npm: {
16-
devDependencies: {
17-
'ember-source': '~2.12.0'
18-
}
5+
module.exports = async function() {
6+
return {
7+
useYarn: true,
8+
scenarios: [
9+
{
10+
name: 'ember-lts-2.12',
11+
npm: {
12+
devDependencies: {
13+
'ember-source': '~2.12.0'
1914
}
20-
},
21-
{
22-
name: 'ember-lts-2.16',
23-
npm: {
24-
devDependencies: {
25-
'ember-source': '~2.16.0'
26-
}
15+
}
16+
},
17+
{
18+
name: 'ember-lts-2.18',
19+
npm: {
20+
devDependencies: {
21+
'ember-source': '~2.18.0'
2722
}
28-
},
29-
{
30-
name: 'ember-lts-2.18',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': '~2.18.0'
34-
}
23+
}
24+
},
25+
{
26+
name: 'ember-lts-3.8',
27+
npm: {
28+
devDependencies: {
29+
'ember-source': '~3.8.0'
3530
}
36-
},
37-
{
38-
name: 'ember-release',
39-
npm: {
40-
devDependencies: {
41-
'ember-source': urls[0]
42-
}
31+
}
32+
},
33+
{
34+
name: 'ember-lts-3.12',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': '~3.12.0'
4338
}
44-
},
45-
{
46-
name: 'ember-beta',
47-
npm: {
48-
devDependencies: {
49-
'ember-source': urls[1]
50-
}
39+
}
40+
},
41+
{
42+
name: 'ember-release',
43+
npm: {
44+
devDependencies: {
45+
'ember-source': await getChannelURL('release')
5146
}
52-
},
53-
{
54-
name: 'ember-canary',
55-
npm: {
56-
devDependencies: {
57-
'ember-source': urls[2]
58-
}
47+
}
48+
},
49+
{
50+
name: 'ember-beta',
51+
npm: {
52+
devDependencies: {
53+
'ember-source': await getChannelURL('beta')
5954
}
55+
}
56+
},
57+
{
58+
name: 'ember-canary',
59+
npm: {
60+
devDependencies: {
61+
'ember-source': await getChannelURL('canary')
62+
}
63+
}
64+
},
65+
// The default `.travis.yml` runs this scenario via `yarn test`,
66+
// not via `ember try`. It's still included here so that running
67+
// `ember try:each` manually or from a customized CI config will run it
68+
// along with all the other scenarios.
69+
{
70+
name: 'ember-default',
71+
npm: {
72+
devDependencies: {}
73+
}
74+
},
75+
{
76+
name: 'ember-classic',
77+
env: {
78+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
79+
'application-template-wrapper': true,
80+
'default-async-observers': false,
81+
'template-only-glimmer-components': false
82+
})
6083
},
61-
{
62-
name: 'ember-default',
63-
npm: {
64-
devDependencies: {}
84+
npm: {
85+
ember: {
86+
edition: 'classic'
6587
}
6688
}
67-
]
68-
};
69-
});
89+
}
90+
]
91+
};
7092
};

config/environment.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
/* eslint-env node */
4-
53
module.exports = function(/* environment, appConfig */) {
64
return { };
75
};

0 commit comments

Comments
 (0)