create-cloudflare 0.0.0-6d7d00a8 → 0.0.0-6dda3626

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-cloudflare",
-  "version": "0.0.0-6d7d00a8",
+  "version": "0.0.0-6dda3626",
   "description": "A CLI for creating and deploying new applications to Cloudflare.",
   "keywords": [
     "cloudflare",
@@ -40,7 +40,6 @@
     "@types/esprima": "^4.0.3",
     "@types/node": "^18.15.3",
     "@types/semver": "^7.5.1",
-    "@types/shell-quote": "^1.7.2",
     "@types/which-pm-runs": "^1.0.0",
     "@types/yargs": "^17.0.22",
     "@typescript-eslint/eslint-plugin": "^5.55.0",
@@ -60,7 +59,6 @@
     "pnpm": "^8.10.0",
     "recast": "^0.22.0",
     "semver": "^7.5.1",
-    "shell-quote": "^1.8.1",
     "typescript": "^5.0.2",
     "undici": "5.28.2",
     "vite-tsconfig-paths": "^4.0.8",
@@ -69,7 +67,7 @@
     "yarn": "^1.22.19",
     "@cloudflare/cli": "1.1.1",
     "@cloudflare/workers-tsconfig": "0.0.0",
-    "wrangler": "3.24.0"
+    "wrangler": "3.26.0"
   },
   "engines": {
     "node": ">=18.14.1"

package/templates/angular/c3.ts

@@ -1,4 +1,3 @@
-import { cp } from "node:fs/promises";
 import { resolve } from "node:path";
 import { logRaw } from "@cloudflare/cli";
 import { brandColor, dim } from "@cloudflare/cli/colors";
@@ -19,10 +18,10 @@ const generate = async (ctx: C3Context) => {
 const configure = async (ctx: C3Context) => {
 	updateAngularJson(ctx);
 	await updateAppCode();
-	await installCFWorker(ctx);
+	await installCFWorker();
 };
 
-async function installCFWorker(ctx: C3Context) {
+async function installCFWorker() {
 	await installPackages(
 		["@cloudflare/workers-types", "@miniflare/tre@next", "wrangler@beta"],
 		{
@@ -93,8 +92,8 @@ const config: TemplateConfig = {
 			deploy: `${npm} run pages:build && wrangler pages deploy dist/cloudflare`,
 		},
 	}),
-	deployCommand: ["deploy"],
-	devCommand: ["start"],
+	deployScript: "deploy",
+	devScript: "start",
 	testFlags: ["--style", "sass"],
 };
 export default config;

package/templates/astro/c3.ts

@@ -14,7 +14,7 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
-const configure = async (ctx: C3Context) => {
+const configure = async () => {
 	await runCommand([npx, "astro", "add", "cloudflare", "-y"], {
 		silent: true,
 		startText: "Installing adapter",

package/templates/common/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "common",
 	displayName: "Example router & proxy Worker",
 	platform: "workers",
-	languages: ["js", "ts"],
 	copyFiles: {
 		js: {
 			path: "./js",

package/templates/hello-world/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "hello-world",
 	displayName: '"Hello World" Worker',
 	platform: "workers",
-	languages: ["js", "ts"],
 	copyFiles: {
 		js: {
 			path: "./js",

package/templates/hello-world-durable-object/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "hello-world-durable-object",
 	displayName: '"Hello World" Durable Object',
 	platform: "workers",
-	languages: ["js", "ts"],
 	copyFiles: {
 		js: {
 			path: "./js",

package/templates/hono/c3.ts

@@ -19,7 +19,7 @@ const config: TemplateConfig = {
 	displayName: "Hono",
 	platform: "workers",
 	generate,
-	devCommand: ["dev"],
-	deployCommand: ["deploy"],
+	devScript: "dev",
+	deployScript: "deploy",
 };
 export default config;

package/templates/next/c3.ts

@@ -112,7 +112,7 @@ const configure = async (ctx: C3Context) => {
 		await writeEslintrc(ctx);
 	}
 
-	writeFile(`${projectPath}/next.config.js`, nextConfig);
+	writeFile(`${projectPath}/next.config.mjs`, nextConfig);
 	updateStatus("Updated the next.config.js file");
 
 	writeFile(`${projectPath}/README.md`, readme);
@@ -177,6 +177,8 @@ export default {
 	id: "next",
 	platform: "pages",
 	displayName: "Next",
+	devScript: "dev",
+	previewScript: "pages:preview",
 	generate,
 	configure,
 	transformPackageJson: async () => {

package/templates/next/templates.ts

@@ -180,30 +180,30 @@ const styles = {
 } as const;
 `;
 
-export const nextConfig = `/** @type {import('next').NextConfig} */
-const nextConfig = {}
+export const nextConfig = `import { setupDevBindings } from '@cloudflare/next-on-pages/next-dev';
 
-module.exports = nextConfig
+/** @type {import('next').NextConfig} */
+const nextConfig = {};
 
 // Here we use the @cloudflare/next-on-pages next-dev module to allow us to use bindings during local development
 // (when running the application with \`next dev\`), for more information see:
-// https://github.com/dario-piotrowicz/next-on-pages/blob/8e93067/internal-packages/next-dev/README.md
+// https://github.com/cloudflare/next-on-pages/blob/8e93067/internal-packages/next-dev/README.md
 if (process.env.NODE_ENV === 'development') {
-  import('@cloudflare/next-on-pages/next-dev').then(({ setupDevBindings }) => {
-      setupDevBindings({
-          bindings: {
-              // Add here the Cloudflare Bindings you want to have available during local development,
-              // for more details on Bindings see: https://developers.cloudflare.com/pages/functions/bindings/)
-              //
-              // KV Example:
-              // MY_KV: {
-              //   type: 'kv',
-              //   id: 'xxx',
-              // }
-          }
-      })
-  })
+  await setupDevBindings({
+    bindings: {
+        // Add here the Cloudflare Bindings you want to have available during local development,
+        // for more details on Bindings see: https://developers.cloudflare.com/pages/functions/bindings/)
+        //
+        // KV Example:
+        // MY_KV: {
+        //   type: 'kv',
+        //   id: 'xxx',
+        // }
+    }
+  });
 }
+
+export default nextConfig;
 `;
 
 export const envDts = `declare global {

package/templates/nuxt/c3.ts

@@ -27,7 +27,7 @@ const generate = async (ctx: C3Context) => {
 	logRaw(""); // newline
 };
 
-const configure = async (ctx: C3Context) => {
+const configure = async () => {
 	const configFileName = "nuxt.config.ts";
 	const configFilePath = resolve(configFileName);
 	const s = spinner();

package/templates/openapi/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "openapi",
 	displayName: "API starter (OpenAPI compliant)",
 	platform: "workers",
-	languages: ["ts"],
 	copyFiles: {
 		path: "./ts",
 	},

package/templates/pre-existing/c3.ts

@@ -1,7 +1,6 @@
-import { cp, mkdtemp, readdir, rm } from "fs/promises";
+import { cp, mkdtemp } from "fs/promises";
 import { tmpdir } from "os";
 import { join } from "path";
-import { crash } from "@cloudflare/cli";
 import { processArgument } from "@cloudflare/cli/args";
 import { brandColor, dim } from "@cloudflare/cli/colors";
 import { runCommand } from "helpers/command";
@@ -10,7 +9,7 @@ import { chooseAccount } from "../../src/common";
 import type { C3Context } from "types";
 
 export async function copyExistingWorkerFiles(ctx: C3Context) {
-	const { dlx, npm } = detectPackageManager();
+	const { dlx } = detectPackageManager();
 
 	await chooseAccount(ctx);
 
@@ -72,7 +71,6 @@ export default {
 	displayName: "Pre-existing Worker (from Dashboard)",
 	platform: "workers",
 	hidden: true,
-	languages: ["js"],
 	copyFiles: {
 		path: "./js",
 	},

package/templates/queues/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "queues",
 	displayName: "Queue consumer & producer Worker",
 	platform: "workers",
-	languages: ["js", "ts"],
 	copyFiles: {
 		js: {
 			path: "./js",

package/templates/qwik/c3.ts

@@ -12,7 +12,7 @@ const generate = async (ctx: C3Context) => {
 	await runFrameworkGenerator(ctx, ["basic", ctx.project.name]);
 };
 
-const configure = async (ctx: C3Context) => {
+const configure = async () => {
 	// Add the pages integration
 	const cmd = [npx, "qwik", "add", "cloudflare-pages"];
 	endSection(`Running ${quoteShellArgs(cmd)}`);

package/templates/remix/c3.ts

@@ -27,7 +27,7 @@ const config: TemplateConfig = {
 			"pages:deploy": `${npm} run build && wrangler pages deploy ./public`,
 		},
 	}),
-	devCommand: ["dev"],
+	devScript: "dev",
 	testFlags: ["--typescript", "--no-install", "--no-git-init"],
 };
 export default config;

package/templates/scheduled/c3.ts

@@ -3,7 +3,6 @@ export default {
 	id: "scheduled",
 	displayName: "Scheduled Worker (Cron Trigger)",
 	platform: "workers",
-	languages: ["js", "ts"],
 	copyFiles: {
 		js: {
 			path: "./js",

package/templates/solid/c3.ts

@@ -1,6 +1,5 @@
-import { logRaw, updateStatus } from "@cloudflare/cli";
-import { blue, brandColor, dim } from "@cloudflare/cli/colors";
-import { installPackages, runFrameworkGenerator } from "helpers/command";
+import { logRaw } from "@cloudflare/cli";
+import { runFrameworkGenerator } from "helpers/command";
 import { compatDateFlag } from "helpers/files";
 import { detectPackageManager } from "helpers/packages";
 import type { TemplateConfig } from "../../src/templates";
@@ -15,18 +14,6 @@ const generate = async (ctx: C3Context) => {
 	logRaw("");
 };
 
-const configure = async (ctx: C3Context) => {
-	// Install the pages adapter
-	const pkg = "solid-start-cloudflare-pages";
-	await installPackages([pkg], {
-		dev: true,
-		startText: "Adding the Cloudflare Pages adapter",
-		doneText: `${brandColor(`installed`)} ${dim(pkg)}`,
-	});
-
-	updateStatus(`Adding the Cloudflare Pages adapter to vite config`);
-};
-
 const config: TemplateConfig = {
 	configVersion: 1,
 	id: "solid",
@@ -37,12 +24,14 @@ const config: TemplateConfig = {
 		ts: { path: "./ts" },
 	},
 	generate,
-	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 3000 -- ${npm} run dev`,
-			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist/public`,
+			"pages:preview": `${npm} run build && npx wrangler pages dev dist ${await compatDateFlag()} --compatibility-flag nodejs_compat`,
+			"pages:deploy": `${npm} run build && wrangler pages deploy ./dist`,
 		},
 	}),
+	devScript: "dev",
+	previewScript: "pages:preview",
+	compatibilityFlags: ["nodejs_compat"],
 };
 export default config;

package/templates/solid/js/vite.config.js

@@ -1,7 +1,12 @@
-import cloudflare from "solid-start-cloudflare-pages";
-import solid from "solid-start/vite";
-import { defineConfig } from "vite";
+import { defineConfig } from "@solidjs/start/config";
 
 export default defineConfig({
-	plugins: [solid({ adapter: cloudflare({}) })],
+    start: {
+        server: {
+            preset: "cloudflare-pages",
+            rollupConfig: {
+                external: ["node:async_hooks"]
+            },
+        }
+    }
 });

package/templates/solid/ts/vite.config.ts

@@ -1,7 +1,12 @@
-import cloudflare from "solid-start-cloudflare-pages";
-import solid from "solid-start/vite";
-import { defineConfig } from "vite";
+import { defineConfig } from "@solidjs/start/config";
 
 export default defineConfig({
-	plugins: [solid({ adapter: cloudflare({}) })],
+    start: {
+        server: {
+            preset: "cloudflare-pages",
+            rollupConfig: {
+                external: ["node:async_hooks"]
+            },
+        }
+    }
 });

package/templates/svelte/c3.ts

@@ -67,9 +67,11 @@ const config: TemplateConfig = {
 	configure,
 	transformPackageJson: async () => ({
 		scripts: {
-			"pages:dev": `wrangler pages dev ${await compatDateFlag()} --proxy 5173 -- ${npm} run dev`,
+			"pages:preview": `${npm} run build && wrangler pages dev ${await compatDateFlag()} .svelte-kit/cloudflare`,
 			"pages:deploy": `${npm} run build && wrangler pages deploy .svelte-kit/cloudflare`,
 		},
 	}),
+	devScript: "dev",
+	previewScript: "pages:preview",
 };
 export default config;

package/templates/chatgptPlugin/c3.ts

@@ -1,10 +0,0 @@
-export default {
-	configVersion: 1,
-	id: "chatgptPlugin",
-	displayName: "ChatGPT plugin",
-	platform: "workers",
-	languages: ["ts"],
-	copyFiles: {
-		path: "./ts",
-	},
-};

package/templates/chatgptPlugin/ts/README.md

@@ -1,25 +0,0 @@
-# Example ChatGPT Plugin for Cloudflare Workers
-
-This is an example plugin showing how to build [ChatGPT plugins](https://platform.openai.com/docs/plugins/introduction) using [Cloudflare Workers](https://workers.dev). Using this example, you can deploy a plugin to Cloudflare Workers in just a few minutes.
-
-The sample plugin allows ChatGPT users to search for repositories using GitHub's search API. The plugin is implemented in TypeScript and uses the [OpenAPI](https://www.openapis.org/) specification to define the plugin's API.
-
-![Example conversation in ChatGPT showing the plugin in use](./.assets/example.png)
-
-## Get started
-
-0. Sign up for [Cloudflare Workers](https://workers.dev). The free tier is more than enough for most use cases.
-1. Install [wrangler](https://developers.cloudflare.com/workers/cli-wrangler/install-update), the Cloudflare Workers CLI
-2. Clone this project and install dependencies with `npm install`
-3. Run `wrangler login` to login to your Cloudflare account in wrangler
-4. Run `wrangler deploy` to publish the plugin to Cloudflare Workers
-
-## Usage
-
-1. You can configure the `.well-known/ai-plugin.json` route in `index.ts`.
-2. You can set up any new routes and the associated OpenAPI schema by defining new routes. See `search.ts` for an example.
-3. For more information read the [itty-router-openapi official documentation](https://cloudflare.github.io/itty-router-openapi/).
-
-## Deploying to OpenAI's API
-
-Follow the instructions [in the ChatGPT documentation](https://platform.openai.com/docs/plugins/introduction/plugin-flow) to deploy your plugin and begin using it in ChatGPT.

package/templates/chatgptPlugin/ts/__dot__gitignore

@@ -1,171 +0,0 @@
-# Logs
-
-logs
-_.log
-npm-debug.log_
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-
-report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
-
-# Runtime data
-
-pids
-_.pid
-_.seed
-\*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-
-lib-cov
-
-# Coverage directory used by tools like istanbul
-
-coverage
-\*.lcov
-
-# nyc test coverage
-
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-
-bower_components
-
-# node-waf configuration
-
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-
-build/Release
-
-# Dependency directories
-
-node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-
-web_modules/
-
-# TypeScript cache
-
-\*.tsbuildinfo
-
-# Optional npm cache directory
-
-.npm
-
-# Optional eslint cache
-
-.eslintcache
-
-# Optional stylelint cache
-
-.stylelintcache
-
-# Microbundle cache
-
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-
-.node_repl_history
-
-# Output of 'npm pack'
-
-\*.tgz
-
-# Yarn Integrity file
-
-.yarn-integrity
-
-# dotenv environment variable files
-
-.env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-
-.cache
-.parcel-cache
-
-# Next.js build output
-
-.next
-out
-
-# Nuxt.js build / generate output
-
-.nuxt
-dist
-
-# Gatsby files
-
-.cache/
-
-# Comment in the public line in if your project uses Gatsby and not Next.js
-
-# https://nextjs.org/blog/next-9-1#public-directory-support
-
-# public
-
-# vuepress build output
-
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-
-.temp
-.cache
-
-# Docusaurus cache and generated files
-
-.docusaurus
-
-# Serverless directories
-
-.serverless/
-
-# FuseBox cache
-
-.fusebox/
-
-# DynamoDB Local files
-
-.dynamodb/
-
-# TernJS port file
-
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-
-.vscode-test
-
-# yarn v2
-
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.\*
-
-# wrangler project
-
-.dev.vars

package/templates/chatgptPlugin/ts/package.json

@@ -1,16 +0,0 @@
-{
-	"name": "cloudflare-workers-chatgpt-plugin-example",
-	"version": "0.0.1",
-	"private": true,
-	"scripts": {
-		"deploy": "wrangler deploy",
-		"dev": "wrangler dev",
-		"start": "wrangler dev"
-	},
-	"dependencies": {
-		"@cloudflare/itty-router-openapi": "^1.0.1"
-	},
-	"devDependencies": {
-		"wrangler": "^3.0.0"
-	}
-}

package/templates/chatgptPlugin/ts/src/index.ts

@@ -1,33 +0,0 @@
-import { OpenAPIRouter } from "@cloudflare/itty-router-openapi";
-import { GetSearch } from "./search";
-
-export const router = OpenAPIRouter({
-	schema: {
-		info: {
-			title: "GitHub Repositories Search API",
-			description:
-				"A plugin that allows the user to search for GitHub repositories using ChatGPT",
-			version: "v0.0.1",
-		},
-	},
-	docs_url: "/",
-	aiPlugin: {
-		name_for_human: "GitHub Repositories Search",
-		name_for_model: "github_repositories_search",
-		description_for_human: "GitHub Repositories Search plugin for ChatGPT.",
-		description_for_model:
-			"GitHub Repositories Search plugin for ChatGPT. You can search for GitHub repositories using this plugin.",
-		contact_email: "support@example.com",
-		legal_info_url: "http://www.example.com/legal",
-		logo_url: "https://workers.cloudflare.com/resources/logo/logo.svg",
-	},
-});
-
-router.get("/search", GetSearch);
-
-// 404 for everything else
-router.all("*", () => new Response("Not Found.", { status: 404 }));
-
-export default {
-	fetch: router.handle,
-};