Skip to content

Commit eb07aa6

Browse files
Merge pull request #1173 from NullVoxPopuli/update-ember-try
Update ember-try config (support unchanged)
2 parents c3f0df3 + f0cb33f commit eb07aa6

33 files changed

+18832
-832
lines changed

.github/workflows/ci.yml

+42-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- uses: ./.github/actions/assert-build
5454

5555

56-
typecheck:
56+
typecheck_legacy:
5757
name: '${{ matrix.typescript-scenario }}'
5858
runs-on: ubuntu-latest
5959
timeout-minutes: 5
@@ -66,9 +66,50 @@ jobs:
6666
6767
6868
69+
70+
steps:
71+
- uses: actions/checkout@v4
72+
- uses: wyvox/action-setup-pnpm@v3
73+
with:
74+
node-version: 18.18.1
75+
- name: 'Build'
76+
run: pnpm build
77+
- name: 'Change TS to ${{ matrix.typescript-scenario }}'
78+
run: 'pnpm add --save-dev ${{ matrix.typescript-scenario}}'
79+
working-directory: ./test-app
80+
81+
# This has been really annoying
82+
# due to injected dependencies :(
83+
- name: 'Re-sync injected dependencies'
84+
run: pnpm i -f
85+
- name: 'Print Versions'
86+
run: |
87+
pnpm --filter "test-app*" exec tsc -v;
88+
pnpm --filter "test-app*" exec glint --version;
89+
90+
- name: 'Type checking (built in types)'
91+
run: pnpm --filter "test-app-old-ts" exec glint;
92+
93+
# - name: 'Type checking (DefinitelyTyped types)'
94+
# run: pnpm --filter "test-app-definitely-typed" exec glint;
95+
96+
typecheck:
97+
name: '${{ matrix.typescript-scenario }}'
98+
runs-on: ubuntu-latest
99+
timeout-minutes: 5
100+
needs: [build]
101+
continue-on-error: true
102+
strategy:
103+
fail-fast: true
104+
matrix:
105+
typescript-scenario:
69106
70107
71108
109+
110+
111+
112+
72113

73114
steps:
74115
- uses: actions/checkout@v4

pnpm-workspace.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ packages:
33
- "codemod"
44
- "docs"
55
- "test-app"
6+
- "test-app-old-ts"
67
- "test-app-definitely-typed"
78
- "dev/*"

test-app-old-ts/.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# EditorConfig helps developers define and maintain consistent
2+
# coding styles between different editors and IDEs
3+
# editorconfig.org
4+
5+
root = true
6+
7+
[*]
8+
end_of_line = lf
9+
charset = utf-8
10+
trim_trailing_whitespace = true
11+
insert_final_newline = true
12+
indent_style = space
13+
indent_size = 2
14+
15+
[*.hbs]
16+
insert_final_newline = false
17+
18+
[*.{diff,md}]
19+
trim_trailing_whitespace = false

test-app-old-ts/.ember-cli

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
/**
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.
5+
6+
Setting `disableAnalytics` to true will prevent any data from being sent.
7+
*/
8+
"disableAnalytics": false
9+
}

test-app-old-ts/.eslintignore

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

test-app-old-ts/.eslintrc.js

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
'use strict';
2+
3+
const { configs } = require('@nullvoxpopuli/eslint-configs');
4+
5+
const config = configs.ember();
6+
7+
module.exports = {
8+
...config,
9+
overrides: [
10+
...config.overrides,
11+
{
12+
files: ['**/*.gts'],
13+
plugins: ['ember'],
14+
parser: 'ember-eslint-parser',
15+
globals: {
16+
// used in testing as a shorthand for <output>
17+
out: true,
18+
},
19+
},
20+
{
21+
files: ['**/*.gjs'],
22+
plugins: ['ember'],
23+
parser: 'ember-eslint-parser',
24+
},
25+
{
26+
files: ['**/*.{ts,gts}'],
27+
rules: {
28+
/**
29+
* This one is incorrectly parsed for now, because
30+
* the rule doesn't understand decorators
31+
*/
32+
'@typescript-eslint/no-unused-vars': 'off',
33+
34+
/**
35+
* any can be useful
36+
*/
37+
'@typescript-eslint/no-explicit-any': 'off',
38+
39+
/**
40+
* Some compiler errors are not helpful
41+
*/
42+
'@typescript-eslint/ban-ts-comment': [
43+
'error',
44+
{
45+
'ts-ignore': 'allow-with-description',
46+
'ts-nocheck': 'allow-with-description',
47+
'ts-check': 'allow-with-description',
48+
'ts-expect-error': 'allow-with-description',
49+
},
50+
],
51+
},
52+
},
53+
],
54+
};

test-app-old-ts/.gitignore

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# compiled output
4+
/dist/
5+
/tmp/
6+
7+
# dependencies
8+
/bower_components/
9+
/node_modules/
10+
11+
# misc
12+
/.env*
13+
/.pnp*
14+
/.sass-cache
15+
/.eslintcache
16+
/connect.lock
17+
/coverage/
18+
/libpeerconnection.log
19+
/npm-debug.log*
20+
/testem.log
21+
/yarn-error.log
22+
23+
# ember-try
24+
/.node_modules.ember-try/
25+
/bower.json.ember-try
26+
/package.json.ember-try

test-app-old-ts/.prettierignore

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

test-app-old-ts/.prettierrc.js

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
'use strict';
2+
3+
module.exports = {
4+
plugins: ['prettier-plugin-ember-template-tag'],
5+
printWidth: 100,
6+
singleQuote: true,
7+
templateSingleQuote: false,
8+
// this was required to make the VSCode + Prettier work correctly with <template>, see https://github.com/gitKrystan/prettier-plugin-ember-template-tag/issues/38
9+
// we should roll this back once that issue has been fixed!
10+
overrides: [
11+
{
12+
files: '*.hbs',
13+
options: {
14+
singleQuote: false,
15+
},
16+
},
17+
{
18+
files: '*.gjs',
19+
options: {
20+
parser: 'ember-template-tag',
21+
},
22+
},
23+
{
24+
files: '*.gts',
25+
options: {
26+
parser: 'ember-template-tag',
27+
},
28+
},
29+
],
30+
};

test-app-old-ts/.template-lintrc.js

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended',
5+
overrides: [
6+
{
7+
files: ['**/*.gjs', '**/*.gts'],
8+
rules: {
9+
'no-curly-component-invocation': 'off',
10+
'no-implicit-this': 'off',
11+
},
12+
},
13+
],
14+
};

test-app-old-ts/.watchmanconfig

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ignore_dirs": ["tmp", "dist"]
3+
}

test-app-old-ts/app

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../test-app/app/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
'use strict';
2+
3+
module.exports = {};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* eslint-disable no-undef */
2+
self.deprecationWorkflow = self.deprecationWorkflow || {};
3+
self.deprecationWorkflow.config = {
4+
throwOnUnhandled: true,
5+
workflow: [],
6+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "3.28.3",
7+
"blueprints": [
8+
{
9+
"name": "app",
10+
"outputRepo": "https://github.com/ember-cli/ember-new-output",
11+
"codemodsSource": "ember-app-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": ["--yarn"]
14+
}
15+
]
16+
}
17+
]
18+
}

0 commit comments

Comments
 (0)