Skip to content

Commit 54e65f9

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge pull request #1691 from glimmerjs/fix-formatting
Fix Formatting, add verify step to CI that prevents accidentally git diffs from happening later
2 parents 46e37c7 + 921cda6 commit 54e65f9

Some content is hidden

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

42 files changed

+230
-179
lines changed

‎.github/workflows/ci.yml

+17
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,23 @@ jobs:
4545
repo-token: ${{ secrets.GITHUB_TOKEN }}
4646
- run: pnpm repo:lint:all
4747

48+
verify:
49+
name: Verify
50+
runs-on: ubuntu-latest
51+
needs: ['install_dependencies']
52+
timeout-minutes: 10
53+
54+
steps:
55+
- uses: wyvox/action@v1
56+
with:
57+
pnpm-args: '--ignore-scripts'
58+
node-version: 22.13.0
59+
repo-token: ${{ secrets.GITHUB_TOKEN }}
60+
- run: pnpm lint:fix
61+
- run: pnpm repo:update:conventions
62+
- run: pnpm repo:update:metadata
63+
- uses: wyvox/action-no-git-diff@v1
64+
4865
test-chrome:
4966
name: Chrome
5067
runs-on: ubuntu-latest

‎.meta-updater/main.mjs

+19-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export default () =>
2222

2323
if (pkg) {
2424
const isPublished = !pkg.private;
25+
const isRoot = pkg.name === 'glimmer-engine';
2526

2627
const scripts = /** @type { JsonObject } */ (actual.scripts ??= {});
2728

@@ -30,20 +31,35 @@ export default () =>
3031
// replaced with prepack
3132
delete scripts['test:types'];
3233

33-
if (isPublished) {
34+
const updateRepo = () => {
3435
update(actual, 'repository', {
3536
type: 'git',
3637
url: 'git+https://github.com/glimmerjs/glimmer-vm.git',
37-
directory: pkg.root,
38+
...(pkg.root
39+
? {
40+
directory: pkg.root,
41+
}
42+
: {}),
3843
});
44+
};
45+
46+
if (isPublished) {
47+
updateRepo();
3948
update(publishConfig, 'access', 'public');
4049
} else if (pkg['repo-meta']?.built) {
4150
delete publishConfig['access'];
4251
} else {
4352
publishConfig = actual.publishConfig = {};
4453

4554
update(actual, 'version', repo.workspace.version);
46-
delete actual.repository;
55+
/**
56+
* Needed for release automation
57+
*/
58+
if (isRoot) {
59+
updateRepo();
60+
} else {
61+
delete actual.repository;
62+
}
4763
delete scripts['test:publint'];
4864
cleanup(actual, 'publishConfig');
4965
return actual;

‎.vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
"esbenp.prettier-vscode",
1010
"dnut.rewrap-revived"
1111
]
12-
}
12+
}

‎.vscode/settings.json

+7-20
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
},
1111
"editor.defaultFormatter": "esbenp.prettier-vscode",
1212
"editor.formatOnSave": false,
13-
"editor.rulers": [
14-
100
15-
]
13+
"editor.rulers": [100]
1614
},
1715
"[json][jsonc][markdown][yaml]": {
1816
"editor.codeActionsOnSave": {
@@ -33,7 +31,7 @@
3331
{
3432
"color": "#aaaaaa66",
3533
"column": 80
36-
},
34+
}
3735
],
3836
"eslint.codeAction.showDocumentation": {
3937
"enable": true
@@ -48,12 +46,7 @@
4846
"eslint.problems.shortenToSingleLine": true,
4947
"eslint.runtime": "node",
5048
"eslint.useFlatConfig": true,
51-
"eslint.validate": [
52-
"javascript",
53-
"typescript",
54-
"json",
55-
"jsonc"
56-
],
49+
"eslint.validate": ["javascript", "typescript", "json", "jsonc"],
5750
"eslint.workingDirectories": [
5851
{
5952
"pattern": "."
@@ -126,15 +119,9 @@
126119
}
127120
},
128121
"inline-bookmarks.expert.custom.words.mapping": {
129-
"audit": [
130-
"@audit(\\s|$)"
131-
],
132-
"fixme": [
133-
"@fixme(\\s|$)"
134-
],
135-
"warn": [
136-
"@premerge(\\s|$)"
137-
],
122+
"audit": ["@audit(\\s|$)"],
123+
"fixme": ["@fixme(\\s|$)"],
124+
"warn": ["@premerge(\\s|$)"],
138125
"bandaid": [
139126
"@bandaid\\(until:[^)]+\\)(\\s|$)",
140127
"@bandaid(?=\\{@link [^}]+\\}(\\s|$))",
@@ -161,4 +148,4 @@
161148
"typescript.tsdk": "node_modules/typescript/lib",
162149
"typescript.updateImportsOnFileMove.enabled": "always",
163150
"typescript.reportStyleChecksAsWarnings": false
164-
}
151+
}

‎bin/update-package-json.mts

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import { existsSync, readFileSync, writeFileSync } from 'node:fs';
32
import { resolve } from 'node:path';
43

‎glimmer-vm.code-workspace

+47-47
Original file line numberDiff line numberDiff line change
@@ -2,184 +2,184 @@
22
"folders": [
33
{
44
"name": "✨ glimmer-engine",
5-
"path": "."
5+
"path": ".",
66
},
77
{
88
"name": "glimmer-benchmark",
9-
"path": "benchmark"
9+
"path": "benchmark",
1010
},
1111
{
1212
"name": "@glimmer-workspace/krausest",
13-
"path": "benchmark/benchmarks/krausest"
13+
"path": "benchmark/benchmarks/krausest",
1414
},
1515
{
1616
"name": "@glimmer-workspace/bin",
17-
"path": "bin"
17+
"path": "bin",
1818
},
1919
{
2020
"name": "📦 packages",
21-
"path": "packages"
21+
"path": "packages",
2222
},
2323
{
2424
"name": "📦 @glimmer-workspace/benchmark-env",
25-
"path": "packages/@glimmer-workspace/benchmark-env"
25+
"path": "packages/@glimmer-workspace/benchmark-env",
2626
},
2727
{
2828
"name": "📦 @glimmer-workspace/build-support",
29-
"path": "packages/@glimmer-workspace/build"
29+
"path": "packages/@glimmer-workspace/build",
3030
},
3131
{
3232
"name": "📦 @glimmer-workspace/eslint-plugin",
33-
"path": "packages/@glimmer-workspace/eslint-plugin"
33+
"path": "packages/@glimmer-workspace/eslint-plugin",
3434
},
3535
{
3636
"name": "📦 @glimmer-workspace/integration-tests",
37-
"path": "packages/@glimmer-workspace/integration-tests"
37+
"path": "packages/@glimmer-workspace/integration-tests",
3838
},
3939
{
4040
"name": "📦 @glimmer-workspace/test-utils",
41-
"path": "packages/@glimmer-workspace/test-utils"
41+
"path": "packages/@glimmer-workspace/test-utils",
4242
},
4343
{
4444
"name": "📦 @glimmer/compiler",
45-
"path": "packages/@glimmer/compiler"
45+
"path": "packages/@glimmer/compiler",
4646
},
4747
{
4848
"name": "📦 @glimmer-test/compiler",
49-
"path": "packages/@glimmer/compiler/test"
49+
"path": "packages/@glimmer/compiler/test",
5050
},
5151
{
5252
"name": "📦 @glimmer/debug",
53-
"path": "packages/@glimmer/debug"
53+
"path": "packages/@glimmer/debug",
5454
},
5555
{
5656
"name": "📦 @glimmer/destroyable",
57-
"path": "packages/@glimmer/destroyable"
57+
"path": "packages/@glimmer/destroyable",
5858
},
5959
{
6060
"name": "📦 @glimmer-test/destroyable",
61-
"path": "packages/@glimmer/destroyable/test"
61+
"path": "packages/@glimmer/destroyable/test",
6262
},
6363
{
6464
"name": "📦 @glimmer/dom-change-list",
65-
"path": "packages/@glimmer/dom-change-list"
65+
"path": "packages/@glimmer/dom-change-list",
6666
},
6767
{
6868
"name": "📦 @glimmer-test/dom-change-list",
69-
"path": "packages/@glimmer/dom-change-list/test"
69+
"path": "packages/@glimmer/dom-change-list/test",
7070
},
7171
{
7272
"name": "📦 @glimmer/encoder",
73-
"path": "packages/@glimmer/encoder"
73+
"path": "packages/@glimmer/encoder",
7474
},
7575
{
7676
"name": "📦 @glimmer/global-context",
77-
"path": "packages/@glimmer/global-context"
77+
"path": "packages/@glimmer/global-context",
7878
},
7979
{
8080
"name": "📦 @glimmer/interfaces",
81-
"path": "packages/@glimmer/interfaces"
81+
"path": "packages/@glimmer/interfaces",
8282
},
8383
{
8484
"name": "📦 @glimmer/local-debug-flags",
85-
"path": "packages/@glimmer/local-debug-flags"
85+
"path": "packages/@glimmer/local-debug-flags",
8686
},
8787
{
8888
"name": "📦 @glimmer/manager",
89-
"path": "packages/@glimmer/manager"
89+
"path": "packages/@glimmer/manager",
9090
},
9191
{
9292
"name": "📦 @glimmer-test/manager",
93-
"path": "packages/@glimmer/manager/test"
93+
"path": "packages/@glimmer/manager/test",
9494
},
9595
{
9696
"name": "📦 @glimmer/node",
97-
"path": "packages/@glimmer/node"
97+
"path": "packages/@glimmer/node",
9898
},
9999
{
100100
"name": "📦 @glimmer/opcode-compiler",
101-
"path": "packages/@glimmer/opcode-compiler"
101+
"path": "packages/@glimmer/opcode-compiler",
102102
},
103103
{
104104
"name": "📦 @glimmer/owner",
105-
"path": "packages/@glimmer/owner"
105+
"path": "packages/@glimmer/owner",
106106
},
107107
{
108108
"name": "📦 @glimmer-test/owner",
109-
"path": "packages/@glimmer/owner/test"
109+
"path": "packages/@glimmer/owner/test",
110110
},
111111
{
112112
"name": "📦 @glimmer/program",
113-
"path": "packages/@glimmer/program"
113+
"path": "packages/@glimmer/program",
114114
},
115115
{
116116
"name": "📦 @glimmer-test/program",
117-
"path": "packages/@glimmer/program/test"
117+
"path": "packages/@glimmer/program/test",
118118
},
119119
{
120120
"name": "📦 @glimmer/reference",
121-
"path": "packages/@glimmer/reference"
121+
"path": "packages/@glimmer/reference",
122122
},
123123
{
124124
"name": "📦 @glimmer-test/reference",
125-
"path": "packages/@glimmer/reference/test"
125+
"path": "packages/@glimmer/reference/test",
126126
},
127127
{
128128
"name": "📦 @glimmer/runtime",
129-
"path": "packages/@glimmer/runtime"
129+
"path": "packages/@glimmer/runtime",
130130
},
131131
{
132132
"name": "📦 @glimmer/syntax",
133-
"path": "packages/@glimmer/syntax"
133+
"path": "packages/@glimmer/syntax",
134134
},
135135
{
136136
"name": "📦 @glimmer-test/syntax",
137-
"path": "packages/@glimmer/syntax/test"
137+
"path": "packages/@glimmer/syntax/test",
138138
},
139139
{
140140
"name": "📦 @glimmer/util",
141-
"path": "packages/@glimmer/util"
141+
"path": "packages/@glimmer/util",
142142
},
143143
{
144144
"name": "📦 @glimmer-test/util",
145-
"path": "packages/@glimmer/util/test"
145+
"path": "packages/@glimmer/util/test",
146146
},
147147
{
148148
"name": "📦 @glimmer/validator",
149-
"path": "packages/@glimmer/validator"
149+
"path": "packages/@glimmer/validator",
150150
},
151151
{
152152
"name": "📦 @glimmer-test/validator",
153-
"path": "packages/@glimmer/validator/test"
153+
"path": "packages/@glimmer/validator/test",
154154
},
155155
{
156156
"name": "📦 @glimmer/vm",
157-
"path": "packages/@glimmer/vm"
157+
"path": "packages/@glimmer/vm",
158158
},
159159
{
160160
"name": "📦 @glimmer/vm-babel-plugins",
161-
"path": "packages/@glimmer/vm-babel-plugins"
161+
"path": "packages/@glimmer/vm-babel-plugins",
162162
},
163163
{
164164
"name": "📦 @glimmer/wire-format",
165-
"path": "packages/@glimmer/wire-format"
165+
"path": "packages/@glimmer/wire-format",
166166
},
167167
{
168168
"name": "📦 @types/js-reporters",
169-
"path": "packages/@types/js-reporters"
169+
"path": "packages/@types/js-reporters",
170170
},
171171
{
172172
"name": "📦 @types/puppeteer-chromium-resolver",
173-
"path": "packages/@types/puppeteer-chromium-resolver"
173+
"path": "packages/@types/puppeteer-chromium-resolver",
174174
},
175175
{
176176
"name": "📦 @types/qunit",
177-
"path": "packages/@types/qunit"
178-
}
177+
"path": "packages/@types/qunit",
178+
},
179179
],
180180
"settings": {
181181
"typescript.tsc.autoDetect": "on",
182182
"typescript.tsdk": "node_modules/typescript/lib",
183-
"typescript.tsserver.experimental.enableProjectDiagnostics": true
184-
}
183+
"typescript.tsserver.experimental.enableProjectDiagnostics": true,
184+
},
185185
}

‎guides/workspace/vscode.md

-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ See [Standard Annotations](./workspace-management.md#standard-annotations) in `w
7373

7474
<kbd> ![fixme](./demos/fixme.png) </kbd>
7575

76-
77-
7876
### NPM Dependency Links (`herrmannplatz.npm-dependency-links`)
7977

8078
This extension will turn your dependencies and devDependencies in your `package.json` into links to

0 commit comments

Comments
 (0)