Skip to content

Commit 9e7cc22

Browse files
author
Anass OUMIRI
authored
Merge pull request #241 from nickschot/update-blueprint
Run ember-cli-update to update to 3.28 blueprint
2 parents f182fcf + 09847e9 commit 9e7cc22

25 files changed

Lines changed: 2500 additions & 471 deletions

‎.eslintignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
/tests/helpers/files/
1616
/coverage/
1717
!.*
18+
.*/
19+
.eslintcache
1820

1921
# ember-try
2022
/.node_modules.ember-try/

‎.eslintrc.js‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,54 +5,50 @@ module.exports = {
55
parser: 'babel-eslint',
66
parserOptions: {
77
ecmaVersion: 2018,
8-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
912
},
10-
plugins: [
11-
'ember'
12-
],
13+
plugins: ['ember'],
1314
extends: [
1415
'eslint:recommended',
15-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1618
],
1719
env: {
1820
browser: true,
19-
es6: true,
20-
},
21-
rules: {
22-
'ember/no-jquery': 'error'
2321
},
22+
rules: {},
2423
overrides: [
2524
// node files
2625
{
2726
files: [
28-
'.eslintrc.js',
29-
'.prettierrc.js',
27+
'./.eslintrc.js',
28+
'./.prettierrc.js',
3029
'.release-it.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/**'
30+
'./.template-lintrc.js',
31+
'./ember-cli-build.js',
32+
'./index.js',
33+
'./testem.js',
34+
'./blueprints/*/index.js',
35+
'./config/**/*.js',
36+
'./tests/dummy/config/**/*.js',
4437
],
4538
parserOptions: {
46-
sourceType: 'script'
39+
sourceType: 'script',
4740
},
4841
env: {
4942
browser: false,
50-
node: true
43+
node: true,
5144
},
5245
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-
]
46+
extends: ['plugin:node/recommended'],
47+
},
48+
{
49+
// Test files:
50+
files: ['tests/**/*-test.{js,ts}'],
51+
extends: ['plugin:qunit/recommended'],
52+
},
53+
],
5854
};

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
needs: [lint, basic-tests]
4343
strategy:
4444
matrix:
45-
ember: [lts-3.8, release, beta, canary]
45+
ember: [lts-3.8, lts-3.12, lts-3.16, lts-3.24, release, beta, canary]
4646
runs-on: ubuntu-latest
4747
steps:
4848
- uses: actions/checkout@v1

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
/ember-cli-build.js
2424
/testem.js
2525
/tests/
26+
/yarn-error.log
2627
/yarn.lock
2728
.gitkeep
2829
.idea/

‎.prettierignore‎

Lines changed: 21 additions & 0 deletions
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‎

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

‎.release-it.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
module.exports = {
32
git: {
43
tagName: 'v${version}',

‎.template-lintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

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

‎addon/modifiers/autofocus.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@ import { modifier } from 'ember-modifier';
22

33
const DEFAULT_SELECTOR = 'input:not([disabled]),textarea:not([disabled])';
44

5-
export default modifier(function autofocus(element, [selector = DEFAULT_SELECTOR], { disabled }) {
5+
export default modifier(function autofocus(
6+
element,
7+
[selector = DEFAULT_SELECTOR],
8+
{ disabled }
9+
) {
610
if (disabled) {
711
return;
812
}

‎config/ember-try.js‎

Lines changed: 78 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,109 @@
1-
"use strict";
1+
'use strict';
22

3-
const getChannelURL = require("ember-source-channel-url");
3+
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 {
8+
useYarn: true,
79
scenarios: [
810
{
9-
name: "ember-lts-3.8",
11+
name: 'ember-lts-3.8',
1012
npm: {
1113
devDependencies: {
12-
"ember-source": "~3.8.0"
13-
}
14-
}
14+
'ember-source': '~3.8.0',
15+
},
16+
},
17+
},
18+
{
19+
name: 'ember-lts-3.12',
20+
npm: {
21+
devDependencies: {
22+
'ember-source': '~3.12.0',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-lts-3.16',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': '~3.16.0',
31+
},
32+
},
1533
},
1634
{
17-
name: "ember-release",
35+
name: 'ember-lts-3.20',
1836
npm: {
1937
devDependencies: {
20-
"ember-source": await getChannelURL("release")
21-
}
22-
}
38+
'ember-source': '~3.20.5',
39+
},
40+
},
2341
},
2442
{
25-
name: "ember-beta",
43+
name: 'ember-lts-3.24',
2644
npm: {
2745
devDependencies: {
28-
"ember-source": await getChannelURL("beta")
29-
}
30-
}
46+
'ember-source': '~3.24.3',
47+
},
48+
},
3149
},
3250
{
33-
name: "ember-canary",
51+
name: 'ember-release',
3452
npm: {
3553
devDependencies: {
36-
"ember-source": await getChannelURL("canary")
37-
}
38-
}
54+
'ember-source': await getChannelURL('release'),
55+
},
56+
},
3957
},
40-
// The default `.travis.yml` runs this scenario via `npm test`,
41-
// not via `ember try`. It's still included here so that running
42-
// `ember try:each` manually or from a customized CI config will run it
43-
// along with all the other scenarios.
4458
{
45-
name: "ember-default",
59+
name: 'ember-beta',
4660
npm: {
47-
devDependencies: {}
48-
}
61+
devDependencies: {
62+
'ember-source': await getChannelURL('beta'),
63+
},
64+
},
4965
},
5066
{
51-
name: "ember-default-with-jquery",
67+
name: 'ember-canary',
68+
npm: {
69+
devDependencies: {
70+
'ember-source': await getChannelURL('canary'),
71+
},
72+
},
73+
},
74+
{
75+
name: 'ember-default-with-jquery',
5276
env: {
5377
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54-
"jquery-integration": true
55-
})
78+
'jquery-integration': true,
79+
}),
5680
},
5781
npm: {
5882
devDependencies: {
59-
"@ember/jquery": "^0.5.1"
60-
}
61-
}
62-
}
63-
]
83+
'@ember/jquery': '^1.1.0',
84+
},
85+
},
86+
},
87+
{
88+
name: 'ember-classic',
89+
env: {
90+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
91+
'application-template-wrapper': true,
92+
'default-async-observers': false,
93+
'template-only-glimmer-components': false,
94+
}),
95+
},
96+
npm: {
97+
devDependencies: {
98+
'ember-source': '~3.28.0',
99+
},
100+
ember: {
101+
edition: 'classic',
102+
},
103+
},
104+
},
105+
embroiderSafe(),
106+
embroiderOptimized(),
107+
],
64108
};
65109
};

0 commit comments

Comments
 (0)