From defa4a2c42fb8f38b36bdb8b153c0d1ed8989669 Mon Sep 17 00:00:00 2001 From: Augustine Kim Date: Thu, 1 May 2025 19:08:47 -0700 Subject: [PATCH 1/3] update wireit --- package-lock.json | 33 +++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8652c0cd7..8d5db3bab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "playground-elements": "^0.20.0", "prettier": "^2.1.2", "typescript": "~4.7.4", - "wireit": "^0.14.0" + "wireit": "^0.14.12" } }, "node_modules/@11ty/dependency-tree": { @@ -8516,7 +8516,9 @@ } }, "node_modules/wireit": { - "version": "0.14.0", + "version": "0.14.12", + "resolved": "https://registry.npmjs.org/wireit/-/wireit-0.14.12.tgz", + "integrity": "sha512-gNSd+nZmMo6cuICezYXRIayu6TSOeCSCDzjSF0q6g8FKDsRbdqrONrSZYzdk/uBISmRcv4vZtsno6GyGvdXwGA==", "dev": true, "license": "Apache-2.0", "workspaces": [ @@ -8524,7 +8526,7 @@ "website" ], "dependencies": { - "braces": "^3.0.2", + "brace-expansion": "^4.0.0", "chokidar": "^3.5.3", "fast-glob": "^3.2.11", "jsonc-parser": "^3.0.0", @@ -8534,7 +8536,30 @@ "wireit": "bin/wireit.js" }, "engines": { - "node": ">=14.14.0" + "node": ">=18.0.0" + } + }, + "node_modules/wireit/node_modules/balanced-match": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-3.0.1.tgz", + "integrity": "sha512-vjtV3hiLqYDNRoiAv0zC4QaGAMPomEoq83PRmYIofPswwZurCeWR5LByXm7SyoL0Zh5+2z0+HC7jG8gSZJUh0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 16" + } + }, + "node_modules/wireit/node_modules/brace-expansion": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-4.0.0.tgz", + "integrity": "sha512-l/mOwLWs7BQIgOKrL46dIAbyCKvPV7YJPDspkuc88rHsZRlg3hptUGdU7Trv0VFP4d3xnSGBQrKu5ZvGB7UeIw==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^3.0.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/with": { diff --git a/package.json b/package.json index d3d67555b..a4db85262 100644 --- a/package.json +++ b/package.json @@ -64,6 +64,6 @@ "playground-elements": "^0.20.0", "prettier": "^2.1.2", "typescript": "~4.7.4", - "wireit": "^0.14.0" + "wireit": "^0.14.12" } } From bee63fbeae726bac24dabeecf14854c84acb65fd Mon Sep 17 00:00:00 2001 From: Augustine Kim Date: Thu, 1 May 2025 19:09:01 -0700 Subject: [PATCH 2/3] update github actions wireit cache version --- .github/workflows/build-and-publish-search-index.yml | 2 +- .github/workflows/check-api-data-in-sync.yml | 2 +- .github/workflows/check-links.yml | 2 +- .github/workflows/integration-tests.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-publish-search-index.yml b/.github/workflows/build-and-publish-search-index.yml index fe90e97da..bf2a0f8d6 100644 --- a/.github/workflows/build-and-publish-search-index.yml +++ b/.github/workflows/build-and-publish-search-index.yml @@ -10,7 +10,7 @@ jobs: runs-on: macos-latest timeout-minutes: 10 steps: - - uses: google/wireit@setup-github-actions-caching/v1 + - uses: google/wireit@setup-github-actions-caching/v2 - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/check-api-data-in-sync.yml b/.github/workflows/check-api-data-in-sync.yml index ef2db063a..719590a9a 100644 --- a/.github/workflows/check-api-data-in-sync.yml +++ b/.github/workflows/check-api-data-in-sync.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 - - uses: google/wireit@setup-github-actions-caching/v1 + - uses: google/wireit@setup-github-actions-caching/v2 with: node-version: 18 cache: npm diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml index 2f01c482f..d1e73db2c 100644 --- a/.github/workflows/check-links.yml +++ b/.github/workflows/check-links.yml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest timeout-minutes: 10 steps: - - uses: google/wireit@setup-github-actions-caching/v1 + - uses: google/wireit@setup-github-actions-caching/v2 - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 7c0c9d36e..3988f29d5 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest timeout-minutes: 20 steps: - - uses: google/wireit@setup-github-actions-caching/v1 + - uses: google/wireit@setup-github-actions-caching/v2 - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 00c0ff5ce..d9db32d5f 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -7,7 +7,7 @@ jobs: runs-on: macos-latest timeout-minutes: 10 steps: - - uses: google/wireit@setup-github-actions-caching/v1 + - uses: google/wireit@setup-github-actions-caching/v2 - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: From 532cc89f87bacecd993b16a1fff985f17c4e0526 Mon Sep 17 00:00:00 2001 From: Augustine Kim Date: Thu, 1 May 2025 20:25:45 -0700 Subject: [PATCH 3/3] disable wireit cache for api doc generation --- packages/lit-dev-tools-cjs/src/api-docs/configs/lit-2.ts | 2 ++ packages/lit-dev-tools-cjs/src/api-docs/configs/lit-3.ts | 2 ++ packages/lit-dev-tools-cjs/src/api-docs/generate.ts | 7 +++++-- packages/lit-dev-tools-cjs/src/api-docs/types.ts | 6 +++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-2.ts b/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-2.ts index de5c22658..dd61c39bd 100644 --- a/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-2.ts +++ b/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-2.ts @@ -33,6 +33,8 @@ export const lit2Config: ApiDocsConfig = { { cmd: 'npm', args: ['run', 'build:ts'], + // disable wireit cache for to avoid caching errors in Github Actions + env: {WIREIT_CACHE: 'none'}, }, ], diff --git a/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-3.ts b/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-3.ts index b24e54ed8..a6cbb76cb 100644 --- a/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-3.ts +++ b/packages/lit-dev-tools-cjs/src/api-docs/configs/lit-3.ts @@ -46,6 +46,8 @@ export const lit3Config: ApiDocsConfig = { { cmd: 'npm', args: ['run', 'build:ts'], + // disable wireit cache for to avoid caching errors in Github Actions + env: {WIREIT_CACHE: 'none'}, }, // Apply file patch to fix typedoc errors during docs generation. Because // `npm run build:ts` is run prior to this, the patch file can always be diff --git a/packages/lit-dev-tools-cjs/src/api-docs/generate.ts b/packages/lit-dev-tools-cjs/src/api-docs/generate.ts index 6405edd21..6a07d53a1 100644 --- a/packages/lit-dev-tools-cjs/src/api-docs/generate.ts +++ b/packages/lit-dev-tools-cjs/src/api-docs/generate.ts @@ -62,9 +62,12 @@ const INSTALLED_FILE = 'INSTALLED'; const setup = async (config: ApiDocsConfig) => { console.log(`running npm ci in ${config.gitDir}`); await execFileAsync('npm', ['ci'], {cwd: config.gitDir}); - for (const {cmd, args} of config.extraSetupCommands ?? []) { + for (const {cmd, args, env} of config.extraSetupCommands ?? []) { console.log(`running ${cmd} ${args.join(' ')} in ${config.gitDir}`); - await execFileAsync(cmd, args, {cwd: config.gitDir}); + await execFileAsync(cmd, args, { + cwd: config.gitDir, + env: {...process.env, ...env}, + }); } await fs.writeFile(pathlib.join(config.workDir, INSTALLED_FILE), '', 'utf8'); }; diff --git a/packages/lit-dev-tools-cjs/src/api-docs/types.ts b/packages/lit-dev-tools-cjs/src/api-docs/types.ts index 1f4d0afcc..bf57fea3d 100644 --- a/packages/lit-dev-tools-cjs/src/api-docs/types.ts +++ b/packages/lit-dev-tools-cjs/src/api-docs/types.ts @@ -93,7 +93,11 @@ export interface ApiDocsConfig { * Extra setup/build commands to run after NPM install and before running * TypeDoc. */ - extraSetupCommands?: Array<{cmd: string; args: string[]}>; + extraSetupCommands?: Array<{ + cmd: string; + args: string[]; + env?: Record; + }>; /** * Entrypoint TypeScript modules for TypeDoc to analyze.