Skip to content

Commit 5ed57f3

Browse files
authored
Merge pull request #91 from ember-cli/updates
Preparing for a new major
2 parents f40c21b + f816f8a commit 5ed57f3

File tree

47 files changed

+7129
-8181
lines changed

Some content is hidden

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

47 files changed

+7129
-8181
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

.eslintrc.js

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

.github/workflows/ci.yml

Lines changed: 29 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,42 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
build:
10+
lint:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: pnpm/action-setup@v2
16+
name: Install pnpm
17+
with:
18+
version: 8
19+
run_install: false
20+
- name: Use Node.js 20
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: 20
24+
cache: pnpm
25+
- run: pnpm install
26+
- run: pnpm lint
1127

28+
build:
1229
runs-on: ubuntu-latest
1330

1431
strategy:
1532
matrix:
16-
node-version: [6.x, 8.x, 10.x, 12.x, 14.x, 15.x]
33+
node-version: [16.x, 18.x, 20.x]
1734

1835
steps:
1936
- uses: actions/checkout@v2
37+
- uses: pnpm/action-setup@v2
38+
name: Install pnpm
39+
with:
40+
version: 8
41+
run_install: false
2042
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
43+
uses: actions/setup-node@v3
2244
with:
23-
node-version: ${{ matrix.node-version }}
24-
- run: yarn install --ignore-engines
25-
- run: yarn test
45+
node-version: ${{ matrix.node-version }}
46+
cache: pnpm
47+
- run: pnpm install
48+
- run: pnpm test

eslint.config.mjs

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import js from '@eslint/js';
2+
import prettier from 'eslint-plugin-prettier/recommended';
3+
import node from 'eslint-plugin-n';
4+
import globals from 'globals';
5+
6+
export default [
7+
js.configs.recommended,
8+
prettier,
9+
node.configs['flat/recommended-module'],
10+
{
11+
languageOptions: {
12+
ecmaVersion: 2022,
13+
sourceType: 'module',
14+
globals: {
15+
...globals.node,
16+
},
17+
},
18+
rules: {
19+
'prettier/prettier': 'error',
20+
},
21+
},
22+
{
23+
files: ['tests/**/*.js'],
24+
languageOptions: {
25+
globals: {
26+
...globals.jest,
27+
},
28+
},
29+
},
30+
{
31+
ignores: ['fixtures/**'],
32+
},
33+
];

fixtures/assert-expansion/expectation6.js

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

fixtures/debug-flag/expectation6.js

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

fixtures/debug-flag/expectation7.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
if (true
2-
/* DEBUG */
3-
) {
1+
if (true/* DEBUG */) {
42
console.log('woot');
53
}

fixtures/default-export-features/expectation6.js

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

fixtures/deprecate-expansion/expectation6.js

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

fixtures/development-feature-flags/expectation6.js

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

0 commit comments

Comments
 (0)