Optimistic Rollup of Fixes

.github/workflows/CI.yml

@@ -9,23 +9,25 @@ jobs:
 
     steps:
       - name: Checkout tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
-      - name: Set-up Deno
-        uses: denoland/setup-deno@v1
+      - name: Set-up Node.js
+        uses: actions/setup-node@v6
         with:
-          deno-version: v1.x
+          node-version: lts/*
+
+      - name: Set-up Deno
+        uses: denoland/setup-deno@v2
 
       # Build all the packages
       - name: Create packages for TSConfig JSONs
         run: deno run --allow-read --allow-write --allow-net scripts/create-npm-packages.ts
 
       - name: Test
-        working-directory: test/
+        working-directory: test
         run: |
-          corepack enable
-          pnpm install
-          pnpm test
+          npm install
+          npm run test
 
       - name: Update the README
         run: deno run --allow-read --allow-write --allow-net scripts/update-markdown-readme.ts

.github/workflows/deploy.yml

@@ -18,18 +18,16 @@ jobs:
 
     steps:
       - name: Checkout tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
 
       - name: Set-up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: lts/*
           registry-url: https://registry.npmjs.org
 
       - name: Set-up Deno
-        uses: denoland/setup-deno@v1
-        with:
-          deno-version: v1.x
+        uses: denoland/setup-deno@v2
 
       # Build all the packages
       - name: Create packages for TSConfig JSONs

README.md

@@ -137,7 +137,7 @@ Add to your `tsconfig.json`:
 
 
 
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).
 
 ### Ember <kbd><a href="./bases/ember.json">tsconfig.json</a></kbd>
 
@@ -156,7 +156,7 @@ Add to your `tsconfig.json`:
 
 
 
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).
 
 ### Next.js <kbd><a href="./bases/next.json">tsconfig.json</a></kbd>
 
@@ -405,7 +405,7 @@ Add to your `tsconfig.json`:
 
 
 
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).
 
 ### QJSEngine <kbd><a href="./bases/qjsengine.json">tsconfig.json</a></kbd>
 
@@ -454,7 +454,7 @@ Add to your `tsconfig.json`:
 
 
 
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).
 
 ### Strictest <kbd><a href="./bases/strictest.json">tsconfig.json</a></kbd>
 

bases/docusaurus.json

@@ -3,7 +3,7 @@
   "display": "Docusaurus v2",
   "docs": "https://v2.docusaurus.io/docs/typescript-support",
   "_version": "2.0.0",
-  
+
   "compilerOptions": {
     "allowJs": true,
     "esModuleInterop": true,
@@ -13,7 +13,6 @@
     "moduleResolution": "bundler",
     "noEmit": true,
     "types": ["node", "@docusaurus/module-type-aliases", "@docusaurus/theme-classic"],
-    "baseUrl": ".",
     "paths": {
       "@site/*": ["./*"]
     },

bases/ember.json

@@ -7,7 +7,8 @@
 
   // This is the base config used by Ember apps and addons. When actually used
   // via Ember CLI (e.g. ember-cli-typescript's blueprint), it additionally has
-  // `compilerOptions.baseUrl`, `compilerOptions.paths`, and `include` set.
+  // `compilerOptions.paths` and `include` set.
+  // Note: `baseUrl` was removed in TypeScript 7.0. Use `paths` instead.
   "compilerOptions": {
     "target": "es2023",
     "module": "esnext",

bases/nuxt.json

@@ -17,7 +17,6 @@
     "sourceMap": true,
     "strict": true,
     "noEmit": true,
-    "baseUrl": ".",
     "paths": {
       "~/*": [
         "./*"

bases/recommended.json

@@ -1,12 +1,22 @@
 {
+  "$schema": "https://www.schemastore.org/tsconfig",
+  "display": "Recommended",
+  "_version": "2.0.0",
   "compilerOptions": {
-    "target": "es2016",
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "forceConsistentCasingInFileNames": true,
+    "module": "nodenext",
+    "target": "esnext",
+    "types": [],
+    "sourceMap": true,
+    "declaration": true,
+    "declarationMap": true,
+    "noUncheckedIndexedAccess": true,
+    "exactOptionalPropertyTypes": true,
     "strict": true,
+    "jsx": "react-jsx",
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "noUncheckedSideEffectImports": true,
+    "moduleDetection": "force",
     "skipLibCheck": true
-  },
-  "display": "Recommended",
-  "$schema": "https://www.schemastore.org/tsconfig"
+  }
 }

bases/remix.json

@@ -14,7 +14,6 @@
     "target": "es2019",
     "strict": true,
     "allowJs": true,
-    "baseUrl": ".",
     "paths": {
       "~/*": ["./app/*"]
     },

deno.json

@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@std/collections": "jsr:@std/collections",
+    "@std/jsonc": "jsr:@std/jsonc",
+    "@std/path": "jsr:@std/path",
+    "@std/semver": "jsr:@std/semver"
+  }
+}

readme-extras/docusaurus.md

@@ -1 +1 @@
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).

readme-extras/ember.md

@@ -1 +1 @@
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).

readme-extras/nuxt.md

@@ -1 +1 @@
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).

readme-extras/remix.md

@@ -1 +1 @@
-> **NOTE**: You may need to add `"baseUrl": "."` to your `tsconfig.json` to support proper file resolution.
+> **NOTE**: TypeScript 7 removes `baseUrl`. If you previously added `"baseUrl": "."` for module resolution, use `paths` instead (for example: `"paths": { "*": ["./*"] }`).

scripts/create-npm-packages.ts

@@ -1,5 +1,5 @@
-import * as path from "https://deno.land/std/path/mod.ts";
-import stripJsonComments from "https://esm.sh/strip-json-comments";
+import { parse as parseJsonc } from "@std/jsonc";
+import * as path from "@std/path";
 
 for await (const tsconfigEntry of Deno.readDir("bases")) {
   if (!tsconfigEntry.isFile) continue
@@ -9,23 +9,23 @@ for await (const tsconfigEntry of Deno.readDir("bases")) {
 
   // Make the folder
   const packagePath = path.join("packages", name)
-  Deno.mkdirSync(packagePath, { recursive: true })
+  await Deno.mkdir(packagePath, { recursive: true })
 
   // Copy over the template files
   const templateDir = "./template"
   for await (const templateFile of Deno.readDir(templateDir)) {
     if (!templateFile.isFile) continue
     if (templateFile.name === "README-combined.md") continue // README-combined.md is only for the combined bases
     const templatedFile = path.join(templateDir, templateFile.name)
-    Deno.copyFileSync(templatedFile, path.join(packagePath, templateFile.name))
+    await Deno.copyFile(templatedFile, path.join(packagePath, templateFile.name))
   }
-  
+
   // Copy the create a tsconfig.json from the base json
   const newPackageTSConfigPath = path.join(packagePath, "tsconfig.json")
-  Deno.copyFileSync(tsconfigFilePath, newPackageTSConfigPath)
-  
+  await Deno.copyFile(tsconfigFilePath, newPackageTSConfigPath)
+
   const tsconfigText = await Deno.readTextFile(newPackageTSConfigPath)
-  const tsconfigJSON = JSON.parse(stripJsonComments(tsconfigText))
+  const tsconfigJSON = parseJsonc(tsconfigText) as { display: string; _version?: string }
 
 // Drop `display` field in tsconfig.json for npm package 
   await Deno.writeTextFile(newPackageTSConfigPath, tsconfigText.replace(/\s*"display.*/,''))
@@ -48,7 +48,7 @@ for await (const tsconfigEntry of Deno.readDir("bases")) {
     let packageText = await Deno.readTextFile(fileToEdit)
     packageText = packageText.replace(/\[filename\]/g, name)
                              .replace(/\[display_title\]/g, title)
-                             .replace(/\[tsconfig\]/g, Deno.readTextFileSync(newPackageTSConfigPath))
+                             .replace(/\[tsconfig\]/g, await Deno.readTextFile(newPackageTSConfigPath))
 
     // Inject readme-extra if any
     try {
@@ -111,15 +111,15 @@ async function buildTsconfigBases() {
 
   // Make the folder
   const packagePath = path.join("packages", name)
-  Deno.mkdirSync(packagePath, { recursive: true })
+  await Deno.mkdir(packagePath, { recursive: true })
 
   // Copy over the template files
   const templateDir = "./template"
   for await (const templateFile of Deno.readDir(templateDir)) {
     if (!templateFile.isFile) continue
     if (templateFile.name === "README.md") continue
     const templatedFile = path.join(templateDir, templateFile.name)
-    Deno.copyFileSync(
+    await Deno.copyFile(
       templatedFile,
       path.join(
         packagePath,
@@ -146,7 +146,7 @@ async function buildTsconfigBases() {
 
     const newPackageTSConfigPath = path.join(packagePath, finalTsconfigFile)
 
-    Deno.copyFileSync(tsconfigFilePath, newPackageTSConfigPath)
+    await Deno.copyFile(tsconfigFilePath, newPackageTSConfigPath)
 
     const tsconfigText = await Deno.readTextFile(newPackageTSConfigPath)
 

scripts/deploy-changed-npm-packages.ts

@@ -1,14 +1,13 @@
-import * as path from "https://deno.land/std@0.164.0/path/mod.ts";
-import * as bufio from "https://deno.land/std@0.164.0/io/buffer.ts";
+import * as path from "@std/path";
 
 // Loop through generated packages, deploying versions for anything which has a different tsconfig
 const uploaded = []
 
-for (const dirEntry of Deno.readDirSync("packages")) {
+for await (const dirEntry of Deno.readDir("packages")) {
   if (dirEntry.name === 'bases') continue // @tsconfig/bases package is special, it doesn't have a single tsconfig entry, it will be deployed separately
 
   const localTsconfigPath = path.join("packages", dirEntry.name, "tsconfig.json");
-  const newTSConfig = Deno.readTextFileSync(localTsconfigPath);
+  const newTSConfig = await Deno.readTextFile(localTsconfigPath);
 
   let upload = false;
   try {
@@ -22,33 +21,31 @@ for (const dirEntry of Deno.readDirSync("packages")) {
   }
 
   if (upload) {
-    const process = Deno.run({
-      cmd: ["npm", "publish", "--provenance", "--access", "public"],
+    const cmd = new Deno.Command("npm", {
+      args: ["publish", "--provenance", "--access", "public"],
       stdout: "piped",
       cwd: path.join("packages", dirEntry.name),
       env: { NODE_AUTH_TOKEN: Deno.env.get("NODE_AUTH_TOKEN")! },
     });
-
-    for await (const line of bufio.readLines(process.stdout!)) {
-      console.warn(line);
-    }
+    const output = await cmd.output();
+    if (!output.success) throw new Error(`Failed to publish ${dirEntry.name}`)
+    console.warn(new TextDecoder().decode(output.stdout));
 
     uploaded.push(dirEntry.name)
   }
 }
 
 if (uploaded.length) {
   // If there's any uploads, we need to update the combined package too
-    const process = Deno.run({
-      cmd: ["npm", "publish", "--provenance", "--access", "public"],
+    const cmd = new Deno.Command("npm", {
+      args: ["publish", "--provenance", "--access", "public"],
       stdout: "piped",
       cwd: path.join("packages", "bases"),
       env: { NODE_AUTH_TOKEN: Deno.env.get("NODE_AUTH_TOKEN")! },
     });
-
-    for await (const line of bufio.readLines(process.stdout!)) {
-      console.warn(line);
-    }
+    const output = await cmd.output();
+    if (!output.success) throw new Error("Failed to publish bases")
+    console.warn(new TextDecoder().decode(output.stdout));
 
 
   console.log("Uploaded: ", uploaded.join(", "))