Skip to content

Commit e570ab9

Browse files
authored
Merge pull request #420 from orbitjs/modernize
Switch from yarn to pnpm, run latest blueprints, fix types and lint
2 parents c98f1fa + 6cde82b commit e570ab9

File tree

93 files changed

+15073
-14257
lines changed

Some content is hidden

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

93 files changed

+15073
-14257
lines changed

.ember-cli

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,19 @@
11
{
22
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
3+
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
4+
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
5+
*/
6+
"isTypeScriptProject": true,
57

6-
Setting `disableAnalytics` to true will prevent any data from being sent.
8+
/**
9+
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
10+
or GTS files for the component and the component rendering test. "loose" is the default.
11+
*/
12+
"componentAuthoringFormat": "loose",
13+
14+
/**
15+
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
16+
or GTS templates for routes. "loose" is the default
717
*/
8-
"disableAnalytics": false
18+
"routeAuthoringFormat": "loose"
919
}

.eslintignore

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

.eslintrc.js

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

.github/workflows/ci.yml

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,67 +8,83 @@ on:
88
pull_request: {}
99

1010
concurrency:
11-
group: ci-${{ github.head_ref || github.ref }}
12-
cancel-in-progress: true
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
1313

1414
jobs:
1515
test:
1616
name: "Tests"
1717
runs-on: ubuntu-latest
18+
timeout-minutes: 10
1819

1920
steps:
20-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v3
22+
- uses: pnpm/action-setup@v4
23+
with:
24+
version: 9
2125
- name: Install Node
22-
uses: volta-cli/action@v1
26+
uses: actions/setup-node@v3
2327
with:
24-
node-version: 12.x
28+
node-version: 18
29+
cache: pnpm
2530
- name: Install Dependencies
26-
run: yarn install --frozen-lockfile
31+
run: pnpm install --frozen-lockfile
2732
- name: Lint
28-
run: yarn lint
33+
run: pnpm lint
2934
- name: Run Tests
30-
run: yarn test:ember
35+
run: pnpm test:ember
3136

3237
floating:
3338
name: "Floating Dependencies"
3439
runs-on: ubuntu-latest
40+
timeout-minutes: 10
3541

3642
steps:
37-
- uses: actions/checkout@v2
38-
- name: Install Node
39-
uses: volta-cli/action@v1
43+
- uses: actions/checkout@v3
44+
- uses: pnpm/action-setup@v4
4045
with:
41-
node-version: 12.x
46+
version: 9
47+
- uses: actions/setup-node@v3
48+
with:
49+
node-version: 18
50+
cache: pnpm
4251
- name: Install Dependencies
43-
run: yarn install --no-lockfile
52+
run: pnpm install --no-lockfile
4453
- name: Run Tests
45-
run: yarn test:ember
54+
run: pnpm test:ember
4655

4756
try-scenarios:
4857
name: ${{ matrix.try-scenario }}
4958
runs-on: ubuntu-latest
50-
needs: 'test'
59+
needs: "test"
60+
timeout-minutes: 10
5161

5262
strategy:
5363
fail-fast: false
5464
matrix:
5565
try-scenario:
56-
- ember-lts-3.24
5766
- ember-lts-3.28
67+
- ember-lts-4.4
68+
- ember-lts-4.12
69+
- ember-lts-5.8
70+
- ember-lts-5.12
5871
- ember-release
5972
- ember-beta
6073
- ember-canary
61-
- ember-classic
6274
- embroider-safe
6375
- embroider-optimized
6476

6577
steps:
66-
- uses: actions/checkout@v2
78+
- uses: actions/checkout@v3
79+
- uses: pnpm/action-setup@v4
80+
with:
81+
version: 9
6782
- name: Install Node
68-
uses: volta-cli/action@v1
83+
uses: actions/setup-node@v3
6984
with:
70-
node-version: 12.x
85+
node-version: 18
86+
cache: pnpm
7187
- name: Install Dependencies
72-
run: yarn install --frozen-lockfile
88+
run: pnpm install --frozen-lockfile
7389
- name: Run Tests
7490
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

.gitignore

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,18 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

23-
# ember-try
24-
/.node_modules.ember-try/
25-
/bower.json.ember-try
26-
/npm-shrinkwrap.json.ember-try
27-
/package.json.ember-try
28-
/package-lock.json.ember-try
29-
/yarn.lock.ember-try
17+
# broccoli-debug
18+
/DEBUG/

.npmignore

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,27 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
139
/.eslintcache
14-
/.eslintignore
15-
/.eslintrc.js
1610
/.git/
1711
/.github/
1812
/.gitignore
1913
/.prettierignore
2014
/.prettierrc.js
15+
/.stylelintignore
16+
/.stylelintrc.js
2117
/.template-lintrc.js
22-
/.travis.yml
2318
/.watchmanconfig
24-
/bower.json
25-
/config/ember-try.js
2619
/CONTRIBUTING.md
2720
/ember-cli-build.js
21+
/eslint.config.mjs
2822
/testem.js
2923
/tests/
24+
/tsconfig.declarations.json
25+
/tsconfig.json
3026
/yarn-error.log
3127
/yarn.lock
3228
.gitkeep
33-
34-
# ember-try
35-
/.node_modules.ember-try/
36-
/bower.json.ember-try
37-
/npm-shrinkwrap.json.ember-try
38-
/package.json.ember-try
39-
/package-lock.json.ember-try
40-
/yarn.lock.ember-try

.prettierignore

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
18-
19-
# ember-try
20-
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try
10+
.*/
11+
/pnpm-lock.yaml
12+
ember-cli-update.json
13+
*.html

.prettierrc.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
'use strict';
22

33
module.exports = {
4-
singleQuote: true,
5-
trailingComma: 'none',
4+
plugins: ['prettier-plugin-ember-template-tag'],
65
overrides: [
76
{
8-
files: '**/*.hbs',
7+
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
98
options: {
10-
parser: 'glimmer',
11-
singleQuote: false
12-
}
13-
}
14-
]
9+
singleQuote: true,
10+
templateSingleQuote: false,
11+
},
12+
},
13+
],
1514
};

.stylelintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# unconventional files
2+
/blueprints/*/files/
3+
4+
# compiled output
5+
/dist/

.stylelintrc.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+
extends: ['stylelint-config-standard'],
5+
};

0 commit comments

Comments
 (0)