Skip to content

Commit 6a54e76

Browse files
committed
update blueprint to 3.28
1 parent 051eb5b commit 6a54e76

23 files changed

+198
-153
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/

.eslintrc.js

+26-31
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,47 @@ module.exports = {
77
ecmaVersion: 2018,
88
sourceType: 'module',
99
ecmaFeatures: {
10-
legacyDecorators: true
11-
}
10+
legacyDecorators: true,
11+
},
1212
},
13-
plugins: [
14-
'ember'
15-
],
13+
plugins: ['ember'],
1614
extends: [
1715
'eslint:recommended',
18-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1918
],
2019
env: {
21-
browser: true
22-
},
23-
rules: {
24-
'ember/no-jquery': 'error'
20+
browser: true,
2521
},
22+
rules: {},
2623
overrides: [
2724
// node files
2825
{
2926
files: [
30-
'.eslintrc.js',
31-
'.template-lintrc.js',
32-
'ember-cli-build.js',
33-
'index.js',
34-
'testem.js',
35-
'blueprints/*/index.js',
36-
'config/**/*.js',
37-
'tests/dummy/config/**/*.js'
38-
],
39-
excludedFiles: [
40-
'addon/**',
41-
'addon-test-support/**',
42-
'app/**',
43-
'tests/dummy/app/**'
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
29+
'./.template-lintrc.js',
30+
'./ember-cli-build.js',
31+
'./index.js',
32+
'./testem.js',
33+
'./blueprints/*/index.js',
34+
'./config/**/*.js',
35+
'./tests/dummy/config/**/*.js',
4436
],
4537
parserOptions: {
46-
sourceType: 'script'
38+
sourceType: 'script',
4739
},
4840
env: {
4941
browser: false,
50-
node: true
42+
node: true,
5143
},
5244
plugins: ['node'],
53-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
54-
// add your custom rules and overrides for node files here
55-
})
56-
}
57-
]
45+
extends: ['plugin:node/recommended'],
46+
},
47+
{
48+
// Test files:
49+
files: ['tests/**/*-test.{js,ts}'],
50+
extends: ['plugin:qunit/recommended'],
51+
},
52+
],
5853
};

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/.env*
1313
/.pnp*
1414
/.sass-cache
15+
/.eslintcache
1516
/connect.lock
1617
/coverage/
1718
/libpeerconnection.log

.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
1516
/.git/
1617
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1720
/.template-lintrc.js
1821
/.travis.yml
1922
/.watchmanconfig
@@ -23,6 +26,7 @@
2326
/ember-cli-build.js
2427
/testem.js
2528
/tests/
29+
/yarn-error.log
2630
/yarn.lock
2731
.gitkeep
2832

.prettierignore

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

.prettierrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'octane'
4+
extends: 'recommended',
55
};

.travis.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "10"
6+
- "12"
77

88
dist: bionic
99

@@ -48,15 +48,19 @@ jobs:
4848

4949
# we recommend new addons test the current and previous LTS
5050
# as well as latest stable release (bonus points to beta/canary)
51-
env: EMBER_TRY_SCENARIO=ember-lts-3.4
52-
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
53-
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
54-
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
51+
- env: EMBER_TRY_SCENARIO=ember-lts-3.24
52+
- env: EMBER_TRY_SCENARIO=ember-lts-3.28
5553
- env: EMBER_TRY_SCENARIO=ember-release
5654
- env: EMBER_TRY_SCENARIO=ember-beta
5755
- env: EMBER_TRY_SCENARIO=ember-canary
5856
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
5957
- env: EMBER_TRY_SCENARIO=ember-classic
58+
- env: EMBER_TRY_SCENARIO=embroider-safe
59+
- env: EMBER_TRY_SCENARIO=embroider-optimized
60+
61+
before_install:
62+
- curl -o- -L https://yarnpkg.com/install.sh | bash
63+
- export PATH=$HOME/.yarn/bin:$PATH
6064

6165
script:
6266
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

CONTRIBUTING.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

config/ember-try.js

+36-56
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,85 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

5-
module.exports = async function() {
6+
module.exports = async function () {
67
return {
78
useYarn: true,
89
scenarios: [
910
{
10-
name: 'ember-lts-3.4',
11+
name: 'ember-lts-3.24',
1112
npm: {
1213
devDependencies: {
13-
'ember-source': '~3.4.0'
14-
}
15-
}
16-
},
17-
{
18-
name: 'ember-lts-3.8',
19-
npm: {
20-
devDependencies: {
21-
'ember-source': '~3.8.0'
22-
}
23-
}
24-
},
25-
{
26-
name: 'ember-lts-3.12',
27-
npm: {
28-
devDependencies: {
29-
'ember-source': '~3.12.0'
30-
}
31-
}
14+
'ember-source': '~3.24.3',
15+
},
16+
},
3217
},
3318
{
34-
name: 'ember-lts-3.16',
19+
name: 'ember-lts-3.28',
3520
npm: {
3621
devDependencies: {
37-
'ember-source': '~3.16.0'
38-
}
39-
}
22+
'ember-source': '~3.28.0',
23+
},
24+
},
4025
},
4126
{
4227
name: 'ember-release',
4328
npm: {
4429
devDependencies: {
45-
'ember-source': await getChannelURL('release')
46-
}
47-
}
30+
'ember-source': await getChannelURL('release'),
31+
},
32+
},
4833
},
4934
{
5035
name: 'ember-beta',
5136
npm: {
5237
devDependencies: {
53-
'ember-source': await getChannelURL('beta')
54-
}
55-
}
38+
'ember-source': await getChannelURL('beta'),
39+
},
40+
},
5641
},
5742
{
5843
name: 'ember-canary',
5944
npm: {
6045
devDependencies: {
61-
'ember-source': await getChannelURL('canary')
62-
}
63-
}
64-
},
65-
// The default `.travis.yml` runs this scenario via `npm 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-
}
46+
'ember-source': await getChannelURL('canary'),
47+
},
48+
},
7449
},
7550
{
7651
name: 'ember-default-with-jquery',
7752
env: {
7853
EMBER_OPTIONAL_FEATURES: JSON.stringify({
79-
'jquery-integration': true
80-
})
54+
'jquery-integration': true,
55+
}),
8156
},
8257
npm: {
8358
devDependencies: {
84-
'@ember/jquery': '^0.5.1'
85-
}
86-
}
59+
'@ember/jquery': '^1.1.0',
60+
},
61+
},
8762
},
8863
{
8964
name: 'ember-classic',
9065
env: {
9166
EMBER_OPTIONAL_FEATURES: JSON.stringify({
9267
'application-template-wrapper': true,
9368
'default-async-observers': false,
94-
'template-only-glimmer-components': false
95-
})
69+
'template-only-glimmer-components': false,
70+
}),
9671
},
9772
npm: {
73+
devDependencies: {
74+
'ember-source': '~3.28.0',
75+
},
9876
ember: {
99-
edition: 'classic'
100-
}
101-
}
102-
}
103-
]
77+
edition: 'classic',
78+
},
79+
},
80+
},
81+
embroiderSafe(),
82+
embroiderOptimized(),
83+
],
10484
};
10585
};

config/environment.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

ember-cli-build.js

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

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

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
88
});
@@ -14,5 +14,12 @@ module.exports = function(defaults) {
1414
behave. You most likely want to be modifying `./index.js` or app's build file
1515
*/
1616

17-
return app.toTree();
17+
const { maybeEmbroider } = require('@embroider/test-setup');
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1825
};

index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
name: 'ember-cli-deploy-s3-pack'
4+
name: require('./package').name,
55
};

0 commit comments

Comments
 (0)