Skip to content

Commit d2e4475

Browse files
Update everything, move away from ember-cli-typescript (#270)
* Remove deprecated `loc` * v3.9.0...v3.28.0 * Lint & Prettier fix; remove unused generated test * Update CI with new ember-try scenarios * Update types and copy ts setup from ember-test-helpers * Lint fixup * `yarn test` runs ember:try, make not-explicitly-ember-try tests in CI only run ember tests * dont fail fast on matrix tests Failing fast makes it difficult to diagnose the subset of the matrix that is failing beyond the first job that fails * Fix TypeScript compilation Currently this is clearly suboptimal, once we learn more about TS in our projects. We can revisit ember-cli-typescript (or similar) to handle this for us automatically. Additionally, we plan embroider v2 to enable this “for free” * Re-roll lock file * Upgrade some more deps * Fix gitignore + npmignore files * updates Co-authored-by: Stefan Penner <stefan.penner@gmail.com>
1 parent 0198a3f commit d2e4475

46 files changed

Lines changed: 7240 additions & 3852 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.*/
17+
.eslintcache
1618

1719
# ember-try
1820
/.node_modules.ember-try/
1921
/bower.json.ember-try
2022
/package.json.ember-try
23+
24+

.eslintrc.js

Lines changed: 33 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,55 @@
11
module.exports = {
22
root: true,
3+
parser: '@typescript-eslint/parser',
34
parserOptions: {
45
ecmaVersion: 2017,
5-
sourceType: 'module'
6+
sourceType: 'module',
67
},
7-
plugins: [
8-
'ember'
9-
],
8+
plugins: ['ember', 'prettier', '@typescript-eslint'],
109
extends: [
1110
'eslint:recommended',
12-
'plugin:ember/recommended'
11+
'plugin:ember/recommended',
12+
'plugin:prettier/recommended',
1313
],
1414
env: {
15-
browser: true
16-
},
17-
rules: {
15+
browser: true,
1816
},
17+
rules: {},
1918
overrides: [
20-
// node files
19+
{
20+
files: ['**/*.ts'],
21+
extends: ['plugin:@typescript-eslint/eslint-recommended'],
22+
rules: {
23+
'no-unused-vars': 'off',
24+
},
25+
},
2126
{
2227
files: [
23-
'.eslintrc.js',
24-
'.template-lintrc.js',
25-
'ember-cli-build.js',
26-
'index.js',
27-
'testem.js',
28-
'blueprints/*/index.js',
29-
'config/**/*.js',
30-
'tests/dummy/config/**/*.js'
31-
],
32-
excludedFiles: [
33-
'addon/**',
34-
'addon-test-support/**',
35-
'app/**',
36-
'tests/dummy/app/**'
28+
'./.eslintrc.js',
29+
'./.prettierrc.js',
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',
37+
'./server/**/*.js',
3738
],
3839
parserOptions: {
3940
sourceType: 'script',
40-
ecmaVersion: 2015
4141
},
4242
env: {
4343
browser: false,
44-
node: true
44+
node: true,
4545
},
4646
plugins: ['node'],
47-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48-
// add your custom rules and overrides for node files here
49-
})
50-
}
51-
]
47+
extends: ['plugin:node/recommended'],
48+
},
49+
{
50+
// Test files:
51+
files: ['tests/**/*-test.{js,ts}'],
52+
extends: ['plugin:qunit/recommended'],
53+
},
54+
],
5255
};

.github/workflows/ci-build.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
node-version: 12.x
2222
- run: yarn install --frozen-lockfile
2323
- run: yarn lint
24-
- run: yarn test
24+
- run: yarn test:ember
2525

2626
floating-dependencies:
2727
name: "Floating Dependencies"
@@ -33,7 +33,7 @@ jobs:
3333
with:
3434
node-version: 14.x
3535
- run: yarn install --no-lockfile
36-
- run: yarn test
36+
- run: yarn test:ember
3737

3838
try-scenarios:
3939
name: "Try: ${{ matrix.ember-try-scenario }}"
@@ -43,16 +43,17 @@ jobs:
4343
needs: test
4444

4545
strategy:
46-
fail-fast: true
4746
matrix:
4847
ember-try-scenario:
49-
- ember-lts-3.8
50-
- ember-lts-3.12
51-
- ember-lts-3.16
5248
- ember-lts-3.20
49+
- ember-lts-3.24
5350
- ember-release
5451
- ember-beta
52+
- ember-canary
5553
- ember-default-with-jquery
54+
- ember-classic
55+
- embroider-safe
56+
- embroider-optimized
5657

5758
steps:
5859
- uses: actions/checkout@v2

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# misc
1212
/.env*
1313
/.sass-cache
14+
/.eslintcache
1415
/connect.lock
1516
/coverage/
1617
/libpeerconnection.log
@@ -22,3 +23,9 @@
2223
/.node_modules.ember-try/
2324
/bower.json.ember-try
2425
/package.json.ember-try
26+
27+
# typescript related output files
28+
addon/**/*.js
29+
addon/**/*.d.ts
30+
package/
31+
*.tgz

.npmignore

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,40 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
16+
/.git/
1517
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1620
/.template-lintrc.js
1721
/.travis.yml
1822
/.watchmanconfig
1923
/bower.json
20-
/config/ember-try.js
24+
/config/
2125
/CONTRIBUTING.md
2226
/ember-cli-build.js
2327
/testem.js
2428
/tests/
29+
/yarn-error.log
2530
/yarn.lock
2631
.gitkeep
2732

2833
# ember-try
2934
/.node_modules.ember-try/
3035
/bower.json.ember-try
3136
/package.json.ember-try
37+
38+
# typescript
39+
#
40+
# avoid publishing .d.ts or .ts files
41+
# until they have become enforced "public" APIs
42+
*.ts
43+
# to enable d.ts consumption remove the next line
44+
# !*.d.ts
45+
!addon/**/*.js
46+
server/
47+
tsconfig.json
48+
*.tgz
49+
DEPRECATIONS.md

.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+
};

.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
};

tests/dummy/app/templates/components/.gitkeep renamed to .travis.yml

File renamed without changes.

0 commit comments

Comments
 (0)