create-cloudflare 0.0.0-d8d46b2d → 0.0.0-d96bc7dd

package/dist/cli.js

@@ -3814,7 +3814,7 @@ var init_args = __esm({
 var version, devDependencies;
 var init_package = __esm({
   "package.json"() {
-    version = "0.0.0-d8d46b2d";
+    version = "0.0.0-d96bc7dd";
     devDependencies = {
       "@babel/parser": "^7.21.3",
       "@babel/types": "^7.21.4",
@@ -24222,9 +24222,9 @@ var init_package2 = __esm({
         "create-docusaurus": "3.1.1",
         "create-hono": "0.3.2",
         "create-next-app": "14.1.0",
-        "create-qwik": "1.4.3",
+        "create-qwik": "1.4.4",
         "create-react-app": "5.0.1",
-        "create-remix": "2.5.1",
+        "create-remix": "2.6.0",
         "create-solid": "0.4.10",
         "create-svelte": "6.0.8",
         "create-vue": "3.9.2",
@@ -25812,7 +25812,7 @@ var init_poll = __esm({
 var version2;
 var init_package3 = __esm({
   "../wrangler/package.json"() {
-    version2 = "3.26.0";
+    version2 = "3.27.0";
   }
 });
 
@@ -41691,159 +41691,6 @@ var init_c37 = __esm({
   }
 });
 
-// templates/qwik/c3.ts
-var c3_exports8 = {};
-__export(c3_exports8, {
-  default: () => c3_default8
-});
-var npm8, npx4, generate8, configure5, config7, c3_default8;
-var init_c38 = __esm({
-  "templates/qwik/c3.ts"() {
-    init_cli();
-    init_command();
-    init_files();
-    init_packages();
-    init_common2();
-    ({ npm: npm8, npx: npx4 } = detectPackageManager());
-    generate8 = async (ctx) => {
-      await runFrameworkGenerator(ctx, ["basic", ctx.project.name]);
-    };
-    configure5 = async () => {
-      const cmd = [npx4, "qwik", "add", "cloudflare-pages"];
-      endSection(`Running ${quoteShellArgs(cmd)}`);
-      await runCommand(cmd);
-    };
-    config7 = {
-      configVersion: 1,
-      id: "qwik",
-      displayName: "Qwik",
-      platform: "pages",
-      generate: generate8,
-      configure: configure5,
-      transformPackageJson: async () => ({
-        scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} -- ${npm8} run dev`,
-          "pages:deploy": `${npm8} run build && wrangler pages deploy ./dist`
-        }
-      })
-    };
-    c3_default8 = config7;
-  }
-});
-
-// templates/react/c3.ts
-var c3_exports9 = {};
-__export(c3_exports9, {
-  default: () => c3_default9
-});
-var npm9, generate9, config8, c3_default9;
-var init_c39 = __esm({
-  "templates/react/c3.ts"() {
-    init_cli();
-    init_command();
-    init_files();
-    init_packages();
-    ({ npm: npm9 } = detectPackageManager());
-    generate9 = async (ctx) => {
-      await runFrameworkGenerator(ctx, [ctx.project.name]);
-      logRaw("");
-    };
-    config8 = {
-      configVersion: 1,
-      id: "react",
-      displayName: "React",
-      platform: "pages",
-      generate: generate9,
-      transformPackageJson: async () => ({
-        scripts: {
-          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm9} start`,
-          "pages:deploy": `${npm9} run build && wrangler pages deploy ./build`
-        }
-      })
-    };
-    c3_default9 = config8;
-  }
-});
-
-// templates/remix/c3.ts
-var c3_exports10 = {};
-__export(c3_exports10, {
-  default: () => c3_default10
-});
-var npm10, generate10, config9, c3_default10;
-var init_c310 = __esm({
-  "templates/remix/c3.ts"() {
-    init_cli();
-    init_command();
-    init_packages();
-    ({ npm: npm10 } = detectPackageManager());
-    generate10 = async (ctx) => {
-      await runFrameworkGenerator(ctx, [
-        ctx.project.name,
-        "--template",
-        "https://github.com/remix-run/remix/tree/main/templates/cloudflare-pages"
-      ]);
-      logRaw("");
-    };
-    config9 = {
-      configVersion: 1,
-      id: "remix",
-      displayName: "Remix",
-      platform: "pages",
-      generate: generate10,
-      transformPackageJson: async () => ({
-        scripts: {
-          "pages:deploy": `${npm10} run build && wrangler pages deploy ./public`
-        }
-      }),
-      devScript: "dev",
-      testFlags: ["--typescript", "--no-install", "--no-git-init"]
-    };
-    c3_default10 = config9;
-  }
-});
-
-// templates/solid/c3.ts
-var c3_exports11 = {};
-__export(c3_exports11, {
-  default: () => c3_default11
-});
-var npm11, generate11, config10, c3_default11;
-var init_c311 = __esm({
-  "templates/solid/c3.ts"() {
-    init_cli();
-    init_command();
-    init_files();
-    init_packages();
-    ({ npm: npm11 } = detectPackageManager());
-    generate11 = async (ctx) => {
-      await runFrameworkGenerator(ctx, [ctx.project.name]);
-      logRaw("");
-    };
-    config10 = {
-      configVersion: 1,
-      id: "solid",
-      displayName: "Solid",
-      platform: "pages",
-      copyFiles: {
-        js: { path: "./js" },
-        ts: { path: "./ts" }
-      },
-      generate: generate11,
-      transformPackageJson: async () => ({
-        scripts: {
-          "pages:preview": `${npm11} run build && npx wrangler pages dev dist ${await compatDateFlag()} --compatibility-flag nodejs_compat`,
-          "pages:deploy": `${npm11} run build && wrangler pages deploy ./dist`
-        }
-      }),
-      devScript: "dev",
-      previewScript: "pages:preview",
-      compatibilityFlags: ["nodejs_compat"]
-    };
-    c3_default11 = config10;
-  }
-});
-
 // ../../node_modules/.pnpm/tslib@2.5.3/node_modules/tslib/tslib.es6.mjs
 var tslib_es6_exports = {};
 __export(tslib_es6_exports, {
@@ -72907,6 +72754,7 @@ var init_codemod = __esm({
     typescriptParser = __toESM(require_typescript2());
     init_files();
     parseTs = (src) => {
+      src = src.trim();
       try {
         return recast.parse(src, { parser: typescriptParser });
       } catch (error2) {
@@ -72936,6 +72784,200 @@ var init_codemod = __esm({
   }
 });
 
+// templates/qwik/c3.ts
+var c3_exports8 = {};
+__export(c3_exports8, {
+  default: () => c3_default8
+});
+var npm8, npx4, generate8, configure5, addBindingsProxy, config7, c3_default8;
+var init_c38 = __esm({
+  "templates/qwik/c3.ts"() {
+    init_cli();
+    init_colors();
+    init_interactive();
+    init_codemod();
+    init_command();
+    init_files();
+    init_packages();
+    init_common2();
+    ({ npm: npm8, npx: npx4 } = detectPackageManager());
+    generate8 = async (ctx) => {
+      await runFrameworkGenerator(ctx, ["basic", ctx.project.name]);
+    };
+    configure5 = async (ctx) => {
+      const cmd = [npx4, "qwik", "add", "cloudflare-pages"];
+      endSection(`Running ${quoteShellArgs(cmd)}`);
+      await runCommand(cmd);
+      addBindingsProxy(ctx);
+    };
+    addBindingsProxy = (ctx) => {
+      if (!usesTypescript(ctx)) {
+        return;
+      }
+      const s = spinner();
+      s.start("Updating `vite.config.ts`");
+      const envDeclaration = `
+let env = {};
+
+if(process.env.NODE_ENV === 'development') {
+  const { getBindingsProxy } = await import('wrangler');
+  const { bindings } = await getBindingsProxy();
+  env = bindings;
+}
+`;
+      transformFile("vite.config.ts", {
+        visitProgram: function(n2) {
+          const lastImportIndex = n2.node.body.findLastIndex(
+            (t) => t.type === "ImportDeclaration"
+          );
+          n2.get("body").insertAt(lastImportIndex + 1, envDeclaration);
+          return false;
+        }
+      });
+      const platformObject = parseTs(`{ platform: { env } }`);
+      transformFile("vite.config.ts", {
+        visitCallExpression: function(n2) {
+          const callee = n2.node.callee;
+          if (callee.name === "qwikCity") {
+            n2.node.arguments = [platformObject];
+          }
+          this.traverse(n2);
+        }
+      });
+      s.stop(`${brandColor("updated")} \`vite.config.ts\``);
+    };
+    config7 = {
+      configVersion: 1,
+      id: "qwik",
+      displayName: "Qwik",
+      platform: "pages",
+      devScript: "dev",
+      deployScript: "deploy",
+      generate: generate8,
+      configure: configure5,
+      transformPackageJson: async () => ({
+        scripts: {
+          deploy: `${npm8} run build && wrangler pages deploy ./dist`
+        }
+      })
+    };
+    c3_default8 = config7;
+  }
+});
+
+// templates/react/c3.ts
+var c3_exports9 = {};
+__export(c3_exports9, {
+  default: () => c3_default9
+});
+var npm9, generate9, config8, c3_default9;
+var init_c39 = __esm({
+  "templates/react/c3.ts"() {
+    init_cli();
+    init_command();
+    init_files();
+    init_packages();
+    ({ npm: npm9 } = detectPackageManager());
+    generate9 = async (ctx) => {
+      await runFrameworkGenerator(ctx, [ctx.project.name]);
+      logRaw("");
+    };
+    config8 = {
+      configVersion: 1,
+      id: "react",
+      displayName: "React",
+      platform: "pages",
+      generate: generate9,
+      transformPackageJson: async () => ({
+        scripts: {
+          "pages:dev": `wrangler pages dev ${await compatDateFlag()} --port 3000 -- ${npm9} start`,
+          "pages:deploy": `${npm9} run build && wrangler pages deploy ./build`
+        }
+      })
+    };
+    c3_default9 = config8;
+  }
+});
+
+// templates/remix/c3.ts
+var c3_exports10 = {};
+__export(c3_exports10, {
+  default: () => c3_default10
+});
+var npm10, generate10, config9, c3_default10;
+var init_c310 = __esm({
+  "templates/remix/c3.ts"() {
+    init_cli();
+    init_command();
+    init_packages();
+    ({ npm: npm10 } = detectPackageManager());
+    generate10 = async (ctx) => {
+      await runFrameworkGenerator(ctx, [
+        ctx.project.name,
+        "--template",
+        "https://github.com/remix-run/remix/tree/main/templates/cloudflare-pages"
+      ]);
+      logRaw("");
+    };
+    config9 = {
+      configVersion: 1,
+      id: "remix",
+      displayName: "Remix",
+      platform: "pages",
+      generate: generate10,
+      transformPackageJson: async () => ({
+        scripts: {
+          "pages:deploy": `${npm10} run build && wrangler pages deploy ./public`
+        }
+      }),
+      devScript: "dev",
+      testFlags: ["--typescript", "--no-install", "--no-git-init"]
+    };
+    c3_default10 = config9;
+  }
+});
+
+// templates/solid/c3.ts
+var c3_exports11 = {};
+__export(c3_exports11, {
+  default: () => c3_default11
+});
+var npm11, generate11, config10, c3_default11;
+var init_c311 = __esm({
+  "templates/solid/c3.ts"() {
+    init_cli();
+    init_command();
+    init_files();
+    init_packages();
+    ({ npm: npm11 } = detectPackageManager());
+    generate11 = async (ctx) => {
+      await runFrameworkGenerator(ctx, [ctx.project.name]);
+      logRaw("");
+    };
+    config10 = {
+      configVersion: 1,
+      id: "solid",
+      displayName: "Solid",
+      platform: "pages",
+      copyFiles: {
+        js: { path: "./js" },
+        ts: { path: "./ts" }
+      },
+      generate: generate11,
+      transformPackageJson: async () => ({
+        scripts: {
+          "pages:preview": `${npm11} run build && npx wrangler pages dev dist ${await compatDateFlag()} --compatibility-flag nodejs_compat`,
+          "pages:deploy": `${npm11} run build && wrangler pages deploy ./dist`
+        }
+      }),
+      devScript: "dev",
+      previewScript: "pages:preview",
+      compatibilityFlags: ["nodejs_compat"]
+    };
+    c3_default11 = config10;
+  }
+});
+
 // templates/svelte/templates.ts
 var platformInterface;
 var init_templates2 = __esm({
@@ -78589,19 +78631,29 @@ var downloadRemoteTemplate = async (src) => {
     return crash(`Failed to clone remote template: ${src}`);
   }
 };
-var updatePackageJson = async (ctx) => {
-  const s = spinner();
-  s.start("Updating `package.json`");
+var updatePackageName = async (ctx) => {
   const placeholderNames = ["<TBD>", "TBD", ""];
   const pkgJsonPath = (0, import_path11.resolve)(ctx.project.path, "package.json");
-  let pkgJson = readJSON(pkgJsonPath);
-  if (placeholderNames.includes(pkgJson.name)) {
-    pkgJson.name = ctx.project.name;
+  const pkgJson = readJSON(pkgJsonPath);
+  if (!placeholderNames.includes(pkgJson.name)) {
+    return;
   }
-  if (ctx.template.transformPackageJson) {
-    const transformed = await ctx.template.transformPackageJson(pkgJson);
-    pkgJson = (0, import_deepmerge.default)(pkgJson, transformed);
+  const s = spinner();
+  s.start("Updating name in `package.json`");
+  pkgJson.name = ctx.project.name;
+  writeJSON(pkgJsonPath, pkgJson);
+  s.stop(`${brandColor("updated")} ${dim("`package.json`")}`);
+};
+var updatePackageScripts = async (ctx) => {
+  if (!ctx.template.transformPackageJson) {
+    return;
   }
+  const s = spinner();
+  s.start("Updating `package.json` scripts");
+  const pkgJsonPath = (0, import_path11.resolve)(ctx.project.path, "package.json");
+  let pkgJson = readJSON(pkgJsonPath);
+  const transformed = await ctx.template.transformPackageJson(pkgJson);
+  pkgJson = (0, import_deepmerge.default)(pkgJson, transformed);
   writeJSON(pkgJsonPath, pkgJson);
   s.stop(`${brandColor("updated")} ${dim("`package.json`")}`);
 };
@@ -78672,7 +78724,7 @@ var create = async (ctx) => {
     await template.generate(ctx);
   }
   await copyTemplateFiles(ctx);
-  await updatePackageJson(ctx);
+  await updatePackageName(ctx);
   (0, import_process3.chdir)(ctx.project.path);
   await npmInstall(ctx);
   await rectifyPmMismatch(ctx);
@@ -78687,6 +78739,7 @@ var configure7 = async (ctx) => {
   if (template.configure) {
     await template.configure({ ...ctx });
   }
+  await updatePackageScripts(ctx);
   await offerGit(ctx);
   await gitCommit(ctx);
   endSection(`Application configured`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-d8d46b2d",
+  "version": "0.0.0-d96bc7dd",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -65,9 +65,9 @@
     "which-pm-runs": "^1.1.0",
     "yargs": "^17.7.1",
     "yarn": "^1.22.19",
-    "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.26.0",
-    "@cloudflare/cli": "1.1.1"
+    "@cloudflare/cli": "1.1.1",
+    "wrangler": "3.27.0",
+    "@cloudflare/workers-tsconfig": "0.0.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/qwik/c3.ts

@@ -1,9 +1,13 @@
 import { endSection } from "@cloudflare/cli";
+import { brandColor } from "@cloudflare/cli/colors";
+import { spinner } from "@cloudflare/cli/interactive";
+import { parseTs, transformFile } from "helpers/codemod";
 import { runCommand, runFrameworkGenerator } from "helpers/command";
-import { compatDateFlag } from "helpers/files";
+import { usesTypescript } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import { quoteShellArgs } from "../../src/common";
 import type { TemplateConfig } from "../../src/templates";
+import type * as recast from "recast";
 import type { C3Context } from "types";
 
 const { npm, npx } = detectPackageManager();
@@ -12,11 +16,62 @@ const generate = async (ctx: C3Context) => {
 	await runFrameworkGenerator(ctx, ["basic", ctx.project.name]);
 };
 
-const configure = async () => {
+const configure = async (ctx: C3Context) => {
 	// Add the pages integration
 	const cmd = [npx, "qwik", "add", "cloudflare-pages"];
 	endSection(`Running ${quoteShellArgs(cmd)}`);
 	await runCommand(cmd);
+
+	addBindingsProxy(ctx);
+};
+
+const addBindingsProxy = (ctx: C3Context) => {
+	// Qwik only has a typescript template atm.
+	// This check is an extra precaution
+	if (!usesTypescript(ctx)) {
+		return;
+	}
+
+	const s = spinner();
+	s.start("Updating `vite.config.ts`");
+
+	// Insert the env declaration after the last import (but before the rest of the body)
+	const envDeclaration = `
+let env = {};
+
+if(process.env.NODE_ENV === 'development') {
+  const { getBindingsProxy } = await import('wrangler');
+  const { bindings } = await getBindingsProxy();
+  env = bindings;
+}
+`;
+
+	transformFile("vite.config.ts", {
+		visitProgram: function (n) {
+			const lastImportIndex = n.node.body.findLastIndex(
+				(t) => t.type === "ImportDeclaration"
+			);
+			n.get("body").insertAt(lastImportIndex + 1, envDeclaration);
+
+			return false;
+		},
+	});
+
+	// Populate the `qwikCity` plugin with the platform object containing the `env` defined above.
+	const platformObject = parseTs(`{ platform: { env } }`);
+
+	transformFile("vite.config.ts", {
+		visitCallExpression: function (n) {
+			const callee = n.node.callee as recast.types.namedTypes.Identifier;
+			if (callee.name === "qwikCity") {
+				n.node.arguments = [platformObject];
+			}
+
+			this.traverse(n);
+		},
+	});
+
+	s.stop(`${brandColor("updated")} \`vite.config.ts\``);
 };
 
 const config: TemplateConfig = {
@@ -24,12 +79,13 @@ const config: TemplateConfig = {
 	id: "qwik",
 	displayName: "Qwik",
 	platform: "pages",
+	devScript: "dev",
+	deployScript: "deploy",
 	generate,
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} -- ${npm} run dev`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist`,
+			deploy: `${npm} run build && wrangler pages deploy ./dist`,
 		},
 	}),
 };