create-cloudflare 0.0.0-e5cdd7fa → 0.0.0-e5ebdb143
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cli.js +61432 -60289
- package/dist/tsconfig.tsbuildinfo +1 -0
- package/package.json +34 -25
- package/templates/analog/c3.ts +135 -0
- package/templates/analog/snippets/devBindingsModule.ts +7 -0
- package/templates/analog/templates/env.d.ts +13 -0
- package/templates/analog/templates/src/dev-bindings.ts +18 -0
- package/templates/analog/templates/worker-configuration.d.ts +4 -0
- package/templates/analog/templates/wrangler.json +5 -0
- package/templates/angular/c3.ts +37 -22
- package/templates/angular/templates/src/server.ts +15 -0
- package/templates/angular/templates/tools/copy-files.mjs +8 -2
- package/templates/astro/c3.ts +66 -19
- package/templates/astro/templates/js/wrangler.json +8 -0
- package/templates/astro/templates/ts/src/env.d.ts +5 -0
- package/templates/astro/templates/ts/worker-configuration.d.ts +4 -0
- package/templates/astro/templates/ts/wrangler.json +8 -0
- package/templates/common/c3.ts +10 -5
- package/templates/common/js/.editorconfig +0 -1
- package/templates/common/js/package.json +1 -1
- package/templates/common/js/wrangler.json +8 -0
- package/templates/common/ts/.editorconfig +0 -1
- package/templates/common/ts/package.json +4 -3
- package/templates/common/ts/src/ab-test.ts +2 -2
- package/templates/common/ts/src/index.ts +5 -2
- package/templates/common/ts/src/proxy.ts +2 -2
- package/templates/common/ts/src/redirect.ts +2 -2
- package/templates/common/ts/tsconfig.json +37 -95
- package/templates/common/ts/worker-configuration.d.ts +2 -14
- package/templates/common/ts/wrangler.json +8 -0
- package/templates/docusaurus/c3.ts +7 -6
- package/templates/gatsby/c3.ts +8 -5
- package/templates/hello-world/c3.ts +12 -6
- package/templates/hello-world/js/.editorconfig +0 -1
- package/templates/hello-world/js/package.json +5 -2
- package/templates/hello-world/js/test/index.spec.js +20 -0
- package/templates/hello-world/js/vitest.config.js +11 -0
- package/templates/hello-world/js/wrangler.json +8 -0
- package/templates/hello-world/py/__dot__gitignore +68 -0
- package/templates/hello-world/py/package.json +13 -0
- package/templates/hello-world/py/src/entry.py +4 -0
- package/templates/hello-world/py/wrangler.json +9 -0
- package/templates/hello-world/ts/.editorconfig +0 -1
- package/templates/hello-world/ts/package.json +7 -3
- package/templates/hello-world/ts/src/index.ts +5 -19
- package/templates/hello-world/ts/test/index.spec.ts +25 -0
- package/templates/hello-world/ts/test/tsconfig.json +8 -0
- package/templates/hello-world/ts/tsconfig.json +39 -96
- package/templates/hello-world/ts/vitest.config.mts +11 -0
- package/templates/hello-world/ts/worker-configuration.d.ts +4 -0
- package/templates/hello-world/ts/wrangler.json +8 -0
- package/templates/hello-world-durable-object/c3.ts +10 -6
- package/templates/hello-world-durable-object/js/.editorconfig +0 -1
- package/templates/hello-world-durable-object/js/package.json +1 -1
- package/templates/hello-world-durable-object/js/src/index.js +21 -17
- package/templates/hello-world-durable-object/js/wrangler.json +24 -0
- package/templates/hello-world-durable-object/ts/.editorconfig +0 -1
- package/templates/hello-world-durable-object/ts/package.json +4 -4
- package/templates/hello-world-durable-object/ts/src/index.ts +26 -39
- package/templates/hello-world-durable-object/ts/tsconfig.json +36 -95
- package/templates/hello-world-durable-object/ts/worker-configuration.d.ts +5 -0
- package/templates/hello-world-durable-object/ts/wrangler.json +24 -0
- package/templates/hono/c3.ts +45 -1
- package/templates/hono/snippets/appDeclaration.ts +1 -0
- package/templates/hono/templates/worker-configuration.d.ts +4 -0
- package/templates/hono/templates/wrangler.json +8 -0
- package/templates/next/README.md +67 -0
- package/templates/next/app/js/app/api/hello/route.js +21 -0
- package/templates/next/app/js/app/not-found.js +58 -0
- package/templates/next/app/ts/app/api/hello/route.ts +21 -0
- package/templates/next/app/ts/app/not-found.tsx +58 -0
- package/templates/next/c3.ts +92 -85
- package/templates/next/env.d.ts +5 -0
- package/templates/next/pages/js/pages/api/hello.js +23 -0
- package/templates/next/pages/ts/pages/api/hello.ts +24 -0
- package/templates/next/wrangler.json +8 -0
- package/templates/nuxt/c3.ts +95 -20
- package/templates/nuxt/templates/env.d.ts +14 -0
- package/templates/nuxt/templates/worker-configuration.d.ts +4 -0
- package/templates/nuxt/templates/wrangler.json +8 -0
- package/templates/openapi/c3.ts +1 -0
- package/templates/openapi/ts/README.md +3 -3
- package/templates/openapi/ts/package.json +7 -4
- package/templates/openapi/ts/src/endpoints/taskCreate.ts +26 -16
- package/templates/openapi/ts/src/endpoints/taskDelete.ts +20 -19
- package/templates/openapi/ts/src/endpoints/taskFetch.ts +30 -23
- package/templates/openapi/ts/src/endpoints/taskList.ts +27 -24
- package/templates/openapi/ts/src/index.ts +14 -20
- package/templates/openapi/ts/src/types.ts +9 -8
- package/templates/openapi/ts/worker-configuration.d.ts +4 -0
- package/templates/openapi/ts/wrangler.json +8 -0
- package/templates/pre-existing/c3.ts +37 -18
- package/templates/pre-existing/js/.editorconfig +0 -1
- package/templates/pre-existing/js/package.json +1 -1
- package/templates/pre-existing/js/wrangler.json +5 -0
- package/templates/queues/c3.ts +9 -5
- package/templates/queues/js/.editorconfig +0 -1
- package/templates/queues/js/package.json +1 -1
- package/templates/queues/js/wrangler.json +21 -0
- package/templates/queues/ts/.editorconfig +0 -1
- package/templates/queues/ts/package.json +4 -3
- package/templates/queues/ts/src/index.ts +6 -8
- package/templates/queues/ts/tsconfig.json +36 -95
- package/templates/queues/ts/worker-configuration.d.ts +5 -0
- package/templates/queues/ts/wrangler.json +21 -0
- package/templates/qwik/c3.ts +85 -30
- package/templates/qwik/snippets/getPlatformProxy.ts +6 -0
- package/templates/qwik/templates/worker-configuration.d.ts +4 -0
- package/templates/qwik/templates/wrangler.json +8 -0
- package/templates/react/c3.ts +38 -6
- package/templates/remix/c3.ts +40 -6
- package/templates/remix/templates/worker-configuration.d.ts +4 -0
- package/templates/remix/templates/wrangler.json +5 -0
- package/templates/scheduled/c3.ts +9 -5
- package/templates/scheduled/js/.editorconfig +0 -1
- package/templates/scheduled/js/package.json +3 -3
- package/templates/scheduled/js/src/index.js +9 -2
- package/templates/scheduled/js/wrangler.json +13 -0
- package/templates/scheduled/ts/.editorconfig +0 -1
- package/templates/scheduled/ts/package.json +5 -4
- package/templates/scheduled/ts/src/index.ts +8 -25
- package/templates/scheduled/ts/tsconfig.json +36 -95
- package/templates/scheduled/ts/worker-configuration.d.ts +4 -0
- package/templates/scheduled/ts/wrangler.json +13 -0
- package/templates/solid/c3.ts +62 -12
- package/templates/solid/templates/wrangler.json +8 -0
- package/templates/svelte/c3.ts +111 -30
- package/templates/svelte/templates/wrangler.json +5 -0
- package/templates/vue/c3.ts +8 -6
- package/templates-experimental/angular/c3.ts +112 -0
- package/templates-experimental/angular/templates/src/server.ts +15 -0
- package/templates-experimental/angular/templates/wrangler.json +12 -0
- package/templates-experimental/astro/c3.ts +98 -0
- package/templates-experimental/astro/templates/js/public/.assetsignore +4 -0
- package/templates-experimental/astro/templates/js/wrangler.json +15 -0
- package/templates-experimental/astro/templates/ts/public/.assetsignore +4 -0
- package/templates-experimental/astro/templates/ts/src/env.d.ts +5 -0
- package/templates-experimental/astro/templates/ts/worker-configuration.d.ts +4 -0
- package/templates-experimental/astro/templates/ts/wrangler.json +15 -0
- package/templates-experimental/docusaurus/c3.ts +32 -0
- package/templates-experimental/docusaurus/templates/wrangler.json +10 -0
- package/templates-experimental/gatsby/c3.ts +53 -0
- package/templates-experimental/gatsby/templates/wrangler.json +10 -0
- package/templates-experimental/hello-world-assets-only/c3.ts +15 -0
- package/templates-experimental/hello-world-assets-only/templates/package.json +13 -0
- package/templates-experimental/hello-world-assets-only/templates/public/index.html +11 -0
- package/templates-experimental/hello-world-assets-only/templates/wrangler.json +10 -0
- package/templates-experimental/hello-world-durable-object-with-assets/c3.ts +23 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/.editorconfig +12 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/.prettierrc +6 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/__dot__gitignore +172 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/package.json +13 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/public/index.html +19 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/src/index.js +69 -0
- package/templates-experimental/hello-world-durable-object-with-assets/js/wrangler.json +28 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/.editorconfig +12 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/.prettierrc +6 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/__dot__gitignore +172 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/package.json +15 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/public/index.html +19 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/src/index.ts +66 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/tsconfig.json +42 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/worker-configuration.d.ts +5 -0
- package/templates-experimental/hello-world-durable-object-with-assets/ts/wrangler.json +28 -0
- package/templates-experimental/hello-world-with-assets/c3.ts +22 -0
- package/templates-experimental/hello-world-with-assets/js/.editorconfig +12 -0
- package/templates-experimental/hello-world-with-assets/js/.prettierrc +6 -0
- package/templates-experimental/hello-world-with-assets/js/__dot__gitignore +172 -0
- package/templates-experimental/hello-world-with-assets/js/package.json +16 -0
- package/templates-experimental/hello-world-with-assets/js/public/index.html +31 -0
- package/templates-experimental/hello-world-with-assets/js/src/index.js +23 -0
- package/templates-experimental/hello-world-with-assets/js/test/index.spec.js +41 -0
- package/templates-experimental/hello-world-with-assets/js/vitest.config.js +11 -0
- package/templates-experimental/hello-world-with-assets/js/wrangler.json +15 -0
- package/templates-experimental/hello-world-with-assets/py/__dot__gitignore +68 -0
- package/templates-experimental/hello-world-with-assets/py/package.json +13 -0
- package/templates-experimental/hello-world-with-assets/py/public/index.html +31 -0
- package/templates-experimental/hello-world-with-assets/py/src/entry.py +9 -0
- package/templates-experimental/hello-world-with-assets/py/wrangler.json +15 -0
- package/templates-experimental/hello-world-with-assets/ts/.editorconfig +12 -0
- package/templates-experimental/hello-world-with-assets/ts/.prettierrc +6 -0
- package/templates-experimental/hello-world-with-assets/ts/__dot__gitignore +172 -0
- package/templates-experimental/hello-world-with-assets/ts/package.json +18 -0
- package/templates-experimental/hello-world-with-assets/ts/public/index.html +31 -0
- package/templates-experimental/hello-world-with-assets/ts/src/index.ts +26 -0
- package/templates-experimental/hello-world-with-assets/ts/test/index.spec.ts +41 -0
- package/templates-experimental/hello-world-with-assets/ts/test/tsconfig.json +8 -0
- package/templates-experimental/hello-world-with-assets/ts/tsconfig.json +44 -0
- package/templates-experimental/hello-world-with-assets/ts/vitest.config.mts +11 -0
- package/templates-experimental/hello-world-with-assets/ts/worker-configuration.d.ts +4 -0
- package/templates-experimental/hello-world-with-assets/ts/wrangler.json +15 -0
- package/templates-experimental/hono/c3.ts +43 -0
- package/templates-experimental/hono/templates/public/index.html +19 -0
- package/templates-experimental/hono/templates/src/index.ts +9 -0
- package/templates-experimental/hono/templates/worker-configuration.d.ts +4 -0
- package/templates-experimental/hono/templates/wrangler.json +9 -0
- package/templates-experimental/next/c3.ts +59 -0
- package/templates-experimental/next/templates/.dev.vars +2 -0
- package/templates-experimental/next/templates/__dot__gitignore +39 -0
- package/templates-experimental/next/templates/cloudflare-env.d.ts +5 -0
- package/templates-experimental/next/templates/open-next.config.ts +28 -0
- package/templates-experimental/next/templates/wrangler.json +13 -0
- package/templates-experimental/nuxt/c3.ts +135 -0
- package/templates-experimental/nuxt/templates/env.d.ts +14 -0
- package/templates-experimental/nuxt/templates/worker-configuration.d.ts +4 -0
- package/templates-experimental/nuxt/templates/wrangler.json +12 -0
- package/templates-experimental/qwik/c3.ts +153 -0
- package/templates-experimental/qwik/snippets/getPlatformProxy.ts +6 -0
- package/templates-experimental/qwik/templates/public/.assetsignore +4 -0
- package/templates-experimental/qwik/templates/worker-configuration.d.ts +4 -0
- package/templates-experimental/qwik/templates/wrangler.json +15 -0
- package/templates-experimental/remix/c3.ts +52 -0
- package/templates-experimental/remix/templates/public/.assetsignore +0 -0
- package/templates-experimental/remix/templates/worker-configuration.d.ts +4 -0
- package/templates-experimental/remix/templates/wrangler.toml +11 -0
- package/templates-experimental/solid/c3.ts +94 -0
- package/templates-experimental/solid/templates/wrangler.json +15 -0
- package/templates-experimental/svelte/c3.ts +129 -0
- package/templates-experimental/svelte/templates/static/.assetsignore +4 -0
- package/templates-experimental/svelte/templates/wrangler.json +12 -0
- package/templates-experimental/vue/c3.ts +33 -0
- package/templates-experimental/vue/templates/wrangler.json +10 -0
- package/templates/angular/templates/server.ts +0 -34
- package/templates/angular/templates/tools/alter-polyfills.mjs +0 -27
- package/templates/angular/templates/tools/paths.mjs +0 -9
- package/templates/common/js/wrangler.toml +0 -51
- package/templates/common/ts/wrangler.toml +0 -51
- package/templates/hello-world/js/wrangler.toml +0 -51
- package/templates/hello-world/ts/wrangler.toml +0 -51
- package/templates/hello-world-durable-object/js/wrangler.toml +0 -51
- package/templates/hello-world-durable-object/ts/wrangler.toml +0 -51
- package/templates/next/templates.ts +0 -281
- package/templates/openapi/ts/wrangler.toml +0 -3
- package/templates/pre-existing/js/wrangler.toml +0 -3
- package/templates/queues/js/wrangler.toml +0 -19
- package/templates/queues/ts/wrangler.toml +0 -19
- package/templates/scheduled/js/wrangler.toml +0 -9
- package/templates/scheduled/ts/wrangler.toml +0 -9
- package/templates/solid/js/vite.config.js +0 -12
- package/templates/solid/ts/vite.config.ts +0 -12
- package/templates/svelte/templates.ts +0 -13
package/templates/angular/c3.ts
CHANGED
|
@@ -2,16 +2,22 @@ import { resolve } from "node:path";
|
|
|
2
2
|
import { logRaw } from "@cloudflare/cli";
|
|
3
3
|
import { brandColor, dim } from "@cloudflare/cli/colors";
|
|
4
4
|
import { spinner } from "@cloudflare/cli/interactive";
|
|
5
|
-
import {
|
|
6
|
-
import { compatDateFlag
|
|
7
|
-
import {
|
|
5
|
+
import { runFrameworkGenerator } from "frameworks/index";
|
|
6
|
+
import { compatDateFlag } from "helpers/compatDate";
|
|
7
|
+
import { readFile, readJSON, writeFile } from "helpers/files";
|
|
8
|
+
import { detectPackageManager } from "helpers/packageManagers";
|
|
9
|
+
import { installPackages } from "helpers/packages";
|
|
8
10
|
import type { TemplateConfig } from "../../src/templates";
|
|
9
11
|
import type { C3Context } from "types";
|
|
10
12
|
|
|
11
13
|
const { npm } = detectPackageManager();
|
|
12
14
|
|
|
13
15
|
const generate = async (ctx: C3Context) => {
|
|
14
|
-
await runFrameworkGenerator(ctx, [
|
|
16
|
+
await runFrameworkGenerator(ctx, [
|
|
17
|
+
ctx.project.name,
|
|
18
|
+
"--ssr",
|
|
19
|
+
"--server-routing" /** Dev Preview API */,
|
|
20
|
+
]);
|
|
15
21
|
logRaw("");
|
|
16
22
|
};
|
|
17
23
|
|
|
@@ -22,14 +28,11 @@ const configure = async (ctx: C3Context) => {
|
|
|
22
28
|
};
|
|
23
29
|
|
|
24
30
|
async function installCFWorker() {
|
|
25
|
-
await installPackages(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
|
|
31
|
-
}
|
|
32
|
-
);
|
|
31
|
+
await installPackages(["xhr2"], {
|
|
32
|
+
dev: true,
|
|
33
|
+
startText: "Installing additional dependencies",
|
|
34
|
+
doneText: `${brandColor("installed")} ${dim(`via \`${npm} install\``)}`,
|
|
35
|
+
});
|
|
33
36
|
}
|
|
34
37
|
async function updateAppCode() {
|
|
35
38
|
const s = spinner();
|
|
@@ -43,18 +46,28 @@ async function updateAppCode() {
|
|
|
43
46
|
"import { provideHttpClient, withFetch } from '@angular/common/http';\n" +
|
|
44
47
|
appConfig.replace(
|
|
45
48
|
"providers: [",
|
|
46
|
-
"providers: [provideHttpClient(withFetch()), "
|
|
49
|
+
"providers: [provideHttpClient(withFetch()), ",
|
|
47
50
|
);
|
|
48
51
|
writeFile(resolve(appConfigPath), newAppConfig);
|
|
49
52
|
s.stop(`${brandColor(`updated`)} ${dim(appConfigPath)}`);
|
|
50
53
|
|
|
54
|
+
// Update an app server routes file to:
|
|
55
|
+
const appServerRoutesPath = "src/app/app.routes.server.ts";
|
|
56
|
+
const appRoutes = readFile(resolve(appServerRoutesPath));
|
|
57
|
+
const newAppRoutes = appRoutes.replace(
|
|
58
|
+
"RenderMode.Prerender",
|
|
59
|
+
"RenderMode.Server",
|
|
60
|
+
);
|
|
61
|
+
writeFile(resolve(appServerRoutesPath), newAppRoutes);
|
|
62
|
+
s.stop(`${brandColor(`updated`)} ${dim(appServerRoutesPath)}`);
|
|
63
|
+
|
|
51
64
|
// Remove unwanted dependencies
|
|
52
65
|
s.start(`Updating package.json`);
|
|
53
66
|
const packageJsonPath = resolve("package.json");
|
|
54
67
|
const packageManifest = readJSON(packageJsonPath);
|
|
55
68
|
|
|
56
|
-
delete packageManifest["dependencies"]["@angular/ssr"];
|
|
57
69
|
delete packageManifest["dependencies"]["express"];
|
|
70
|
+
delete packageManifest["devDependencies"]["@types/express"];
|
|
58
71
|
|
|
59
72
|
writeFile(packageJsonPath, JSON.stringify(packageManifest, null, 2));
|
|
60
73
|
s.stop(`${brandColor(`updated`)} ${dim(`\`package.json\``)}`);
|
|
@@ -67,6 +80,8 @@ function updateAngularJson(ctx: C3Context) {
|
|
|
67
80
|
// Update builder
|
|
68
81
|
const architectSection = angularJson.projects[ctx.project.name].architect;
|
|
69
82
|
architectSection.build.options.outputPath = "dist";
|
|
83
|
+
architectSection.build.options.outputMode = "server";
|
|
84
|
+
architectSection.build.options.ssr.experimentalPlatform = "neutral";
|
|
70
85
|
architectSection.build.options.assets.push("src/_routes.json");
|
|
71
86
|
|
|
72
87
|
writeFile(resolve("angular.json"), JSON.stringify(angularJson, null, 2));
|
|
@@ -76,24 +91,24 @@ function updateAngularJson(ctx: C3Context) {
|
|
|
76
91
|
const config: TemplateConfig = {
|
|
77
92
|
configVersion: 1,
|
|
78
93
|
id: "angular",
|
|
94
|
+
frameworkCli: "@angular/create",
|
|
79
95
|
displayName: "Angular",
|
|
80
96
|
platform: "pages",
|
|
81
97
|
copyFiles: {
|
|
82
98
|
path: "./templates",
|
|
83
99
|
},
|
|
100
|
+
devScript: "start",
|
|
101
|
+
deployScript: "deploy",
|
|
102
|
+
previewScript: "start",
|
|
84
103
|
generate,
|
|
85
104
|
configure,
|
|
86
105
|
transformPackageJson: async () => ({
|
|
87
106
|
scripts: {
|
|
88
|
-
start: `${npm} run
|
|
89
|
-
process
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
deploy: `${npm} run pages:build && wrangler pages deploy dist/cloudflare`,
|
|
107
|
+
start: `${npm} run build && wrangler pages dev dist/cloudflare ${await compatDateFlag()}`,
|
|
108
|
+
build: `ng build && ${npm} run process`,
|
|
109
|
+
process: "node ./tools/copy-files.mjs",
|
|
110
|
+
deploy: `${npm} run build && wrangler pages deploy dist/cloudflare`,
|
|
93
111
|
},
|
|
94
112
|
}),
|
|
95
|
-
deployScript: "deploy",
|
|
96
|
-
devScript: "start",
|
|
97
|
-
testFlags: ["--style", "sass"],
|
|
98
113
|
};
|
|
99
114
|
export default config;
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { AngularAppEngine, createRequestHandler } from '@angular/ssr';
|
|
2
|
+
|
|
3
|
+
const angularApp = new AngularAppEngine();
|
|
4
|
+
|
|
5
|
+
/**
|
|
6
|
+
* This is a request handler used by the Angular CLI (dev-server and during build).
|
|
7
|
+
*/
|
|
8
|
+
export const reqHandler = createRequestHandler(async (req) => {
|
|
9
|
+
const res = await angularApp.handle(req);
|
|
10
|
+
|
|
11
|
+
return res ?? new Response('Page not found.', { status: 404 });
|
|
12
|
+
});
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
export default { fetch: reqHandler };
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
// Copy the files over so that they can be uploaded by the pages publish command.
|
|
2
2
|
import fs from "node:fs";
|
|
3
|
-
import { join } from "node:path";
|
|
4
|
-
import {
|
|
3
|
+
import { join, resolve } from "node:path";
|
|
4
|
+
import { fileURLToPath } from "node:url";
|
|
5
|
+
|
|
6
|
+
const root = resolve(fileURLToPath(import.meta.url), "../../");
|
|
7
|
+
const client = resolve(root, "dist/browser");
|
|
8
|
+
const ssr = resolve(root, "dist/server");
|
|
9
|
+
const cloudflare = resolve(root, "dist/cloudflare");
|
|
10
|
+
const worker = resolve(cloudflare, "_worker.js");
|
|
5
11
|
|
|
6
12
|
fs.cpSync(client, cloudflare, { recursive: true });
|
|
7
13
|
fs.cpSync(ssr, worker, { recursive: true });
|
package/templates/astro/c3.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { logRaw } from "@cloudflare/cli";
|
|
2
|
-
import { brandColor, dim } from "@cloudflare/cli/colors";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
1
|
+
import { logRaw, updateStatus } from "@cloudflare/cli";
|
|
2
|
+
import { blue, brandColor, dim } from "@cloudflare/cli/colors";
|
|
3
|
+
import { runFrameworkGenerator } from "frameworks/index";
|
|
4
|
+
import { transformFile } from "helpers/codemod";
|
|
5
|
+
import { runCommand } from "helpers/command";
|
|
6
|
+
import { usesTypescript } from "helpers/files";
|
|
7
|
+
import { detectPackageManager } from "helpers/packageManagers";
|
|
8
|
+
import * as recast from "recast";
|
|
6
9
|
import type { TemplateConfig } from "../../src/templates";
|
|
7
|
-
import type { C3Context } from "types";
|
|
10
|
+
import type { C3Context, PackageJson } from "types";
|
|
8
11
|
|
|
9
12
|
const { npx } = detectPackageManager();
|
|
10
13
|
|
|
@@ -19,32 +22,76 @@ const configure = async () => {
|
|
|
19
22
|
silent: true,
|
|
20
23
|
startText: "Installing adapter",
|
|
21
24
|
doneText: `${brandColor("installed")} ${dim(
|
|
22
|
-
`via \`${npx} astro add cloudflare
|
|
25
|
+
`via \`${npx} astro add cloudflare\``,
|
|
23
26
|
)}`,
|
|
24
27
|
});
|
|
28
|
+
|
|
29
|
+
updateAstroConfig();
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
const updateAstroConfig = () => {
|
|
33
|
+
const filePath = "astro.config.mjs";
|
|
34
|
+
|
|
35
|
+
updateStatus(`Updating configuration in ${blue(filePath)}`);
|
|
36
|
+
|
|
37
|
+
transformFile(filePath, {
|
|
38
|
+
visitCallExpression: function (n) {
|
|
39
|
+
const callee = n.node.callee as recast.types.namedTypes.Identifier;
|
|
40
|
+
if (callee.name !== "cloudflare") {
|
|
41
|
+
return this.traverse(n);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const b = recast.types.builders;
|
|
45
|
+
n.node.arguments = [
|
|
46
|
+
b.objectExpression([
|
|
47
|
+
b.objectProperty(
|
|
48
|
+
b.identifier("platformProxy"),
|
|
49
|
+
b.objectExpression([
|
|
50
|
+
b.objectProperty(b.identifier("enabled"), b.booleanLiteral(true)),
|
|
51
|
+
]),
|
|
52
|
+
),
|
|
53
|
+
]),
|
|
54
|
+
];
|
|
55
|
+
|
|
56
|
+
return false;
|
|
57
|
+
},
|
|
58
|
+
});
|
|
25
59
|
};
|
|
26
60
|
|
|
27
61
|
const config: TemplateConfig = {
|
|
28
62
|
configVersion: 1,
|
|
29
63
|
id: "astro",
|
|
64
|
+
frameworkCli: "create-astro",
|
|
30
65
|
platform: "pages",
|
|
31
66
|
displayName: "Astro",
|
|
67
|
+
copyFiles: {
|
|
68
|
+
async selectVariant(ctx) {
|
|
69
|
+
// Note: this `selectVariant` function should not be needed
|
|
70
|
+
// this is just a quick workaround until
|
|
71
|
+
// https://github.com/cloudflare/workers-sdk/issues/7495
|
|
72
|
+
// is resolved
|
|
73
|
+
return usesTypescript(ctx) ? "ts" : "js";
|
|
74
|
+
},
|
|
75
|
+
variants: {
|
|
76
|
+
js: {
|
|
77
|
+
path: "./templates/js",
|
|
78
|
+
},
|
|
79
|
+
ts: {
|
|
80
|
+
path: "./templates/ts",
|
|
81
|
+
},
|
|
82
|
+
},
|
|
83
|
+
},
|
|
84
|
+
devScript: "dev",
|
|
85
|
+
deployScript: "deploy",
|
|
86
|
+
previewScript: "preview",
|
|
32
87
|
generate,
|
|
33
88
|
configure,
|
|
34
|
-
transformPackageJson: async () => ({
|
|
89
|
+
transformPackageJson: async (pkgJson: PackageJson, ctx: C3Context) => ({
|
|
35
90
|
scripts: {
|
|
36
|
-
|
|
37
|
-
|
|
91
|
+
deploy: `astro build && wrangler pages deploy`,
|
|
92
|
+
preview: `astro build && wrangler pages dev`,
|
|
93
|
+
...(usesTypescript(ctx) && { "cf-typegen": `wrangler types` }),
|
|
38
94
|
},
|
|
39
95
|
}),
|
|
40
|
-
testFlags: [
|
|
41
|
-
"--skip-houston",
|
|
42
|
-
"--no-install",
|
|
43
|
-
"--no-git",
|
|
44
|
-
"--template",
|
|
45
|
-
"blog",
|
|
46
|
-
"--typescript",
|
|
47
|
-
"strict",
|
|
48
|
-
],
|
|
49
96
|
};
|
|
50
97
|
export default config;
|
package/templates/common/c3.ts
CHANGED
|
@@ -2,13 +2,18 @@ export default {
|
|
|
2
2
|
configVersion: 1,
|
|
3
3
|
id: "common",
|
|
4
4
|
displayName: "Example router & proxy Worker",
|
|
5
|
+
description:
|
|
6
|
+
"Create a Worker to route and forward requests to other services",
|
|
5
7
|
platform: "workers",
|
|
8
|
+
hidden: true,
|
|
6
9
|
copyFiles: {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
variants: {
|
|
11
|
+
js: {
|
|
12
|
+
path: "./js",
|
|
13
|
+
},
|
|
14
|
+
ts: {
|
|
15
|
+
path: "./ts",
|
|
16
|
+
},
|
|
12
17
|
},
|
|
13
18
|
},
|
|
14
19
|
};
|
|
@@ -5,11 +5,12 @@
|
|
|
5
5
|
"scripts": {
|
|
6
6
|
"deploy": "wrangler deploy",
|
|
7
7
|
"dev": "wrangler dev",
|
|
8
|
-
"start": "wrangler dev"
|
|
8
|
+
"start": "wrangler dev",
|
|
9
|
+
"cf-typegen": "wrangler types"
|
|
9
10
|
},
|
|
10
11
|
"devDependencies": {
|
|
11
12
|
"itty-router": "^3.0.12",
|
|
12
|
-
"typescript": "^5.
|
|
13
|
-
"wrangler": "^3.
|
|
13
|
+
"typescript": "^5.5.2",
|
|
14
|
+
"wrangler": "^3.101.0"
|
|
14
15
|
}
|
|
15
16
|
}
|
|
@@ -6,7 +6,7 @@ const EXPERIMENTS = [
|
|
|
6
6
|
];
|
|
7
7
|
|
|
8
8
|
export default {
|
|
9
|
-
async fetch(request
|
|
9
|
+
async fetch(request, env, ctx): Promise<Response> {
|
|
10
10
|
const fingerprint = [request.headers.get('cf-connecting-ip'), request.cf?.postalCode]; // add any values you want considered as a fingerprint
|
|
11
11
|
const activeExperiments = await getActiveExperiments(fingerprint, EXPERIMENTS);
|
|
12
12
|
|
|
@@ -22,7 +22,7 @@ export default {
|
|
|
22
22
|
|
|
23
23
|
return rewriter.transform(res);
|
|
24
24
|
},
|
|
25
|
-
}
|
|
25
|
+
} satisfies ExportedHandler<Env>;
|
|
26
26
|
|
|
27
27
|
// Get active experiments by hashing a fingerprint
|
|
28
28
|
async function getActiveExperiments(fingerprint: unknown, experiments: Array<{ name: string; threshold: number }>) {
|
|
@@ -5,6 +5,9 @@
|
|
|
5
5
|
* - Open a browser tab at http://localhost:8787/ to see your worker in action
|
|
6
6
|
* - Run `npm run deploy` to publish your worker
|
|
7
7
|
*
|
|
8
|
+
* Bind resources to your Worker in `wrangler.json`. After adding bindings, a type definition for the
|
|
9
|
+
* `Env` object can be regenerated with `npm run cf-typegen`.
|
|
10
|
+
*
|
|
8
11
|
* Learn more at https://developers.cloudflare.com/workers/
|
|
9
12
|
*/
|
|
10
13
|
|
|
@@ -16,7 +19,7 @@ import apiRouter from './router';
|
|
|
16
19
|
export default {
|
|
17
20
|
// The fetch handler is invoked when this worker receives a HTTP(S) request
|
|
18
21
|
// and should return a Response (optionally wrapped in a Promise)
|
|
19
|
-
async fetch(request
|
|
22
|
+
async fetch(request, env, ctx): Promise<Response> {
|
|
20
23
|
// You'll find it helpful to parse the request.url string into a URL object. Learn more at https://developer.mozilla.org/en-US/docs/Web/API/URL
|
|
21
24
|
const url = new URL(request.url);
|
|
22
25
|
|
|
@@ -43,4 +46,4 @@ export default {
|
|
|
43
46
|
{ headers: { 'Content-Type': 'text/html' } }
|
|
44
47
|
);
|
|
45
48
|
},
|
|
46
|
-
}
|
|
49
|
+
} satisfies ExportedHandler<Env>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export default {
|
|
2
|
-
async fetch(request
|
|
2
|
+
async fetch(request, env, ctx): Promise<Response> {
|
|
3
3
|
const url = new URL(request.url);
|
|
4
4
|
|
|
5
5
|
const proxyUrl = url.searchParams.get('proxyUrl'); // get a query param value (?proxyUrl=...)
|
|
@@ -20,4 +20,4 @@ export default {
|
|
|
20
20
|
|
|
21
21
|
return res;
|
|
22
22
|
},
|
|
23
|
-
}
|
|
23
|
+
} satisfies ExportedHandler<Env>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export default {
|
|
2
|
-
async fetch(request
|
|
2
|
+
async fetch(request, env, ctx): Promise<Response> {
|
|
3
3
|
const url = new URL(request.url);
|
|
4
4
|
const redirectUrl = url.searchParams.get('redirectUrl'); // get a query param value (?redirectUrl=...)
|
|
5
5
|
|
|
@@ -10,4 +10,4 @@ export default {
|
|
|
10
10
|
// The Response class has static methods to create common Response objects as a convenience
|
|
11
11
|
return Response.redirect(redirectUrl);
|
|
12
12
|
},
|
|
13
|
-
}
|
|
13
|
+
} satisfies ExportedHandler<Env>;
|
|
@@ -2,100 +2,42 @@
|
|
|
2
2
|
"compilerOptions": {
|
|
3
3
|
/* Visit https://aka.ms/tsconfig.json to read more about this file */
|
|
4
4
|
|
|
5
|
-
/*
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
"
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
"
|
|
42
|
-
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */
|
|
43
|
-
|
|
44
|
-
/* Emit */
|
|
45
|
-
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
|
46
|
-
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
|
47
|
-
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
|
48
|
-
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
|
49
|
-
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */
|
|
50
|
-
// "outDir": "./", /* Specify an output folder for all emitted files. */
|
|
51
|
-
// "removeComments": true, /* Disable emitting comments. */
|
|
52
|
-
"noEmit": true /* Disable emitting files from a compilation. */,
|
|
53
|
-
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
|
54
|
-
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */
|
|
55
|
-
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
|
56
|
-
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
|
57
|
-
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
|
58
|
-
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
|
59
|
-
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
|
60
|
-
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
|
61
|
-
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
|
62
|
-
// "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */
|
|
63
|
-
// "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */
|
|
64
|
-
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
|
65
|
-
// "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */
|
|
66
|
-
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
|
67
|
-
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
|
|
68
|
-
|
|
69
|
-
/* Interop Constraints */
|
|
70
|
-
"isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
|
|
71
|
-
"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
|
|
72
|
-
// "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
|
|
73
|
-
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
|
74
|
-
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
|
|
75
|
-
|
|
76
|
-
/* Type Checking */
|
|
77
|
-
"strict": true /* Enable all strict type-checking options. */,
|
|
78
|
-
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */
|
|
79
|
-
// "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */
|
|
80
|
-
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
|
81
|
-
// "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */
|
|
82
|
-
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
|
83
|
-
// "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */
|
|
84
|
-
// "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */
|
|
85
|
-
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
|
86
|
-
// "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */
|
|
87
|
-
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */
|
|
88
|
-
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
|
89
|
-
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
|
90
|
-
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
|
91
|
-
// "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */
|
|
92
|
-
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
|
93
|
-
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */
|
|
94
|
-
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
|
95
|
-
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
|
96
|
-
|
|
97
|
-
/* Completeness */
|
|
98
|
-
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
|
99
|
-
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
|
5
|
+
/* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
|
6
|
+
"target": "es2021",
|
|
7
|
+
/* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
|
8
|
+
"lib": ["es2021"],
|
|
9
|
+
/* Specify what JSX code is generated. */
|
|
10
|
+
"jsx": "react-jsx" ,
|
|
11
|
+
|
|
12
|
+
/* Specify what module code is generated. */
|
|
13
|
+
"module": "es2022",
|
|
14
|
+
/* Specify how TypeScript looks up a file from a given module specifier. */
|
|
15
|
+
"moduleResolution": "node",
|
|
16
|
+
/* Enable importing .json files */
|
|
17
|
+
"resolveJsonModule": true,
|
|
18
|
+
|
|
19
|
+
/* Specify type package names to be included without being referenced in a source file. */
|
|
20
|
+
"types": ["@cloudflare/workers-types"],
|
|
21
|
+
|
|
22
|
+
/* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */
|
|
23
|
+
"allowJs": true,
|
|
24
|
+
/* Enable error reporting in type-checked JavaScript files. */
|
|
25
|
+
"checkJs": false,
|
|
26
|
+
|
|
27
|
+
/* Disable emitting files from a compilation. */
|
|
28
|
+
"noEmit": true,
|
|
29
|
+
|
|
30
|
+
/* Ensure that each file can be safely transpiled without relying on other imports. */
|
|
31
|
+
"isolatedModules": true,
|
|
32
|
+
/* Allow 'import x from y' when a module doesn't have a default export. */
|
|
33
|
+
"allowSyntheticDefaultImports": true,
|
|
34
|
+
/* Ensure that casing is correct in imports. */
|
|
35
|
+
"forceConsistentCasingInFileNames": true,
|
|
36
|
+
|
|
37
|
+
/* Enable all strict type-checking options. */
|
|
38
|
+
"strict": true,
|
|
39
|
+
|
|
40
|
+
/* Skip type checking all .d.ts files. */
|
|
41
|
+
"skipLibCheck": true
|
|
100
42
|
}
|
|
101
43
|
}
|
|
@@ -1,16 +1,4 @@
|
|
|
1
|
+
// Generated by Wrangler
|
|
2
|
+
// After adding bindings to `wrangler.json`, regenerate this interface via `npm run cf-typegen`
|
|
1
3
|
interface Env {
|
|
2
|
-
// Example binding to KV. Learn more at https://developers.cloudflare.com/workers/runtime-apis/kv/
|
|
3
|
-
// MY_KV_NAMESPACE: KVNamespace;
|
|
4
|
-
//
|
|
5
|
-
// Example binding to Durable Object. Learn more at https://developers.cloudflare.com/workers/runtime-apis/durable-objects/
|
|
6
|
-
// MY_DURABLE_OBJECT: DurableObjectNamespace;
|
|
7
|
-
//
|
|
8
|
-
// Example binding to R2. Learn more at https://developers.cloudflare.com/workers/runtime-apis/r2/
|
|
9
|
-
// MY_BUCKET: R2Bucket;
|
|
10
|
-
//
|
|
11
|
-
// Example binding to a Service. Learn more at https://developers.cloudflare.com/workers/runtime-apis/service-bindings/
|
|
12
|
-
// MY_SERVICE: Fetcher;
|
|
13
|
-
//
|
|
14
|
-
// Example binding to a Queue. Learn more at https://developers.cloudflare.com/queues/javascript-apis/
|
|
15
|
-
// MY_QUEUE: Queue;
|
|
16
4
|
}
|