alchemy 0.65.0 → 0.66.0
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/bin/alchemy.js +134 -80
- package/bin/commands/init.ts +6 -3
- package/bin/services/cdp-manager/server.ts +3 -2
- package/bin/services/execute-alchemy.ts +33 -3
- package/bin/services/find-workspace-root.ts +48 -0
- package/lib/alchemy.d.ts +14 -3
- package/lib/alchemy.d.ts.map +1 -1
- package/lib/alchemy.js +17 -5
- package/lib/alchemy.js.map +1 -1
- package/lib/apply.d.ts.map +1 -1
- package/lib/apply.js +51 -1
- package/lib/apply.js.map +1 -1
- package/lib/cloudflare/bucket.js +1 -1
- package/lib/cloudflare/bucket.js.map +1 -1
- package/lib/cloudflare/bundle/plugin-node-compat.js +2 -2
- package/lib/cloudflare/bundle/plugin-node-compat.js.map +1 -1
- package/lib/cloudflare/cloudflare-env-proxy.js +3 -3
- package/lib/cloudflare/cloudflare-env-proxy.js.map +1 -1
- package/lib/cloudflare/compatibility-date.gen.d.ts +1 -1
- package/lib/cloudflare/compatibility-date.gen.js +1 -1
- package/lib/cloudflare/d1-database.d.ts.map +1 -1
- package/lib/cloudflare/d1-database.js +2 -1
- package/lib/cloudflare/d1-database.js.map +1 -1
- package/lib/cloudflare/d1-local-migrations.d.ts +1 -0
- package/lib/cloudflare/d1-local-migrations.d.ts.map +1 -1
- package/lib/cloudflare/d1-local-migrations.js +3 -2
- package/lib/cloudflare/d1-local-migrations.js.map +1 -1
- package/lib/cloudflare/kv-namespace.js +1 -1
- package/lib/cloudflare/kv-namespace.js.map +1 -1
- package/lib/cloudflare/miniflare/delete.d.ts +3 -2
- package/lib/cloudflare/miniflare/delete.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/delete.js +13 -12
- package/lib/cloudflare/miniflare/delete.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.js +5 -4
- package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -1
- package/lib/cloudflare/miniflare/paths.d.ts +4 -4
- package/lib/cloudflare/miniflare/paths.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/paths.js +10 -4
- package/lib/cloudflare/miniflare/paths.js.map +1 -1
- package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts +2 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts.map +1 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.js +19 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.js.map +1 -0
- package/lib/cloudflare/next.js +2 -2
- package/lib/cloudflare/next.js.map +1 -1
- package/lib/cloudflare/nuxt/plugin.d.ts.map +1 -1
- package/lib/cloudflare/nuxt/plugin.js +3 -3
- package/lib/cloudflare/nuxt/plugin.js.map +1 -1
- package/lib/cloudflare/redwood/plugin.js +2 -2
- package/lib/cloudflare/redwood/plugin.js.map +1 -1
- package/lib/cloudflare/vite/plugin.d.ts.map +1 -1
- package/lib/cloudflare/vite/plugin.js +6 -3
- package/lib/cloudflare/vite/plugin.js.map +1 -1
- package/lib/cloudflare/website.d.ts.map +1 -1
- package/lib/cloudflare/website.js +5 -16
- package/lib/cloudflare/website.js.map +1 -1
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +4 -2
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/wrangler.json.js +1 -0
- package/lib/cloudflare/wrangler.json.js.map +1 -1
- package/lib/scope.d.ts +16 -0
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +10 -5
- package/lib/scope.js.map +1 -1
- package/lib/state/file-system-state-store.d.ts.map +1 -1
- package/lib/state/file-system-state-store.js +1 -2
- package/lib/state/file-system-state-store.js.map +1 -1
- package/lib/state/sqlite-state-store.d.ts +11 -0
- package/lib/state/sqlite-state-store.d.ts.map +1 -1
- package/lib/state/sqlite-state-store.js +22 -14
- package/lib/state/sqlite-state-store.js.map +1 -1
- package/lib/stripe/customer.d.ts +0 -8
- package/lib/stripe/customer.d.ts.map +1 -1
- package/lib/stripe/customer.js +0 -6
- package/lib/stripe/customer.js.map +1 -1
- package/lib/stripe/price.d.ts +23 -23
- package/lib/stripe/price.d.ts.map +1 -1
- package/lib/stripe/price.js +6 -22
- package/lib/stripe/price.js.map +1 -1
- package/lib/test/vitest.d.ts.map +1 -1
- package/lib/test/vitest.js +1 -1
- package/lib/test/vitest.js.map +1 -1
- package/lib/util/assert-never.js +1 -1
- package/lib/util/assert-never.js.map +1 -1
- package/lib/util/cli.d.ts.map +1 -1
- package/lib/util/cli.js +12 -13
- package/lib/util/cli.js.map +1 -1
- package/lib/util/memoize.d.ts +1 -1
- package/lib/util/memoize.d.ts.map +1 -1
- package/lib/util/memoize.js +2 -2
- package/lib/util/memoize.js.map +1 -1
- package/lib/util/root-dir.d.ts +2 -0
- package/lib/util/root-dir.d.ts.map +1 -0
- package/lib/util/root-dir.js +2 -0
- package/lib/util/root-dir.js.map +1 -0
- package/package.json +4 -4
- package/src/alchemy.ts +36 -8
- package/src/apply.ts +58 -3
- package/src/cloudflare/bucket.ts +1 -1
- package/src/cloudflare/bundle/plugin-node-compat.ts +2 -2
- package/src/cloudflare/cloudflare-env-proxy.ts +5 -5
- package/src/cloudflare/compatibility-date.gen.ts +1 -1
- package/src/cloudflare/d1-database.ts +2 -1
- package/src/cloudflare/d1-local-migrations.ts +10 -6
- package/src/cloudflare/kv-namespace.ts +1 -1
- package/src/cloudflare/miniflare/delete.ts +19 -11
- package/src/cloudflare/miniflare/miniflare-controller.ts +10 -6
- package/src/cloudflare/miniflare/paths.ts +11 -7
- package/src/cloudflare/miniflare/symlink-miniflare-state.ts +19 -0
- package/src/cloudflare/next.ts +3 -3
- package/src/cloudflare/nuxt/plugin.ts +12 -3
- package/src/cloudflare/redwood/plugin.ts +2 -2
- package/src/cloudflare/vite/plugin.ts +8 -3
- package/src/cloudflare/website.ts +5 -19
- package/src/cloudflare/worker.ts +4 -2
- package/src/cloudflare/wrangler.json.ts +1 -0
- package/src/scope.ts +26 -5
- package/src/state/file-system-state-store.ts +1 -2
- package/src/state/sqlite-state-store.ts +41 -14
- package/src/stripe/customer.ts +0 -14
- package/src/stripe/price.ts +59 -56
- package/src/test/vitest.ts +4 -1
- package/src/util/assert-never.ts +1 -1
- package/src/util/cli.ts +15 -13
- package/src/util/memoize.ts +2 -2
- package/src/util/root-dir.ts +1 -0
- package/templates/nextjs/alchemy.run.ts +2 -2
- package/workers/cloudflare-state-store.js +1 -1
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
import * as mf from "miniflare";
|
|
2
|
-
import
|
|
2
|
+
import { getDefaultPersistPath } from "./miniflare/paths.js";
|
|
3
3
|
export const applyLocalD1Migrations = async (options) => {
|
|
4
4
|
const miniflare = new mf.Miniflare({
|
|
5
5
|
script: "",
|
|
6
6
|
modules: true,
|
|
7
|
-
defaultPersistRoot:
|
|
7
|
+
defaultPersistRoot: getDefaultPersistPath(options.rootDir),
|
|
8
8
|
d1Persist: true,
|
|
9
9
|
d1Databases: { DB: options.databaseId },
|
|
10
10
|
log: process.env.DEBUG ? new mf.Log(mf.LogLevel.DEBUG) : undefined,
|
|
11
11
|
});
|
|
12
12
|
try {
|
|
13
13
|
await miniflare.ready;
|
|
14
|
+
// TODO(sam): don't use `any` once prisma is fixed upstream
|
|
14
15
|
const db = await miniflare.getD1Database("DB");
|
|
15
16
|
const session = db.withSession("first-primary");
|
|
16
17
|
await session
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d1-local-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"d1-local-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,OAAgC,EAChC,EAAE;IACF,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC;QACjC,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1D,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE;QACvC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KACnE,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,KAAK,CAAC;QACtB,2DAA2D;QAC3D,MAAM,EAAE,GAAQ,MAAM,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,OAAO,GAAQ,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,OAAO;aACV,OAAO,CACN,8BAA8B,OAAO,CAAC,eAAe;;;;MAIvD,CACC;aACA,GAAG,EAAE,CAAC;QACT,MAAM,iBAAiB,GAEnB,MAAM,OAAO;aACd,OAAO,CACN,oBAAoB,OAAO,CAAC,eAAe,0BAA0B,CACtE;aACA,GAAG,EAAE,CAAC;QACT,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAClC,eAAe,OAAO,CAAC,eAAe,oBAAoB,CAC3D,CAAC;QACF,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3C,IAAI,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YACD,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YAC3C,MAAM,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -95,7 +95,7 @@ const _KVNamespace = Resource("cloudflare::KVNamespace", async function (id, pro
|
|
|
95
95
|
}
|
|
96
96
|
if (this.phase === "delete") {
|
|
97
97
|
if (this.output.dev?.id) {
|
|
98
|
-
await deleteMiniflareBinding("kv", this.output.dev.id);
|
|
98
|
+
await deleteMiniflareBinding(this.scope, "kv", this.output.dev.id);
|
|
99
99
|
}
|
|
100
100
|
if (this.output.namespaceId && props.delete !== false) {
|
|
101
101
|
await deleteKVNamespace(api, this.output.namespaceId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kv-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EACL,uBAAuB,GAExB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAmF/D,MAAM,UAAU,aAAa,CAAC,QAAkB;IAC9C,OAAO,QAAQ,CAAC,YAAY,CAAC,KAAK,yBAAyB,CAAC;AAC9D,CAAC;AAwCD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqDG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,EAAU,EACV,QAA0B,EAAE;IAE5B,OAAO,MAAM,YAAY,CAAC,EAAE,EAAE;QAC5B,GAAG,KAAK;QACR,GAAG,EAAE;YACH,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;YACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,YAAY,GAAG,QAAQ,CAC3B,yBAAyB,EACzB,KAAK,WAEH,EAAU,EACV,KAAuB;IAEvB,MAAM,KAAK,GACT,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IAEzE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;IACrD,MAAM,GAAG,GAAG;QACV,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE;QAC1D,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK;KACnC,CAAC;IAEF,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,IAAI,CAAC;YACV,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,WAAW,IAAI,EAAE;YAC3C,KAAK;YACL,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,GAAG;YACH,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE;YAC/C,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;SACvB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,KAAK,KAAK,EAAE,CAAC;QAC5D,MAAM,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;YACxB,MAAM,sBAAsB,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"kv-namespace.js","sourceRoot":"","sources":["../../src/cloudflare/kv-namespace.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Scope } from "../../scope.ts";
|
|
1
2
|
import type { DurableObjectNamespace } from "../durable-object-namespace.ts";
|
|
2
3
|
import type { Workflow } from "../workflow.ts";
|
|
3
4
|
declare const BINDING_TYPE_KEY: {
|
|
@@ -9,11 +10,11 @@ type BindingType = keyof typeof BINDING_TYPE_KEY;
|
|
|
9
10
|
/**
|
|
10
11
|
* Delete a binding from the miniflare directory.
|
|
11
12
|
*/
|
|
12
|
-
export declare function deleteMiniflareBinding(type: BindingType, id: string): Promise<void>;
|
|
13
|
+
export declare function deleteMiniflareBinding(scope: Scope, type: BindingType, id: string): Promise<void>;
|
|
13
14
|
/**
|
|
14
15
|
* Delete local durable object and workflow data for a given Worker script.
|
|
15
16
|
*/
|
|
16
|
-
export declare function deleteMiniflareWorkerData(scriptName: string, input: {
|
|
17
|
+
export declare function deleteMiniflareWorkerData(scope: Scope, scriptName: string, input: {
|
|
17
18
|
durableObjects: DurableObjectNamespace[];
|
|
18
19
|
workflows: Workflow[];
|
|
19
20
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,QAAA,MAAM,gBAAgB;;;;CAIZ,CAAC;AAEX,KAAK,WAAW,GAAG,MAAM,OAAO,gBAAgB,CAAC;AAEjD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,WAAW,EACjB,EAAE,EAAE,MAAM,iBAwBX;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE;IACL,cAAc,EAAE,sBAAsB,EAAE,CAAC;IACzC,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB,iBAgCF"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import crypto from "node:crypto";
|
|
2
2
|
import fs from "node:fs/promises";
|
|
3
3
|
import path from "pathe";
|
|
4
|
-
import {
|
|
5
|
-
const PERSIST_ROOT = path.resolve(DEFAULT_PERSIST_PATH);
|
|
4
|
+
import { getDefaultPersistPath } from "./paths.js";
|
|
6
5
|
const BINDING_TYPE_KEY = {
|
|
7
6
|
d1: "miniflare-D1DatabaseObject",
|
|
8
7
|
kv: "miniflare-KVNamespaceObject",
|
|
@@ -11,8 +10,9 @@ const BINDING_TYPE_KEY = {
|
|
|
11
10
|
/**
|
|
12
11
|
* Delete a binding from the miniflare directory.
|
|
13
12
|
*/
|
|
14
|
-
export async function deleteMiniflareBinding(type, id) {
|
|
15
|
-
const
|
|
13
|
+
export async function deleteMiniflareBinding(scope, type, id) {
|
|
14
|
+
const persistRoot = path.resolve(getDefaultPersistPath(scope.rootDir));
|
|
15
|
+
const bindingPath = path.join(persistRoot, type, BINDING_TYPE_KEY[type]);
|
|
16
16
|
// delete durable object/sqlite files
|
|
17
17
|
const namespaceId = durableObjectNamespaceIdFromName(BINDING_TYPE_KEY[type], id);
|
|
18
18
|
const files = await fs
|
|
@@ -21,29 +21,30 @@ export async function deleteMiniflareBinding(type, id) {
|
|
|
21
21
|
.catch(() => []);
|
|
22
22
|
await Promise.all(files.map((file) => fs.rm(path.join(bindingPath, file))));
|
|
23
23
|
// delete data directory, if present
|
|
24
|
-
await removeDirectory(path.join(
|
|
24
|
+
await removeDirectory(path.join(persistRoot, type, id), {
|
|
25
25
|
recursive: true,
|
|
26
26
|
});
|
|
27
27
|
// delete the miniflare directory if it is empty
|
|
28
|
-
await cleanMiniflareDirectory();
|
|
28
|
+
await cleanMiniflareDirectory(scope.dotAlchemy);
|
|
29
29
|
}
|
|
30
30
|
/**
|
|
31
31
|
* Delete local durable object and workflow data for a given Worker script.
|
|
32
32
|
*/
|
|
33
|
-
export async function deleteMiniflareWorkerData(scriptName, input) {
|
|
34
|
-
|
|
33
|
+
export async function deleteMiniflareWorkerData(scope, scriptName, input) {
|
|
34
|
+
const persistRoot = path.resolve(getDefaultPersistPath(scope.rootDir));
|
|
35
|
+
await Promise.all(input.durableObjects.map((durableObject) => removeDirectory(path.join(persistRoot, "do", `${scriptName}-${durableObject.className}`), {
|
|
35
36
|
recursive: true,
|
|
36
37
|
})));
|
|
37
|
-
await Promise.all(input.workflows.map((workflow) => removeDirectory(path.join(
|
|
38
|
+
await Promise.all(input.workflows.map((workflow) => removeDirectory(path.join(persistRoot, "workflows", `miniflare-workflows-${workflow.workflowName}`), {
|
|
38
39
|
recursive: true,
|
|
39
40
|
})));
|
|
40
|
-
await cleanMiniflareDirectory();
|
|
41
|
+
await cleanMiniflareDirectory(persistRoot);
|
|
41
42
|
}
|
|
42
43
|
/**
|
|
43
44
|
* Delete the miniflare directory iff it is empty.
|
|
44
45
|
*/
|
|
45
|
-
async function cleanMiniflareDirectory() {
|
|
46
|
-
const directory = path.resolve("
|
|
46
|
+
async function cleanMiniflareDirectory(dotAlchemy) {
|
|
47
|
+
const directory = path.resolve(dotAlchemy, "miniflare");
|
|
47
48
|
const files = await fs
|
|
48
49
|
.readdir(directory, {
|
|
49
50
|
recursive: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"delete.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/delete.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"miniflare-controller.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAKvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAGnE,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,4BAA4B,EAAE,mBAAmB,GAAG,SAAS,CAAC;CACnE;AAED,qBAAa,mBAAmB;IAC9B,KAAK,kBAAyB;IAC9B,SAAS,EAAE,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;IAC3C,OAAO,uCAA8C;IACrD,YAAY,oCAA2C;IACvD,aAAa,0BAAiC;IAC9C,KAAK,aAAoB;IAEzB,MAAM,KAAK,SAAS,wBAGnB;IAEK,GAAG,CAAC,KAAK,EAAE,oBAAoB;YA2BvB,KAAK;YAiBL,MAAM;YA8CN,mBAAmB;IAuB3B,OAAO;CAQd"}
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import * as miniflare from "miniflare";
|
|
2
2
|
import assert from "node:assert";
|
|
3
3
|
import path from "node:path";
|
|
4
|
+
import { Scope } from "../../scope.js";
|
|
4
5
|
import { findOpenPort } from "../../util/find-open-port.js";
|
|
5
6
|
import { logger } from "../../util/logger.js";
|
|
6
7
|
import { AsyncMutex } from "../../util/mutex.js";
|
|
7
8
|
import { buildWorkerOptions, } from "./build-worker-options.js";
|
|
8
9
|
import { MiniflareWorkerProxy } from "./miniflare-worker-proxy.js";
|
|
9
|
-
import {
|
|
10
|
+
import { getDefaultPersistPath } from "./paths.js";
|
|
10
11
|
export class MiniflareController {
|
|
11
12
|
abort = new AbortController();
|
|
12
13
|
miniflare;
|
|
@@ -15,8 +16,8 @@ export class MiniflareController {
|
|
|
15
16
|
remoteProxies = new Map();
|
|
16
17
|
mutex = new AsyncMutex();
|
|
17
18
|
static get singleton() {
|
|
18
|
-
globalThis.ALCHEMY_MINIFLARE_CONTROLLER ??=
|
|
19
|
-
|
|
19
|
+
return (globalThis.ALCHEMY_MINIFLARE_CONTROLLER ??=
|
|
20
|
+
new MiniflareController());
|
|
20
21
|
}
|
|
21
22
|
async add(input) {
|
|
22
23
|
const { watch, remoteProxy } = await buildWorkerOptions(input);
|
|
@@ -61,7 +62,7 @@ export class MiniflareController {
|
|
|
61
62
|
return await this.mutex.lock(async () => {
|
|
62
63
|
const options = {
|
|
63
64
|
workers: [],
|
|
64
|
-
defaultPersistRoot: path.resolve(
|
|
65
|
+
defaultPersistRoot: path.resolve(getDefaultPersistPath(Scope.current.rootDir)),
|
|
65
66
|
unsafeDevRegistryPath: miniflare.getDefaultDevRegistryPath(),
|
|
66
67
|
log: process.env.DEBUG
|
|
67
68
|
? new miniflare.Log(miniflare.LogLevel.DEBUG)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AACvC,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACL,kBAAkB,GAEnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"miniflare-controller.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/miniflare-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
* Used to disable path validation during dynamic imports.
|
|
3
3
|
*/
|
|
4
4
|
export declare const withSkipPathValidation: <T>(callback: () => T) => T;
|
|
5
|
-
export declare const
|
|
6
|
-
export declare const
|
|
7
|
-
export declare const validateConfigPath: (path
|
|
8
|
-
export declare const validatePersistPath: (path
|
|
5
|
+
export declare const getDefaultConfigPath: (rootDir?: string) => string;
|
|
6
|
+
export declare const getDefaultPersistPath: (rootDir?: string) => string;
|
|
7
|
+
export declare const validateConfigPath: (path: string, throws?: boolean) => string;
|
|
8
|
+
export declare const validatePersistPath: (path: string, throws?: boolean) => string;
|
|
9
9
|
//# sourceMappingURL=paths.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,CAAC,EAAE,UAAU,MAAM,CAAC,MAE1D,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,UAAS,MAAsB,WAEnE,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,UAAS,MAAqB,WAEnE,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,MAAM,EAAE,gBAAa,WAQ7D,CAAC;AAMF,eAAO,MAAM,mBAAmB,GAC9B,MAAM,MAAM,EACZ,gBAAiC,WAelC,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
2
|
import { existsSync, readlinkSync, statSync } from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { ALCHEMY_ROOT } from "../../util/root-dir.js";
|
|
3
5
|
const dynamicImportContext = new AsyncLocalStorage();
|
|
4
6
|
/**
|
|
5
7
|
* Used to disable path validation during dynamic imports.
|
|
@@ -7,9 +9,13 @@ const dynamicImportContext = new AsyncLocalStorage();
|
|
|
7
9
|
export const withSkipPathValidation = (callback) => {
|
|
8
10
|
return dynamicImportContext.run(true, callback);
|
|
9
11
|
};
|
|
10
|
-
export const
|
|
11
|
-
|
|
12
|
-
|
|
12
|
+
export const getDefaultConfigPath = (rootDir = process.cwd()) => {
|
|
13
|
+
return path.join(rootDir, ".alchemy", "local", "wrangler.jsonc");
|
|
14
|
+
};
|
|
15
|
+
export const getDefaultPersistPath = (rootDir = ALCHEMY_ROOT) => {
|
|
16
|
+
return path.join(rootDir, ".alchemy", "miniflare", "v3");
|
|
17
|
+
};
|
|
18
|
+
export const validateConfigPath = (path, throws = true) => {
|
|
13
19
|
if (!existsSync(path)) {
|
|
14
20
|
warnOrThrow(`The Wrangler config path, "${path}", could not be found. Please run \`alchemy dev\` or \`alchemy deploy\` to create it.`, throws);
|
|
15
21
|
}
|
|
@@ -17,7 +23,7 @@ export const validateConfigPath = (path = DEFAULT_CONFIG_PATH, throws = true) =>
|
|
|
17
23
|
};
|
|
18
24
|
const DEFAULT_VALIDATE_PERSIST = process.env.NODE_ENV === "development" ||
|
|
19
25
|
!process.argv.some((arg) => ["build", "prepare", "typegen"].includes(arg));
|
|
20
|
-
export const validatePersistPath = (path
|
|
26
|
+
export const validatePersistPath = (path, throws = DEFAULT_VALIDATE_PERSIST) => {
|
|
21
27
|
try {
|
|
22
28
|
const stat = statSync(path);
|
|
23
29
|
if (stat.isSymbolicLink()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,MAAM,oBAAoB,GAAG,IAAI,iBAAiB,EAAW,CAAC;AAE9D;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAI,QAAiB,EAAE,EAAE;IAC7D,OAAO,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,UAAkB,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;IACtE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC;AACnE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,UAAkB,YAAY,EAAE,EAAE;IACtE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE;IAChE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,WAAW,CACT,8BAA8B,IAAI,uFAAuF,EACzH,MAAM,CACP,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,wBAAwB,GAC5B,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa;IACtC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,CACjC,IAAY,EACZ,MAAM,GAAG,wBAAwB,EACjC,EAAE;IACF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;YAC1B,OAAO,YAAY,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,WAAW,CACT,2BAA2B,IAAI,iIAAiI,EAChK,MAAM,CACP,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;AAEjC,MAAM,WAAW,GAAG,CAAC,OAAe,EAAE,MAAe,EAAE,EAAE;IACvD,IAAI,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACtB,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"symlink-miniflare-state.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/symlink-miniflare-state.ts"],"names":[],"mappings":"AAIA,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,iBAcvE"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { getDefaultPersistPath } from "./paths.js";
|
|
4
|
+
export async function writeMiniflareSymlink(rootDir, cwd) {
|
|
5
|
+
const target = path.resolve(getDefaultPersistPath(cwd));
|
|
6
|
+
await fs.mkdir(target, { recursive: true });
|
|
7
|
+
if (cwd === process.cwd()) {
|
|
8
|
+
return;
|
|
9
|
+
}
|
|
10
|
+
const persistPath = path.resolve(cwd, getDefaultPersistPath(rootDir));
|
|
11
|
+
console.log("link", target, persistPath);
|
|
12
|
+
await fs.mkdir(path.dirname(persistPath), { recursive: true });
|
|
13
|
+
await fs.symlink(target, persistPath).catch((e) => {
|
|
14
|
+
if (e.code !== "EEXIST") {
|
|
15
|
+
throw e;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=symlink-miniflare-state.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"symlink-miniflare-state.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/symlink-miniflare-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAe,EAAE,GAAW;IACtE,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;IACxD,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,IAAI,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QAC1B,OAAO;IACT,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,qBAAqB,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/D,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;QAChD,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxB,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/lib/cloudflare/next.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import
|
|
3
|
+
import pc from "picocolors";
|
|
4
4
|
import { getPackageManagerRunner } from "../util/detect-package-manager.js";
|
|
5
5
|
import { exists } from "../util/exists.js";
|
|
6
6
|
import ignore from "../util/ignore-matcher.js";
|
|
@@ -11,7 +11,7 @@ export async function Nextjs(id, props = {}) {
|
|
|
11
11
|
const isIgnored = await isFileIgnored("wrangler.jsonc", props.cwd);
|
|
12
12
|
if (!isIgnored) {
|
|
13
13
|
logger.warn([
|
|
14
|
-
bold(`The ${cyan("wrangler.jsonc")} file for Next.js ${cyan(`"${id}"`)} is not ignored.`),
|
|
14
|
+
pc.bold(`The ${pc.cyan("wrangler.jsonc")} file for Next.js ${pc.cyan(`"${id}"`)} is not ignored.`),
|
|
15
15
|
"This may cause unexpected behavior. Please add the file to your .gitignore.",
|
|
16
16
|
].join(" "));
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"next.js","sourceRoot":"","sources":["../../src/cloudflare/next.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,mCAAmC,CAAC;AAC5E,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAG3C,OAAO,EAAE,OAAO,EAAqB,MAAM,cAAc,CAAC;AAS1D,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,EAAU,EACV,QAAwB,EAAE;IAE1B,MAAM,MAAM,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAC/C,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,gBAAgB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CACT;YACE,EAAE,CAAC,IAAI,CACL,OAAO,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,kBAAkB,CAC1F;YACD,6EAA6E;SAC9E,CAAC,IAAI,CAAC,GAAG,CAAC,CACZ,CAAC;IACJ,CAAC;IACD,OAAO,MAAM,OAAO,CAAC,EAAE,EAAE;QACvB,GAAG,KAAK;QACR,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,sBAAsB;QACtD,QAAQ,EAAE;YACR,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,SAAS;YAClB,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;SAC1B;QACD,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE;YACnC,OAAO,EAAE,GAAG,MAAM,8BAA8B;YAChD,GAAG,EAAE;gBACH,UAAU,EAAE,YAAY;aACzB;SACF,CAAC;QACF,GAAG,EAAE,gBAAgB,CAAC,KAAK,CAAC,GAAG,EAAE;YAC/B,OAAO,EAAE,GAAG,MAAM,WAAW;YAC7B,GAAG,EAAE;gBACH,UAAU,EAAE,aAAa;aAC1B;SACF,CAAC;QAEF,iEAAiE;QACjE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QAEjC,GAAG,EAAE,KAAK;QACV,kBAAkB,EAAE;YAClB,eAAe;YACf,8BAA8B;YAC9B,GAAG,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC;SACpC;QACD,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,mBAAmB;KAC5C,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,KAAK,EAAE,QAAgB,EAAE,GAAY,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC;IAEzB,wEAAwE;IACxE,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACpD,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,OAAO,UAAU,KAAK,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAC1D,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAClE,yCAAyC;YACzC,iBAAiB,CAAC,OAAO,CACvB,GAAG,gBAAgB;iBAChB,KAAK,CAAC,IAAI,CAAC;iBACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC1D,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,0DAA0D;QAC5D,CAAC;QACD,IAAI,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YAChD,MAAM;QACR,CAAC;QACD,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAE/B,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;AACnC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,KAAiC,EACjC,QAGC,EAC2B,EAAE;IAC9B,OAAO;QACL,OAAO,EACL,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC;QAC1E,GAAG,EAAE;YACH,GAAG,QAAQ,CAAC,GAAG;YACf,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD;QACD,OAAO,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS;KAChE,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/nuxt/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/nuxt/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAQ5E,QAAA,MAAM,OAAO,GACX,UAAS,OAAO,CAAC,iBAAiB,CAAM,KACvC,iBAcF,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { validateConfigPath, validatePersistPath } from "../miniflare/paths.js";
|
|
1
|
+
import { getDefaultConfigPath, getDefaultPersistPath, validateConfigPath, validatePersistPath, } from "../miniflare/paths.js";
|
|
2
2
|
const alchemy = (options = {}) => {
|
|
3
3
|
return {
|
|
4
4
|
nodeCompat: true,
|
|
5
5
|
dev: {
|
|
6
|
-
configPath: validateConfigPath(options.dev?.configPath),
|
|
7
|
-
persistDir: validatePersistPath(options.dev?.persistDir),
|
|
6
|
+
configPath: validateConfigPath(options.dev?.configPath ?? getDefaultConfigPath()),
|
|
7
|
+
persistDir: validatePersistPath(options.dev?.persistDir ?? getDefaultPersistPath()),
|
|
8
8
|
...options.dev,
|
|
9
9
|
},
|
|
10
10
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/nuxt/plugin.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/nuxt/plugin.ts"],"names":[],"mappings":"AACA,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,OAAO,GAAG,CACd,UAAsC,EAAE,EACrB,EAAE;IACrB,OAAO;QACL,UAAU,EAAE,IAAI;QAChB,GAAG,EAAE;YACH,UAAU,EAAE,kBAAkB,CAC5B,OAAO,CAAC,GAAG,EAAE,UAAU,IAAI,oBAAoB,EAAE,CAClD;YACD,UAAU,EAAE,mBAAmB,CAC7B,OAAO,CAAC,GAAG,EAAE,UAAU,IAAI,qBAAqB,EAAE,CACnD;YACD,GAAG,OAAO,CAAC,GAAG;SACf;QACD,GAAG,OAAO;KACX,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { redwood } from "rwsdk/vite";
|
|
2
|
-
import {
|
|
2
|
+
import { getDefaultConfigPath } from "../miniflare/paths.js";
|
|
3
3
|
import alchemyVite from "../vite/plugin.js";
|
|
4
4
|
const alchemyRedwood = (options) => {
|
|
5
|
-
const configPath = options?.configPath ??
|
|
5
|
+
const configPath = options?.configPath ?? getDefaultConfigPath();
|
|
6
6
|
return [
|
|
7
7
|
redwood({
|
|
8
8
|
...options,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/redwood/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA6B,MAAM,YAAY,CAAC;AAEhE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/redwood/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA6B,MAAM,YAAY,CAAC;AAEhE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,WAAW,MAAM,mBAAmB,CAAC;AAE5C,MAAM,cAAc,GAAG,CAAC,OAA8B,EAAgB,EAAE;IACtE,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,CAAC;IACjE,OAAO;QACL,OAAO,CAAC;YACN,GAAG,OAAO;YACV,UAAU;YACV,uBAAuB,EAAE,KAAK;SAC/B,CAAiB;QAClB,WAAW,CAAC;YACV,UAAU;YACV,eAAe,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SACpC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAExE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAQzC,QAAA,MAAM,OAAO,GAAI,SAAS,YAAY,KAAG,YAuBxC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -1,18 +1,21 @@
|
|
|
1
1
|
import { cloudflare } from "@cloudflare/vite-plugin";
|
|
2
2
|
import path from "node:path";
|
|
3
|
-
import {
|
|
3
|
+
import { getDefaultConfigPath, getDefaultPersistPath, validateConfigPath, validatePersistPath, } from "../miniflare/paths.js";
|
|
4
4
|
const alchemy = (config) => {
|
|
5
5
|
const persistState = config?.persistState ?? {
|
|
6
6
|
path: validatePersistPath(typeof config?.persistState === "object"
|
|
7
7
|
? config.persistState.path
|
|
8
|
-
:
|
|
8
|
+
: // persist path should default to the /.alchemy/miniflare/v3
|
|
9
|
+
getDefaultPersistPath()),
|
|
9
10
|
};
|
|
10
11
|
if (typeof persistState === "object" && persistState.path.endsWith("v3")) {
|
|
11
12
|
persistState.path = path.dirname(persistState.path);
|
|
12
13
|
}
|
|
13
14
|
return cloudflare({
|
|
14
15
|
...config,
|
|
15
|
-
configPath: validateConfigPath(
|
|
16
|
+
configPath: validateConfigPath(
|
|
17
|
+
// config path doesn't need to be in the root, it can be in the app dir
|
|
18
|
+
config?.configPath ?? getDefaultConfigPath()),
|
|
16
19
|
persistState,
|
|
17
20
|
experimental: config?.experimental ?? {
|
|
18
21
|
remoteBindings: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,yBAAyB,CAAC;AACxE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,OAAO,GAAG,CAAC,MAAqB,EAAgB,EAAE;IACtD,MAAM,YAAY,GAAG,MAAM,EAAE,YAAY,IAAI;QAC3C,IAAI,EAAE,mBAAmB,CACvB,OAAO,MAAM,EAAE,YAAY,KAAK,QAAQ;YACtC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI;YAC1B,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../../../src/cloudflare/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,yBAAyB,CAAC;AACxE,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EACL,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAE/B,MAAM,OAAO,GAAG,CAAC,MAAqB,EAAgB,EAAE;IACtD,MAAM,YAAY,GAAG,MAAM,EAAE,YAAY,IAAI;QAC3C,IAAI,EAAE,mBAAmB,CACvB,OAAO,MAAM,EAAE,YAAY,KAAK,QAAQ;YACtC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI;YAC1B,CAAC,CAAC,4DAA4D;gBAC5D,qBAAqB,EAAE,CAC5B;KACF,CAAC;IACF,IAAI,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACzE,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,UAAU,CAAC;QAChB,GAAG,MAAM;QACT,UAAU,EAAE,kBAAkB;QAC5B,uEAAuE;QACvE,MAAM,EAAE,UAAU,IAAI,oBAAoB,EAAE,CAC7C;QACD,YAAY;QACZ,YAAY,EAAE,MAAM,EAAE,YAAY,IAAI;YACpC,cAAc,EAAE,IAAI;SACrB;KACF,CAAiB,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"website.d.ts","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAI9C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,QAAQ,CAC9C,SAAQ,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC9C;;;;OAIG;IACH,KAAK,CAAC,EACF,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,OAAO,GAAG;YAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;KAC5C,CAAC;IACN;;OAEG;IACH,GAAG,CAAC,EACA,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;IACN;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAC1D;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;;;;;;WASG;QACH,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,gBAAgB,KACnB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAClD;;;;WAIG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC/D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,OAAO,CAAC,CAAC,SAAS,QAAQ,EAC9C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"website.d.ts","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAI9C,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,WAAW,YAAY,CAAC,CAAC,SAAS,QAAQ,CAC9C,SAAQ,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC;IAC9C;;;;OAIG;IACH,KAAK,CAAC,EACF,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC7B;;;;;;;;;;;;;;;;;;;;;;;WAuBG;QACH,OAAO,CAAC,EAAE,OAAO,GAAG;YAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;SAAE,CAAC;KAC5C,CAAC;IACN;;OAEG;IACH,GAAG,CAAC,EACA,MAAM,GACN;QACE;;WAEG;QACH,OAAO,EAAE,MAAM,CAAC;QAChB;;WAEG;QACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC9B,CAAC;IACN;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,CAAC;QAAE,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY,CAAC,CAAC;IAC1D;;;;OAIG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IACd;;OAEG;IACH,QAAQ,CAAC,EAAE;QACT;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;WAIG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;;;;;;;;WASG;QACH,SAAS,CAAC,EAAE,CACV,IAAI,EAAE,gBAAgB,KACnB,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;QAClD;;;;WAIG;QACH,OAAO,CAAC,EAAE,OAAO,CAAC;KACnB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG;QAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;CAC5C;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC/D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC,wBAAsB,OAAO,CAAC,CAAC,SAAS,QAAQ,EAC9C,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,YAAY,CAAC,CAAC,CAAC,uBA+MvB"}
|
|
@@ -9,7 +9,7 @@ import { logger } from "../util/logger.js";
|
|
|
9
9
|
import { Assets } from "./assets.js";
|
|
10
10
|
import { DEFAULT_COMPATIBILITY_DATE } from "./compatibility-date.gen.js";
|
|
11
11
|
import { unionCompatibilityFlags } from "./compatibility-presets.js";
|
|
12
|
-
import {
|
|
12
|
+
import { writeMiniflareSymlink } from "./miniflare/symlink-miniflare-state.js";
|
|
13
13
|
import { Worker } from "./worker.js";
|
|
14
14
|
import { WranglerJson } from "./wrangler.json.js";
|
|
15
15
|
export async function Website(id, props) {
|
|
@@ -93,7 +93,9 @@ export async function Website(id, props) {
|
|
|
93
93
|
};`;
|
|
94
94
|
await fs.writeFile(paths.entrypoint, content);
|
|
95
95
|
}
|
|
96
|
-
|
|
96
|
+
if (Scope.current.local) {
|
|
97
|
+
await writeMiniflareSymlink(Scope.current.rootDir, paths.cwd);
|
|
98
|
+
}
|
|
97
99
|
await WranglerJson({
|
|
98
100
|
path: path.relative(paths.cwd, paths.wrangler.path),
|
|
99
101
|
worker,
|
|
@@ -116,6 +118,7 @@ export async function Website(id, props) {
|
|
|
116
118
|
...env,
|
|
117
119
|
...(typeof build === "object" ? build.env : {}),
|
|
118
120
|
NODE_ENV: "production",
|
|
121
|
+
ALCHEMY_ROOT: Scope.current.rootDir,
|
|
119
122
|
},
|
|
120
123
|
memoize: typeof build === "object" ? build.memoize : undefined,
|
|
121
124
|
});
|
|
@@ -168,18 +171,4 @@ export async function Website(id, props) {
|
|
|
168
171
|
dev: url ? { url } : undefined,
|
|
169
172
|
}));
|
|
170
173
|
}
|
|
171
|
-
async function writeMiniflareSymlink(cwd) {
|
|
172
|
-
const target = path.resolve(DEFAULT_PERSIST_PATH);
|
|
173
|
-
await fs.mkdir(target, { recursive: true });
|
|
174
|
-
if (cwd === process.cwd()) {
|
|
175
|
-
return;
|
|
176
|
-
}
|
|
177
|
-
const persistPath = path.resolve(cwd, DEFAULT_PERSIST_PATH);
|
|
178
|
-
await fs.mkdir(path.dirname(persistPath), { recursive: true });
|
|
179
|
-
await fs.symlink(target, persistPath).catch((e) => {
|
|
180
|
-
if (e.code !== "EEXIST") {
|
|
181
|
-
throw e;
|
|
182
|
-
}
|
|
183
|
-
});
|
|
184
|
-
}
|
|
185
174
|
//# sourceMappingURL=website.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"website.js","sourceRoot":"","sources":["../../src/cloudflare/website.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,OAAO,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAqB,MAAM,EAAoB,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAyB,MAAM,oBAAoB,CAAC;AAmIzE,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,EAAU,EACV,KAAsB;IAEtB,MAAM,EACJ,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC,EAC3C,KAAK,EAAE,UAAU,EACjB,MAAM,EACN,GAAG,EACH,MAAM,EACN,GAAG,GAAG,IAAI,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,GAAG,WAAW,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,CACJ,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAC7B,6CAA6C,CAC9C,CAAC;IACF,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,QAAQ,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,CAAC,QAAQ,CACb,yEAAyE,CAC1E,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,CAAC,QAAQ,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;QAClB,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC;QAC3D,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO;gBACL,OAAO;gBACP,GAAG,EAAE,UAAU;gBACf,OAAO;aACR,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,KAAK,GAAG,CAAC,GAAG,EAAE;QAClB,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACvC,OAAO;YACL,GAAG;YACH,MAAM,EAAE,IAAI,CAAC,OAAO,CAClB,GAAG,EACH,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,IAAI,MAAM,CAAC,CACpE;YACD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC;YAC1C,UAAU,EAAE,IAAI,CAAC,OAAO,CACtB,GAAG,EACH,KAAK,CAAC,UAAU,IAAI,0BAA0B,CAC/C;YACD,IAAI,QAAQ;gBACV,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,OAAO,CAChB,GAAG,EACH,KAAK,CAAC,QAAQ,EAAE,IAAI,IAAI,+BAA+B,CACxD;oBACD,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,IAAI;wBACxB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;wBACxC,CAAC,CAAC,IAAI,CAAC,UAAU;iBACpB,CAAC;YACJ,CAAC;SACF,CAAC;IACJ,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC;IACjE,MAAM,GAAG,GAAG;QACV,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC;QACtB,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;QACpB,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,EAAE,CAAC;gBAC9D,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;YACxB,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CACH;KACF,CAAC;IACF,MAAM,MAAM,GAAG;QACb,GAAG,WAAW;QACd,IAAI;QACJ,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC;QAC5C,kBAAkB,EAAE,uBAAuB,CACzC,WAAW,CAAC,aAAa,EACzB,WAAW,CAAC,kBAAkB,CAC/B;QACD,iBAAiB,EACf,WAAW,CAAC,iBAAiB,IAAI,0BAA0B;QAC7D,MAAM,EAAE;YACN,aAAa,EAAE,qBAAqB;YACpC,kBAAkB,EAAE,GAAG,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,MAAM;YAC5D,gBAAgB,EAAE,KAAK;YACvB,GAAG,CAAC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;SAC1D;QACD,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC;KAClB,CAAC;IAEvC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC;QAC5B,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACpE,MAAM,OAAO,GACX,MAAM;YACN,MAAM,CAAA;;;;;SAKH,CAAC;QACN,MAAM,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IAED,MAAM,YAAY,CAAC;QACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnD,MAAM;QACN,MAAM,EAAE;YACN,OAAO,EAAE,QAAQ;YACjB,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC;SAClD;QACD,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;QACnD,OAAO;QACP,SAAS,EAAE;YACT,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS;SACpC;KACF,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;IAE5B,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAC1B,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE;YACxB,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC;YAC5C,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,GAAG,EAAE;gBACH,GAAG,GAAG;gBACN,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/C,QAAQ,EAAE,YAAY;gBACtB,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,OAAO;aACpC;YACD,OAAO,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SAC/D,CAAC,CAAC;IACL,CAAC;IAED,IAAI,GAAuB,CAAC;IAC5B,IAAI,GAAG,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QACvB,GAAG,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;YAC5B,GAAG,EAAE,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO;YAChD,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;gBAChB,MAAM,SAAS,GACb,wFAAwF,CAAC;gBAC3F,MAAM,KAAK,GAAG,IAAI;qBACf,OAAO,CAAC,wBAAwB,EAAE,EAAE,CAAC;qBACrC,KAAK,CAAC,SAAS,CAAC,CAAC;gBACpB,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;YACH,CAAC;YACD,GAAG,EAAE;gBACH,GAAG,MAAM,CAAC,WAAW,CACnB,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBACjD,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;wBACpB,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;oBACpC,CAAC;oBACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC9B,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;oBACxB,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC,CACH;gBACD,GAAG,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3C,WAAW,EAAE,GAAG;gBAChB,GAAG,OAAO,CAAC,GAAG;gBACd,4FAA4F;gBAC5F,uHAAuH;gBACvH,QAAQ,EAAE,aAAa;aACxB;SACF,CAAC,CAAC;IACL,CAAC;IAED,OAAO,CAAC,MAAM,MAAM,CAAC,EAAE,EAAE;QACvB,GAAG,MAAM;QACT,QAAQ,EAAE;YACR,GAAG,MAAM,CAAC,QAAQ;YAClB,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK;gBACd,CAAC,CAAC;oBACE,MAAM,EAAE,MAAM,MAAM,CAAC,QAAQ,EAAE;wBAC7B,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC;qBACjD,CAAC;iBACH;gBACH,CAAC,CAAC,EAAE,CAAC;SACR;QACD,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS;KAC/B,CAAC,CAAe,CAAC;AACpB,CAAC"}
|