Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Formatting, add verify step to CI that prevents accidentally git diffs from happening later #1691

Merged
merged 4 commits into from
Jan 23, 2025
Merged

Fix Formatting, add verify step to CI that prevents accidentally git diffs from happening later #1691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
941ec23
Add verify step to CI
NullVoxPopuli Jan 23, 2025
8aed933
Update the meta updater
NullVoxPopuli Jan 23, 2025
97217c9
Update metadata
NullVoxPopuli Jan 23, 2025
921cda6
Run lint:fix
NullVoxPopuli Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- run: pnpm repo:lint:all

verify:
name: Verify
runs-on: ubuntu-latest
needs: ['install_dependencies']
timeout-minutes: 10

steps:
- uses: wyvox/action@v1
with:
pnpm-args: '--ignore-scripts'
node-version: 22.13.0
repo-token: ${{ secrets.GITHUB_TOKEN }}
- run: pnpm lint:fix
- run: pnpm repo:update:conventions
- run: pnpm repo:update:metadata
- uses: wyvox/action-no-git-diff@v1

test-chrome:
name: Chrome
runs-on: ubuntu-latest
Expand Down
22 changes: 19 additions & 3 deletions .meta-updater/main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default () =>

if (pkg) {
const isPublished = !pkg.private;
const isRoot = pkg.name === 'glimmer-engine';

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

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

if (isPublished) {
const updateRepo = () => {
update(actual, 'repository', {
type: 'git',
url: 'git+https://github.com/glimmerjs/glimmer-vm.git',
directory: pkg.root,
...(pkg.root
? {
directory: pkg.root,
}
: {}),
});
};

if (isPublished) {
updateRepo();
update(publishConfig, 'access', 'public');
} else if (pkg['repo-meta']?.built) {
delete publishConfig['access'];
} else {
publishConfig = actual.publishConfig = {};

update(actual, 'version', repo.workspace.version);
delete actual.repository;
/**
* Needed for release automation
*/
if (isRoot) {
updateRepo();
} else {
delete actual.repository;
}
delete scripts['test:publint'];
cleanup(actual, 'publishConfig');
return actual;
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
"esbenp.prettier-vscode",
"dnut.rewrap-revived"
]
}
}
27 changes: 7 additions & 20 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
},
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": false,
"editor.rulers": [
100
]
"editor.rulers": [100]
},
"[json][jsonc][markdown][yaml]": {
"editor.codeActionsOnSave": {
Expand All @@ -33,7 +31,7 @@
{
"color": "#aaaaaa66",
"column": 80
},
}
],
"eslint.codeAction.showDocumentation": {
"enable": true
Expand All @@ -48,12 +46,7 @@
"eslint.problems.shortenToSingleLine": true,
"eslint.runtime": "node",
"eslint.useFlatConfig": true,
"eslint.validate": [
"javascript",
"typescript",
"json",
"jsonc"
],
"eslint.validate": ["javascript", "typescript", "json", "jsonc"],
"eslint.workingDirectories": [
{
"pattern": "."
Expand Down Expand Up @@ -126,15 +119,9 @@
}
},
"inline-bookmarks.expert.custom.words.mapping": {
"audit": [
"@audit(\\s|$)"
],
"fixme": [
"@fixme(\\s|$)"
],
"warn": [
"@premerge(\\s|$)"
],
"audit": ["@audit(\\s|$)"],
"fixme": ["@fixme(\\s|$)"],
"warn": ["@premerge(\\s|$)"],
"bandaid": [
"@bandaid\\(until:[^)]+\\)(\\s|$)",
"@bandaid(?=\\{@link [^}]+\\}(\\s|$))",
Expand All @@ -161,4 +148,4 @@
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.updateImportsOnFileMove.enabled": "always",
"typescript.reportStyleChecksAsWarnings": false
}
}
1 change: 0 additions & 1 deletion bin/update-package-json.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import { existsSync, readFileSync, writeFileSync } from 'node:fs';
import { resolve } from 'node:path';

Expand Down
94 changes: 47 additions & 47 deletions glimmer-vm.code-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,184 +2,184 @@
"folders": [
{
"name": "✨ glimmer-engine",
"path": "."
"path": ".",
},
{
"name": "glimmer-benchmark",
"path": "benchmark"
"path": "benchmark",
},
{
"name": "@glimmer-workspace/krausest",
"path": "benchmark/benchmarks/krausest"
"path": "benchmark/benchmarks/krausest",
},
{
"name": "@glimmer-workspace/bin",
"path": "bin"
"path": "bin",
},
{
"name": "📦 packages",
"path": "packages"
"path": "packages",
},
{
"name": "📦 @glimmer-workspace/benchmark-env",
"path": "packages/@glimmer-workspace/benchmark-env"
"path": "packages/@glimmer-workspace/benchmark-env",
},
{
"name": "📦 @glimmer-workspace/build-support",
"path": "packages/@glimmer-workspace/build"
"path": "packages/@glimmer-workspace/build",
},
{
"name": "📦 @glimmer-workspace/eslint-plugin",
"path": "packages/@glimmer-workspace/eslint-plugin"
"path": "packages/@glimmer-workspace/eslint-plugin",
},
{
"name": "📦 @glimmer-workspace/integration-tests",
"path": "packages/@glimmer-workspace/integration-tests"
"path": "packages/@glimmer-workspace/integration-tests",
},
{
"name": "📦 @glimmer-workspace/test-utils",
"path": "packages/@glimmer-workspace/test-utils"
"path": "packages/@glimmer-workspace/test-utils",
},
{
"name": "📦 @glimmer/compiler",
"path": "packages/@glimmer/compiler"
"path": "packages/@glimmer/compiler",
},
{
"name": "📦 @glimmer-test/compiler",
"path": "packages/@glimmer/compiler/test"
"path": "packages/@glimmer/compiler/test",
},
{
"name": "📦 @glimmer/debug",
"path": "packages/@glimmer/debug"
"path": "packages/@glimmer/debug",
},
{
"name": "📦 @glimmer/destroyable",
"path": "packages/@glimmer/destroyable"
"path": "packages/@glimmer/destroyable",
},
{
"name": "📦 @glimmer-test/destroyable",
"path": "packages/@glimmer/destroyable/test"
"path": "packages/@glimmer/destroyable/test",
},
{
"name": "📦 @glimmer/dom-change-list",
"path": "packages/@glimmer/dom-change-list"
"path": "packages/@glimmer/dom-change-list",
},
{
"name": "📦 @glimmer-test/dom-change-list",
"path": "packages/@glimmer/dom-change-list/test"
"path": "packages/@glimmer/dom-change-list/test",
},
{
"name": "📦 @glimmer/encoder",
"path": "packages/@glimmer/encoder"
"path": "packages/@glimmer/encoder",
},
{
"name": "📦 @glimmer/global-context",
"path": "packages/@glimmer/global-context"
"path": "packages/@glimmer/global-context",
},
{
"name": "📦 @glimmer/interfaces",
"path": "packages/@glimmer/interfaces"
"path": "packages/@glimmer/interfaces",
},
{
"name": "📦 @glimmer/local-debug-flags",
"path": "packages/@glimmer/local-debug-flags"
"path": "packages/@glimmer/local-debug-flags",
},
{
"name": "📦 @glimmer/manager",
"path": "packages/@glimmer/manager"
"path": "packages/@glimmer/manager",
},
{
"name": "📦 @glimmer-test/manager",
"path": "packages/@glimmer/manager/test"
"path": "packages/@glimmer/manager/test",
},
{
"name": "📦 @glimmer/node",
"path": "packages/@glimmer/node"
"path": "packages/@glimmer/node",
},
{
"name": "📦 @glimmer/opcode-compiler",
"path": "packages/@glimmer/opcode-compiler"
"path": "packages/@glimmer/opcode-compiler",
},
{
"name": "📦 @glimmer/owner",
"path": "packages/@glimmer/owner"
"path": "packages/@glimmer/owner",
},
{
"name": "📦 @glimmer-test/owner",
"path": "packages/@glimmer/owner/test"
"path": "packages/@glimmer/owner/test",
},
{
"name": "📦 @glimmer/program",
"path": "packages/@glimmer/program"
"path": "packages/@glimmer/program",
},
{
"name": "📦 @glimmer-test/program",
"path": "packages/@glimmer/program/test"
"path": "packages/@glimmer/program/test",
},
{
"name": "📦 @glimmer/reference",
"path": "packages/@glimmer/reference"
"path": "packages/@glimmer/reference",
},
{
"name": "📦 @glimmer-test/reference",
"path": "packages/@glimmer/reference/test"
"path": "packages/@glimmer/reference/test",
},
{
"name": "📦 @glimmer/runtime",
"path": "packages/@glimmer/runtime"
"path": "packages/@glimmer/runtime",
},
{
"name": "📦 @glimmer/syntax",
"path": "packages/@glimmer/syntax"
"path": "packages/@glimmer/syntax",
},
{
"name": "📦 @glimmer-test/syntax",
"path": "packages/@glimmer/syntax/test"
"path": "packages/@glimmer/syntax/test",
},
{
"name": "📦 @glimmer/util",
"path": "packages/@glimmer/util"
"path": "packages/@glimmer/util",
},
{
"name": "📦 @glimmer-test/util",
"path": "packages/@glimmer/util/test"
"path": "packages/@glimmer/util/test",
},
{
"name": "📦 @glimmer/validator",
"path": "packages/@glimmer/validator"
"path": "packages/@glimmer/validator",
},
{
"name": "📦 @glimmer-test/validator",
"path": "packages/@glimmer/validator/test"
"path": "packages/@glimmer/validator/test",
},
{
"name": "📦 @glimmer/vm",
"path": "packages/@glimmer/vm"
"path": "packages/@glimmer/vm",
},
{
"name": "📦 @glimmer/vm-babel-plugins",
"path": "packages/@glimmer/vm-babel-plugins"
"path": "packages/@glimmer/vm-babel-plugins",
},
{
"name": "📦 @glimmer/wire-format",
"path": "packages/@glimmer/wire-format"
"path": "packages/@glimmer/wire-format",
},
{
"name": "📦 @types/js-reporters",
"path": "packages/@types/js-reporters"
"path": "packages/@types/js-reporters",
},
{
"name": "📦 @types/puppeteer-chromium-resolver",
"path": "packages/@types/puppeteer-chromium-resolver"
"path": "packages/@types/puppeteer-chromium-resolver",
},
{
"name": "📦 @types/qunit",
"path": "packages/@types/qunit"
}
"path": "packages/@types/qunit",
},
],
"settings": {
"typescript.tsc.autoDetect": "on",
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.tsserver.experimental.enableProjectDiagnostics": true
}
"typescript.tsserver.experimental.enableProjectDiagnostics": true,
},
}
2 changes: 0 additions & 2 deletions guides/workspace/vscode.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,6 @@ See [Standard Annotations](./workspace-management.md#standard-annotations) in `w

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



### NPM Dependency Links (`herrmannplatz.npm-dependency-links`)

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