create-astro 0.15.0 → 1.0.1-next.0

package/dist/index.js

@@ -1,3 +1,4 @@
+import { assign, parse, stringify } from "comment-json";
 import degit from "degit";
 import { execa, execaCommand } from "execa";
 import fs from "fs";
@@ -6,7 +7,6 @@ import ora from "ora";
 import os from "os";
 import path from "path";
 import prompts from "prompts";
-import url from "url";
 import detectPackageManager from "which-pm-runs";
 import yargs from "yargs-parser";
 import { loadWithRocketGradient, rocketAscii } from "./gradient.js";
@@ -96,6 +96,7 @@ ${bold("Welcome to Astro!")} ${gray(`(create-astro v${version})`)}`);
   }
   let templateSpinner = await loadWithRocketGradient("Copying project files...");
   const hash = args.commit ? `#${args.commit}` : "";
+  const isThirdParty = options.template.includes("/");
   const templateTarget = options.template.includes("/") ? options.template : `withastro/astro/examples/${options.template}#latest`;
   const emitter = degit(`${templateTarget}${hash}`, {
     cache: false,
@@ -259,7 +260,7 @@ ${bold(
         {
           title: "Strictest",
           description: "Enable all typechecking rules",
-          value: "stricter"
+          value: "strictest"
         },
         {
           title: "I prefer not to use TypeScript",
@@ -285,7 +286,7 @@ ${bold(
     console.log(`  Astro supports TypeScript inside of ".astro" component scripts, so`);
     console.log(`  we still need to create some TypeScript-related files in your project.`);
     console.log(`  You can safely ignore these files, but don't delete them!`);
-    console.log(dim("  (ex: tsconfig.json, src/types.d.ts)"));
+    console.log(dim("  (ex: tsconfig.json, src/env.d.ts)"));
     console.log(``);
     tsResponse.typescript = "default";
     await wait(300);
@@ -293,14 +294,31 @@ ${bold(
   if (args.dryRun) {
     ora().info(dim(`--dry-run enabled, skipping.`));
   } else if (tsResponse.typescript) {
-    fs.copyFileSync(
-      path.join(
-        url.fileURLToPath(new URL("..", import.meta.url)),
-        "tsconfigs",
-        `tsconfig.${tsResponse.typescript}.json`
-      ),
-      path.join(cwd, "tsconfig.json")
-    );
+    if (tsResponse.typescript !== "default") {
+      const templateTSConfigPath = path.join(cwd, "tsconfig.json");
+      fs.readFile(templateTSConfigPath, (err, data) => {
+        if (err && err.code === "ENOENT") {
+          fs.writeFileSync(
+            templateTSConfigPath,
+            stringify({ extends: `astro/tsconfigs/${tsResponse.typescript}` }, null, 2)
+          );
+          return;
+        }
+        const templateTSConfig = parse(data.toString());
+        if (templateTSConfig && typeof templateTSConfig === "object") {
+          const result = assign(templateTSConfig, {
+            extends: `astro/tsconfigs/${tsResponse.typescript}`
+          });
+          fs.writeFileSync(templateTSConfigPath, stringify(result, null, 2));
+        } else {
+          console.log(
+            yellow(
+              "There was an error applying the requested TypeScript settings. This could be because the template's tsconfig.json is malformed"
+            )
+          );
+        }
+      });
+    }
     ora().succeed("TypeScript settings applied!");
   }
   ora().succeed("Setup complete.");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-astro",
-  "version": "0.15.0",
+  "version": "1.0.1-next.0",
   "type": "module",
   "author": "withastro",
   "license": "MIT",
@@ -24,6 +24,7 @@
   ],
   "dependencies": {
     "chalk": "^5.0.1",
+    "comment-json": "^4.2.3",
     "degit": "^2.8.4",
     "execa": "^6.1.0",
     "kleur": "^4.1.4",
@@ -39,7 +40,7 @@
     "@types/prompts": "^2.0.14",
     "@types/which-pm-runs": "^1.0.0",
     "@types/yargs-parser": "^21.0.0",
-    "astro-scripts": "0.0.6",
+    "astro-scripts": "0.0.7",
     "chai": "^4.3.6",
     "mocha": "^9.2.2",
     "uvu": "^0.5.3"

package/tsconfigs/tsconfig.strict.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    // Enable top-level await, and other modern ESM features.
-    "target": "ESNext",
-    "module": "ESNext",
-    // Enable node-style module resolution, for things like npm package imports.
-    "moduleResolution": "node",
-    // Enable JSON imports.
-    "resolveJsonModule": true,
-    // Enable stricter transpilation for better output.
-    "isolatedModules": true,
-    // Astro will directly run your TypeScript code, no transpilation needed.
-    "noEmit": true,
-    // Enable strict type checking.
-    "strict": true,
-    // Error when a value import is only used as a type.
-    "importsNotUsedAsValues": "error"
-  }
-}

package/tsconfigs/tsconfig.stricter.json

@@ -1,33 +0,0 @@
-{
-  "compilerOptions": {
-    // Enable top-level await, and other modern ESM features.
-    "target": "ESNext",
-    "module": "ESNext",
-    // Enable node-style module resolution, for things like npm package imports.
-    "moduleResolution": "node",
-    // Enable JSON imports.
-    "resolveJsonModule": true,
-    // Enable stricter transpilation for better output.
-    "isolatedModules": true,
-    // Astro will directly run your TypeScript code, no transpilation needed.
-    "noEmit": true,
-    // Enable strict type checking.
-    "strict": true,
-    // Error when a value import is only used as a type.
-    "importsNotUsedAsValues": "error",
-    // Report errors for fallthrough cases in switch statements
-    "noFallthroughCasesInSwitch": true,
-    // Force functions designed to override their parent class to be specified as `override`.
-    "noImplicitOverride": true,
-    // Force functions to specify that they can return `undefined` if a possibe code path does not return a value.
-    "noImplicitReturns": true,
-    // Report an error when a variable is declared but never used.
-    "noUnusedLocals": true,
-    // Report an error when a parameter is declared but never used.
-    "noUnusedParameters": true,
-    // Force the usage of the indexed syntax to access fields declared using an index signature.
-    "noUncheckedIndexedAccess": true,
-    // Report an error when the value `undefined` is given to an optional property that doesn't specify `undefined` as a valid value.
-    "exactOptionalPropertyTypes": true
-  }
-}