From ce2f2e949641730c0f24993471ab9caf216c02bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:08:25 +0000 Subject: [PATCH 1/3] Bump the github-actions group across 1 directory with 2 updates (#3194) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/CI.yml | 4 ++-- .github/workflows/codeql.yml | 6 +++--- .github/workflows/deploy-prod-static.yml | 2 +- .github/workflows/publish-packages.yml | 2 +- .github/workflows/weekly-stats.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e25d73e7..4997bddb 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: "18.x" - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 @@ -83,7 +83,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: 'lts/*' - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f50c5c80..fbb1e903 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,7 +44,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 with: config-file: ./.github/codeql/codeql-configuration.yml # Override language selection by uncommenting this and choosing your languages @@ -54,7 +54,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below). - name: Autobuild - uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 # ℹī¸ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -68,4 +68,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11 + uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15 diff --git a/.github/workflows/deploy-prod-static.yml b/.github/workflows/deploy-prod-static.yml index b69e097e..863ceb01 100644 --- a/.github/workflows/deploy-prod-static.yml +++ b/.github/workflows/deploy-prod-static.yml @@ -30,7 +30,7 @@ jobs: with: # Fetch the full history, to build attribution.json fetch-depth: 0 - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: "18.x" diff --git a/.github/workflows/publish-packages.yml b/.github/workflows/publish-packages.yml index ebee60e4..d6a0a186 100644 --- a/.github/workflows/publish-packages.yml +++ b/.github/workflows/publish-packages.yml @@ -21,7 +21,7 @@ jobs: fetch-depth: 0 filter: blob:none token: ${{ secrets.GITHUB_BOT_TOKEN }} - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: "18.x" registry-url: "https://registry.npmjs.org/" diff --git a/.github/workflows/weekly-stats.yml b/.github/workflows/weekly-stats.yml index 124d3e0c..9c1ba0c3 100644 --- a/.github/workflows/weekly-stats.yml +++ b/.github/workflows/weekly-stats.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 + - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: "18.x" From 1d0af97318b79943fe0bfa8871ee6e8c584c9af5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9?= <9092381+Renegade334@users.noreply.github.com> Date: Tue, 30 Jul 2024 01:37:05 +0100 Subject: [PATCH 2/3] ATA: `node:` module resolution (#3191) Co-authored-by: Jake Bailey <5341706+jakebailey@users.noreply.github.com> --- .changeset/plenty-deers-visit.md | 5 +++++ packages/ata/src/edgeCases.ts | 3 ++- packages/ata/tests/edgeCases.spec.ts | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 .changeset/plenty-deers-visit.md diff --git a/.changeset/plenty-deers-visit.md b/.changeset/plenty-deers-visit.md new file mode 100644 index 00000000..e9963003 --- /dev/null +++ b/.changeset/plenty-deers-visit.md @@ -0,0 +1,5 @@ +--- +"@typescript/ata": patch +--- + +Always treat `node:` modules as Node, expand list of known Node modules diff --git a/packages/ata/src/edgeCases.ts b/packages/ata/src/edgeCases.ts index 5bc0a931..a3399078 100644 --- a/packages/ata/src/edgeCases.ts +++ b/packages/ata/src/edgeCases.ts @@ -24,6 +24,7 @@ export const mapModuleNameToModule = (moduleSpecifier: string) => { "http2", "https", "inspector", + "inspector/promises", "module", "net", "os", @@ -57,7 +58,7 @@ export const mapModuleNameToModule = (moduleSpecifier: string) => { "zlib", ] - if (builtInNodeMods.includes(moduleSpecifier.replace("node:", ""))) { + if (moduleSpecifier.indexOf("node:") === 0 || builtInNodeMods.includes(moduleSpecifier)) { return "node" } diff --git a/packages/ata/tests/edgeCases.spec.ts b/packages/ata/tests/edgeCases.spec.ts index 201a2f48..adf26b02 100644 --- a/packages/ata/tests/edgeCases.spec.ts +++ b/packages/ata/tests/edgeCases.spec.ts @@ -9,6 +9,11 @@ describe(mapModuleNameToModule, () => { expect(mapModuleNameToModule("node:fs")).toEqual("node") }) + it("handles mandatorily-prefixed node: identifiers", () => { + expect(mapModuleNameToModule("node:test")).toEqual("node") + expect(mapModuleNameToModule("test")).toEqual("test") + }) + it("strips module filepaths", () => { expect(mapModuleNameToModule("lodash/identity")).toEqual("lodash") expect(mapModuleNameToModule("@org/lodash/identity")).toEqual("@org/lodash") From 9ef7fcda64cdb565b335b3a0a1431b550fa9e18f Mon Sep 17 00:00:00 2001 From: TypeScript Bot Date: Fri, 2 Aug 2024 13:01:53 -0700 Subject: [PATCH 3/3] Version Packages (#3195) Co-authored-by: github-actions[bot] --- .changeset/plenty-deers-visit.md | 5 ----- packages/ata/CHANGELOG.md | 6 ++++++ packages/ata/package.json | 2 +- packages/sandbox/CHANGELOG.md | 7 +++++++ packages/sandbox/package.json | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) delete mode 100644 .changeset/plenty-deers-visit.md diff --git a/.changeset/plenty-deers-visit.md b/.changeset/plenty-deers-visit.md deleted file mode 100644 index e9963003..00000000 --- a/.changeset/plenty-deers-visit.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@typescript/ata": patch ---- - -Always treat `node:` modules as Node, expand list of known Node modules diff --git a/packages/ata/CHANGELOG.md b/packages/ata/CHANGELOG.md index 01263854..ba464505 100644 --- a/packages/ata/CHANGELOG.md +++ b/packages/ata/CHANGELOG.md @@ -1,5 +1,11 @@ # @typescript/ata +## 0.9.7 + +### Patch Changes + +- [#3191](https://github.com/microsoft/TypeScript-Website/pull/3191) [`1d0af97`](https://github.com/microsoft/TypeScript-Website/commit/1d0af97318b79943fe0bfa8871ee6e8c584c9af5) Thanks [@Renegade334](https://github.com/Renegade334)! - Always treat `node:` modules as Node, expand list of known Node modules + ## 0.9.6 ### Patch Changes diff --git a/packages/ata/package.json b/packages/ata/package.json index 29092cee..68f964ed 100644 --- a/packages/ata/package.json +++ b/packages/ata/package.json @@ -1,6 +1,6 @@ { "name": "@typescript/ata", - "version": "0.9.6", + "version": "0.9.7", "license": "MIT", "homepage": "https://github.com/microsoft/TypeScript-Website", "repository": { diff --git a/packages/sandbox/CHANGELOG.md b/packages/sandbox/CHANGELOG.md index a6c696bb..4f8f971d 100644 --- a/packages/sandbox/CHANGELOG.md +++ b/packages/sandbox/CHANGELOG.md @@ -1,5 +1,12 @@ # @typescript/sandbox +## 0.1.7 + +### Patch Changes + +- Updated dependencies [[`1d0af97`](https://github.com/microsoft/TypeScript-Website/commit/1d0af97318b79943fe0bfa8871ee6e8c584c9af5)]: + - @typescript/ata@0.9.7 + ## 0.1.6 ### Patch Changes diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json index 370823c3..856ef62b 100644 --- a/packages/sandbox/package.json +++ b/packages/sandbox/package.json @@ -1,6 +1,6 @@ { "name": "@typescript/sandbox", - "version": "0.1.6", + "version": "0.1.7", "license": "MIT", "author": "TypeScript team", "homepage": "https://github.com/microsoft/TypeScript-Website",