@webflow/cloud-app 0.1.0-beta.7 → 0.1.0-beta.8
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 +68 -0
- package/dist/config/webflow-json.d.ts +0 -6
- package/dist/config/webflow-json.d.ts.map +1 -1
- package/dist/config/webflow-json.js.map +1 -1
- package/dist/create-webflow-json.d.ts +2 -5
- package/dist/create-webflow-json.d.ts.map +1 -1
- package/dist/create-webflow-json.js +7 -9
- package/dist/create-webflow-json.js.map +1 -1
- package/dist/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.d.ts +28 -0
- package/dist/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.d.ts.map +1 -0
- package/dist/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.js +148 -0
- package/dist/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.js.map +1 -0
- package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.d.ts +2 -2
- package/dist/frameworks/astro/adapter-patches/ensure-fixed-cloudflare-adapter.js +2 -2
- package/dist/frameworks/astro/astro5.d.ts.map +1 -1
- package/dist/frameworks/astro/astro5.js +22 -5
- package/dist/frameworks/astro/astro5.js.map +1 -1
- package/dist/frameworks/astro/astro6.d.ts.map +1 -1
- package/dist/frameworks/astro/astro6.js +27 -10
- package/dist/frameworks/astro/astro6.js.map +1 -1
- package/dist/frameworks/astro/astro7.d.ts.map +1 -1
- package/dist/frameworks/astro/astro7.js +25 -8
- package/dist/frameworks/astro/astro7.js.map +1 -1
- package/dist/frameworks/astro/templates/v5/webflow-loader.ts +58 -35
- package/dist/frameworks/astro/templates/v6/webflow-loader.ts +53 -39
- package/dist/frameworks/astro/templates/v7/webflow-loader.ts +51 -39
- package/dist/frameworks/astro/templates/webflow-image-url.ts +140 -0
- package/dist/frameworks/base.d.ts +1 -1
- package/dist/frameworks/base.js +1 -1
- package/dist/frameworks/static/index.d.ts +23 -0
- package/dist/frameworks/static/index.d.ts.map +1 -1
- package/dist/frameworks/static/index.js +51 -9
- package/dist/frameworks/static/index.js.map +1 -1
- package/dist/frameworks/types.d.ts +6 -6
- package/dist/frameworks/types.d.ts.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/pipeline.d.ts +4 -0
- package/dist/pipeline.d.ts.map +1 -1
- package/dist/pipeline.js +21 -10
- package/dist/pipeline.js.map +1 -1
- package/dist/ports/command-runner.d.ts +5 -6
- package/dist/ports/command-runner.d.ts.map +1 -1
- package/dist/ports/command-runner.js +17 -7
- package/dist/ports/command-runner.js.map +1 -1
- package/package.json +2 -1
package/README.md
CHANGED
|
@@ -91,3 +91,71 @@ npm test # jest
|
|
|
91
91
|
npm run build # tsc → dist/
|
|
92
92
|
npm run type-check
|
|
93
93
|
```
|
|
94
|
+
|
|
95
|
+
## How consumers resolve this package
|
|
96
|
+
|
|
97
|
+
Two consumers build with this engine: the Webflow CLI (`apps/webflow-cli`, same
|
|
98
|
+
monorepo) and the cosmic-builder image (`webflow/infrastructure`, a separate
|
|
99
|
+
repo). Which copy of `@webflow/cloud-app` they load is decided by **where
|
|
100
|
+
`npm install` ran**, not by how the code is bundled and not at runtime — a
|
|
101
|
+
`require("@webflow/cloud-app")` just reads whatever `npm` put in `node_modules`.
|
|
102
|
+
|
|
103
|
+
| Scenario | `node_modules/@webflow/cloud-app` is… | Source |
|
|
104
|
+
| ---------------------------------------------------------------------------- | ------------------------------------- | --------------------- |
|
|
105
|
+
| End user runs `npm i -g @webflow/webflow-cli` | the registry copy npm fetched | npm registry |
|
|
106
|
+
| Engineer working in the webflow-cli repo (`npm ci`, build, run local `dist`) | a symlink to `apps/webflow-cloud-app` | workspace (repo tree) |
|
|
107
|
+
| CI for webflow-cli (unit, regression, e2e) | a symlink to `apps/webflow-cloud-app` | workspace (repo tree) |
|
|
108
|
+
| cosmic-builder (separate repo) | the registry copy npm fetched | npm registry |
|
|
109
|
+
|
|
110
|
+
- **Inside this monorepo the CLI always uses the workspace copy.**
|
|
111
|
+
`apps/webflow-cloud-app` is a workspace member, so npm links it by name
|
|
112
|
+
while the declared version matches — `apps/webflow-cli`
|
|
113
|
+
depends on it at an exact pin equal to this package's version (enforced in CI
|
|
114
|
+
by `npm run check:cloud-app-pin`; a mismatched pin would make npm silently
|
|
115
|
+
install the registry copy instead). Edit the source here and it takes effect on
|
|
116
|
+
the next build.
|
|
117
|
+
- **The published CLI uses the registry copy.** The engine is kept external in
|
|
118
|
+
the CLI's tsup bundle (it is CJS, not inlined), so the shipped `dist` keeps
|
|
119
|
+
`require("@webflow/cloud-app")` and resolves it at the user's install time.
|
|
120
|
+
The CLI's `package.json` carries an exact pin (not a caret, since this is a
|
|
121
|
+
prerelease line the CLI is built and tested against), so released builds
|
|
122
|
+
resolve exactly that version from npm.
|
|
123
|
+
- **cosmic-builder is a different repo**, so it has no workspace copy and always
|
|
124
|
+
resolves from the registry. That is why publishing to npm (below) still
|
|
125
|
+
matters even though the CLI links the workspace in development.
|
|
126
|
+
|
|
127
|
+
## Publishing
|
|
128
|
+
|
|
129
|
+
Published **manually** from this folder — there is no GitHub Action. Its release
|
|
130
|
+
cadence follows the build engine, not the CLI. It is a regular changesets
|
|
131
|
+
workspace package, but `changeset publish` always publishes with `--tag latest`,
|
|
132
|
+
which would move `latest` onto a beta, so it must already be on npm before a CLI
|
|
133
|
+
release: `publish-packages.sh` refuses to run otherwise, and skips it once it is.
|
|
134
|
+
Don't add changesets for this package — changesets can't increment a prerelease
|
|
135
|
+
(it would turn `0.1.0-beta.7` into `0.1.0`); bump the version by hand. CI fails
|
|
136
|
+
(`npm run check:cloud-app-pin`) if a changeset names it.
|
|
137
|
+
|
|
138
|
+
This is a prerelease line (`0.1.0-beta.x`), so always pass an explicit
|
|
139
|
+
`--tag` — npm would otherwise move the `latest` tag onto a beta. The CLI pins
|
|
140
|
+
this exact version, so move the pin in the same PR (CI runs
|
|
141
|
+
`npm run check:cloud-app-pin`):
|
|
142
|
+
|
|
143
|
+
```bash
|
|
144
|
+
# from apps/webflow-cloud-app
|
|
145
|
+
npm version prerelease --preid beta --no-git-tag-version # 0.1.0-beta.7 → 0.1.0-beta.8
|
|
146
|
+
# set "@webflow/cloud-app" in apps/webflow-cli/package.json to the same version
|
|
147
|
+
# and run `npm install` from the repo root
|
|
148
|
+
npm publish --tag beta # installs via @webflow/cloud-app@beta
|
|
149
|
+
```
|
|
150
|
+
|
|
151
|
+
To test a build against the consumers (webflow-cli, cosmic-builder) before a
|
|
152
|
+
real release, publish the same version under a throwaway ticket-scoped tag so
|
|
153
|
+
it never touches `latest` or `beta`:
|
|
154
|
+
|
|
155
|
+
```bash
|
|
156
|
+
npm publish --tag beta7-cloud888 # installs via @webflow/cloud-app@beta7-cloud888
|
|
157
|
+
```
|
|
158
|
+
|
|
159
|
+
Consumers then pin that exact version (e.g. `"@webflow/cloud-app": "0.1.0-beta.8"`)
|
|
160
|
+
and CI resolves it from the registry. Remove a throwaway tag when done with
|
|
161
|
+
`npm dist-tag rm @webflow/cloud-app beta7-cloud888`.
|
|
@@ -31,12 +31,6 @@ export type WebflowJson = {
|
|
|
31
31
|
* Build-only: URL prefix for static assets. NOT part of the deploy contract.
|
|
32
32
|
*/
|
|
33
33
|
assets_path_prefix?: string;
|
|
34
|
-
/**
|
|
35
|
-
* Build-only: skip appending the mount path to the assets source dir
|
|
36
|
-
* (Astro 6 writes to `dist/client/` regardless of mount config). NOT part
|
|
37
|
-
* of the deploy contract.
|
|
38
|
-
*/
|
|
39
|
-
assets_source_skip_mount_path?: boolean;
|
|
40
34
|
[key: string]: unknown;
|
|
41
35
|
};
|
|
42
36
|
[key: string]: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webflow-json.d.ts","sourceRoot":"","sources":["../../src/config/webflow-json.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE;QACN,iGAAiG;QACjG,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB;;;;WAIG;QACH,QAAQ,CAAC,EAAE,eAAe,CAAC;QAC3B;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B
|
|
1
|
+
{"version":3,"file":"webflow-json.d.ts","sourceRoot":"","sources":["../../src/config/webflow-json.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,CAAC,EAAE;QACN,iGAAiG;QACjG,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB;;;;WAIG;QACH,QAAQ,CAAC,EAAE,eAAe,CAAC;QAC3B;;WAEG;QACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,IAAI,SAAiB,GACpB,WAAW,GAAG,SAAS,CAyBzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webflow-json.js","sourceRoot":"","sources":["../../src/config/webflow-json.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"webflow-json.js","sourceRoot":"","sources":["../../src/config/webflow-json.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoDA,0CA6BC;AAjFD,4CAA8B;AAC9B,gDAAkC;AAElC,oDAAsC;AAyCtC;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC7B,GAAW,EACX,GAAW,EACX,IAAI,GAAG,cAAc;IAErB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;QACtD,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,OAAO,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAG,GAAG,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,GAAG,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,EAAE,KAAK,CAAC,uCAAuC,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC3F,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC3E,GAAG,EAAE,KAAK,CAAC,GAAG,QAAQ,uBAAuB,CAAC,CAAC;QAC/C,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,GAAG,CAAC,KAAK,CAAC,UAAU,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC3D,OAAO,MAAqB,CAAC;AAC/B,CAAC"}
|
|
@@ -6,12 +6,9 @@ import type { BuilderClass } from './frameworks/registry';
|
|
|
6
6
|
* Compute the cloud.* fields createWebflowJson would write for a given framework.
|
|
7
7
|
*
|
|
8
8
|
* The returned object satisfies `DeployContractV1` for the contract fields the
|
|
9
|
-
* deployer reads
|
|
10
|
-
* that the contract tolerates via passthrough.
|
|
9
|
+
* deployer reads.
|
|
11
10
|
*/
|
|
12
|
-
export declare function deriveCloudFields(frameworkName: string, builder: FrameworkBuilder | BuilderClass): DeployContractV1
|
|
13
|
-
assets_source_skip_mount_path?: boolean;
|
|
14
|
-
};
|
|
11
|
+
export declare function deriveCloudFields(frameworkName: string, builder: FrameworkBuilder | BuilderClass): DeployContractV1;
|
|
15
12
|
/**
|
|
16
13
|
* Create or update webflow.json with the detected framework and build output
|
|
17
14
|
* info.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-webflow-json.d.ts","sourceRoot":"","sources":["../src/create-webflow-json.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D
|
|
1
|
+
{"version":3,"file":"create-webflow-json.d.ts","sourceRoot":"","sources":["../src/create-webflow-json.ts"],"names":[],"mappings":"AAYA,OAAO,EAEL,KAAK,gBAAgB,EAEtB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,gBAAgB,GAAG,YAAY,GACvC,gBAAgB,CAqClB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,MAAM,EACX,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,gBAAgB,GAAG,YAAY,GACvC,IAAI,CA8EN"}
|
|
@@ -51,8 +51,7 @@ const cosmic_deploy_contract_1 = require("@webflow/cosmic-deploy-contract");
|
|
|
51
51
|
* Compute the cloud.* fields createWebflowJson would write for a given framework.
|
|
52
52
|
*
|
|
53
53
|
* The returned object satisfies `DeployContractV1` for the contract fields the
|
|
54
|
-
* deployer reads
|
|
55
|
-
* that the contract tolerates via passthrough.
|
|
54
|
+
* deployer reads.
|
|
56
55
|
*/
|
|
57
56
|
function deriveCloudFields(frameworkName, builder) {
|
|
58
57
|
const output = typeof builder === 'function'
|
|
@@ -79,18 +78,12 @@ function deriveCloudFields(frameworkName, builder) {
|
|
|
79
78
|
// capability (reads the user's package.json via the builder's ctx), so it's
|
|
80
79
|
// only available for the build-phase instance path — not the deploy-phase
|
|
81
80
|
// BuilderClass path. Omitted when unresolvable (e.g. `workspace:*`, `latest`).
|
|
82
|
-
// CLD-1785.
|
|
83
81
|
if (typeof builder !== 'function') {
|
|
84
82
|
const frameworkVersion = builder.getFrameworkVersion();
|
|
85
83
|
if (frameworkVersion) {
|
|
86
84
|
cloud.framework_version = frameworkVersion;
|
|
87
85
|
}
|
|
88
86
|
}
|
|
89
|
-
// Build-only field, outside the deploy contract but written here so build-phase
|
|
90
|
-
// code can read a single source of truth.
|
|
91
|
-
if (output.assetsSourceSkipMountPath) {
|
|
92
|
-
cloud.assets_source_skip_mount_path = true;
|
|
93
|
-
}
|
|
94
87
|
return cloud;
|
|
95
88
|
}
|
|
96
89
|
/**
|
|
@@ -131,13 +124,17 @@ function createWebflowJson(log, cwd, frameworkName, builder) {
|
|
|
131
124
|
'deployment_type',
|
|
132
125
|
'entrypoint_path',
|
|
133
126
|
'skip_no_bundle',
|
|
134
|
-
'assets_source_skip_mount_path',
|
|
135
127
|
];
|
|
136
128
|
for (const key of trackedKeys) {
|
|
137
129
|
if (existing[key] !== desired[key]) {
|
|
138
130
|
changed.push(`${key}: ${JSON.stringify(existing[key])} -> ${JSON.stringify(desired[key])}`);
|
|
139
131
|
}
|
|
140
132
|
}
|
|
133
|
+
// Retired build-only flag; a stale copy from an earlier version must not be re-emitted. Its
|
|
134
|
+
// presence counts as a change so the file is rewritten even when it is the only difference.
|
|
135
|
+
if ('assets_source_skip_mount_path' in existing) {
|
|
136
|
+
changed.push('assets_source_skip_mount_path: removed (retired)');
|
|
137
|
+
}
|
|
141
138
|
if (changed.length === 0) {
|
|
142
139
|
log.info('webflow.json output metadata is correct, skipping write');
|
|
143
140
|
}
|
|
@@ -145,6 +142,7 @@ function createWebflowJson(log, cwd, frameworkName, builder) {
|
|
|
145
142
|
log.info(`webflow.json output metadata changed: ${changed.join(', ')}`);
|
|
146
143
|
// Apply desired values, preserving any other keys (e.g. assets_path_prefix).
|
|
147
144
|
Object.assign(existing, desired);
|
|
145
|
+
delete existing.assets_source_skip_mount_path;
|
|
148
146
|
}
|
|
149
147
|
// Self-check: a producer should never write a file that fails the deploy
|
|
150
148
|
// contract. Throw here so a builder bug surfaces during build, not deploy.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-webflow-json.js","sourceRoot":"","sources":["../src/create-webflow-json.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"create-webflow-json.js","sourceRoot":"","sources":["../src/create-webflow-json.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Guard for the Astro 6/7 verbatim assets copy (`staticAssetsMirrorUrlLayout`).
|
|
3
|
+
*
|
|
4
|
+
* The generated `astro.config` sets `base = mountPath`, so a correct `@astrojs/cloudflare`
|
|
5
|
+
* (>= 13.3.1 on Astro 6, all 14.x on Astro 7) nests the client tree under
|
|
6
|
+
* `<assetsPath>/<mount>/`, and `copyAssets` copies `assetsPath` as-is into the assets root.
|
|
7
|
+
* A buggy adapter (withastro/astro#16276) emits a FLAT tree instead, which would be published
|
|
8
|
+
* at the wrong URLs, so fail the build rather than ship it.
|
|
9
|
+
*
|
|
10
|
+
* A tree is nested only when `<assetsPath>/<mount>` is a directory AND the mount's top-level
|
|
11
|
+
* directory is the only entry next to adapter/platform metadata files. The mount dir alone is not
|
|
12
|
+
* proof: a flat tree plus a same-named page route (e.g. `src/pages/<mount>/`) also produces
|
|
13
|
+
* `<assetsPath>/<mount>/`. Any other root entry (`_astro/`, a custom `build.assets` dir, public
|
|
14
|
+
* files) means the client tree is flat, so this is deliberately not tied to the `_astro` name.
|
|
15
|
+
*
|
|
16
|
+
* Throws only when ALL of these hold:
|
|
17
|
+
* - the mount is not the root,
|
|
18
|
+
* - the tree is not nested (see above),
|
|
19
|
+
* - `<assetsPath>` exists and holds an entry other than adapter/platform metadata files.
|
|
20
|
+
* Everything else passes: a missing `assetsPath`, a metadata-only tree, and an asset-less app
|
|
21
|
+
* (an empty `<mount>/` dir still counts as nested).
|
|
22
|
+
*
|
|
23
|
+
* `ensureFixedCloudflareAdapter` forces a fixed adapter, which is what keeps this nearly
|
|
24
|
+
* unreachable. It is reachable through a non-semver adapter spec (git URL, `file:`, alias) or a
|
|
25
|
+
* cross-major pin the forced upgrade leaves alone.
|
|
26
|
+
*/
|
|
27
|
+
export declare function assertAdapterNestedUnderMount(cwd: string, assetsPath: string, cleanMountPath: string): void;
|
|
28
|
+
//# sourceMappingURL=assert-adapter-nested-under-mount.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assert-adapter-nested-under-mount.d.ts","sourceRoot":"","sources":["../../../../src/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.ts"],"names":[],"mappings":"AAuCA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,IAAI,CA4CN"}
|
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.assertAdapterNestedUnderMount = assertAdapterNestedUnderMount;
|
|
37
|
+
const fs = __importStar(require("node:fs"));
|
|
38
|
+
const path = __importStar(require("node:path"));
|
|
39
|
+
const errors_1 = require("../../errors");
|
|
40
|
+
/** Adapter/platform metadata that legitimately sits at the assets root, next to the mount dir. */
|
|
41
|
+
const ADAPTER_METADATA_FILES = new Set(['_headers', '_redirects', '.assetsignore', '_routes.json']);
|
|
42
|
+
/**
|
|
43
|
+
* True when `p` is an existing directory. A missing path is not a directory, and neither is a path
|
|
44
|
+
* below a regular file: Node 20 throws ENOTDIR there even with `throwIfNoEntry: false` (Node 22
|
|
45
|
+
* returns undefined), so treat both as "not a directory". Other errors (e.g. EACCES) surface as a
|
|
46
|
+
* `FrameworkBuildError` with the original error as `cause`, so hosts can classify them.
|
|
47
|
+
*/
|
|
48
|
+
function isDirectory(p) {
|
|
49
|
+
try {
|
|
50
|
+
return fs.statSync(p).isDirectory();
|
|
51
|
+
}
|
|
52
|
+
catch (e) {
|
|
53
|
+
const code = e.code;
|
|
54
|
+
if (code === 'ENOENT' || code === 'ENOTDIR') {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
throw new errors_1.FrameworkBuildError(`Failed to inspect the build output: ${e.message}`, {
|
|
58
|
+
cause: e,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/** Directory entries of `dir`; fs errors surface as a `FrameworkBuildError` like `isDirectory`. */
|
|
63
|
+
function listEntries(dir) {
|
|
64
|
+
try {
|
|
65
|
+
return fs.readdirSync(dir);
|
|
66
|
+
}
|
|
67
|
+
catch (e) {
|
|
68
|
+
throw new errors_1.FrameworkBuildError(`Failed to inspect the build output: ${e.message}`, {
|
|
69
|
+
cause: e,
|
|
70
|
+
});
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Guard for the Astro 6/7 verbatim assets copy (`staticAssetsMirrorUrlLayout`).
|
|
75
|
+
*
|
|
76
|
+
* The generated `astro.config` sets `base = mountPath`, so a correct `@astrojs/cloudflare`
|
|
77
|
+
* (>= 13.3.1 on Astro 6, all 14.x on Astro 7) nests the client tree under
|
|
78
|
+
* `<assetsPath>/<mount>/`, and `copyAssets` copies `assetsPath` as-is into the assets root.
|
|
79
|
+
* A buggy adapter (withastro/astro#16276) emits a FLAT tree instead, which would be published
|
|
80
|
+
* at the wrong URLs, so fail the build rather than ship it.
|
|
81
|
+
*
|
|
82
|
+
* A tree is nested only when `<assetsPath>/<mount>` is a directory AND the mount's top-level
|
|
83
|
+
* directory is the only entry next to adapter/platform metadata files. The mount dir alone is not
|
|
84
|
+
* proof: a flat tree plus a same-named page route (e.g. `src/pages/<mount>/`) also produces
|
|
85
|
+
* `<assetsPath>/<mount>/`. Any other root entry (`_astro/`, a custom `build.assets` dir, public
|
|
86
|
+
* files) means the client tree is flat, so this is deliberately not tied to the `_astro` name.
|
|
87
|
+
*
|
|
88
|
+
* Throws only when ALL of these hold:
|
|
89
|
+
* - the mount is not the root,
|
|
90
|
+
* - the tree is not nested (see above),
|
|
91
|
+
* - `<assetsPath>` exists and holds an entry other than adapter/platform metadata files.
|
|
92
|
+
* Everything else passes: a missing `assetsPath`, a metadata-only tree, and an asset-less app
|
|
93
|
+
* (an empty `<mount>/` dir still counts as nested).
|
|
94
|
+
*
|
|
95
|
+
* `ensureFixedCloudflareAdapter` forces a fixed adapter, which is what keeps this nearly
|
|
96
|
+
* unreachable. It is reachable through a non-semver adapter spec (git URL, `file:`, alias) or a
|
|
97
|
+
* cross-major pin the forced upgrade leaves alone.
|
|
98
|
+
*/
|
|
99
|
+
function assertAdapterNestedUnderMount(cwd, assetsPath, cleanMountPath) {
|
|
100
|
+
if (!cleanMountPath) {
|
|
101
|
+
return;
|
|
102
|
+
}
|
|
103
|
+
const assetsDir = path.join(cwd, assetsPath);
|
|
104
|
+
if (!isDirectory(assetsDir)) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
const found = listEntries(assetsDir)
|
|
108
|
+
.filter((entry) => !ADAPTER_METADATA_FILES.has(entry))
|
|
109
|
+
.sort();
|
|
110
|
+
const nestedDirExists = isDirectory(path.join(assetsDir, cleanMountPath));
|
|
111
|
+
// A nested tree holds only the mount's top-level directory next to adapter metadata.
|
|
112
|
+
const mountRoot = cleanMountPath.split('/')[0];
|
|
113
|
+
// Case-insensitive: on a case-insensitive filesystem `/App` resolves to a real `app/` dir.
|
|
114
|
+
const strayEntries = found.filter((entry) => entry.toLowerCase() !== mountRoot.toLowerCase());
|
|
115
|
+
if (nestedDirExists && strayEntries.length === 0) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
if (found.length === 0) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
const adapterVersion = resolveAdapterVersion(cwd);
|
|
122
|
+
const reason = nestedDirExists
|
|
123
|
+
? `${assetsPath}/ holds top-level entries [${strayEntries.join(', ')}] next to ` +
|
|
124
|
+
`${assetsPath}/${cleanMountPath}/ (a flat tree plus a page route named like the mount ` +
|
|
125
|
+
`would look like this)`
|
|
126
|
+
: `${assetsPath}/${cleanMountPath}/ is missing`;
|
|
127
|
+
const upgradeHint = 'Upgrade @astrojs/cloudflare to >=13.3.1 (Astro 6) or >=14 (Astro 7).';
|
|
128
|
+
// The build's top-level handler logs only `error.message`, so the actionable
|
|
129
|
+
// guidance must live in the message itself — not just in `remediation`.
|
|
130
|
+
throw new errors_1.FrameworkValidationError(`The Cloudflare adapter did not nest static assets under the mount path ` +
|
|
131
|
+
`"/${cleanMountPath}": ${reason}, and ${assetsPath}/ ` +
|
|
132
|
+
`contains: ${found.join(', ')}. ` +
|
|
133
|
+
`Detected @astrojs/cloudflare ${adapterVersion ?? '(version unknown)'}. ${upgradeHint}`, {
|
|
134
|
+
remediation: upgradeHint,
|
|
135
|
+
documentationUrl: 'https://github.com/withastro/astro/issues/16276',
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
/** Installed `@astrojs/cloudflare` version, when it can be read from node_modules. */
|
|
139
|
+
function resolveAdapterVersion(cwd) {
|
|
140
|
+
try {
|
|
141
|
+
const pkg = JSON.parse(fs.readFileSync(path.join(cwd, 'node_modules', '@astrojs', 'cloudflare', 'package.json'), 'utf8'));
|
|
142
|
+
return typeof pkg.version === 'string' ? pkg.version : undefined;
|
|
143
|
+
}
|
|
144
|
+
catch {
|
|
145
|
+
return undefined;
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=assert-adapter-nested-under-mount.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assert-adapter-nested-under-mount.js","sourceRoot":"","sources":["../../../../src/frameworks/astro/adapter-patches/assert-adapter-nested-under-mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ export interface EnsureFixedCloudflareAdapterParams {
|
|
|
15
15
|
/**
|
|
16
16
|
* Ensure the project resolves a `@astrojs/cloudflare` adapter at or above the release that
|
|
17
17
|
* fixes the base-path bug (withastro/astro#16276, fixed in 13.3.1). Companion to
|
|
18
|
-
* `
|
|
19
|
-
*
|
|
18
|
+
* `assertAdapterNestedUnderMount`: forcing a fixed adapter is what keeps that guard nearly
|
|
19
|
+
* unreachable — a buggy 13.0.0–13.3.0 adapter emits the client tree
|
|
20
20
|
* WITHOUT the base prefix, so assets end up at the wrong URL no matter how we copy them.
|
|
21
21
|
*
|
|
22
22
|
* - Adapter absent → install our pinned version.
|
|
@@ -39,8 +39,8 @@ const utils_1 = require("../../../utils");
|
|
|
39
39
|
/**
|
|
40
40
|
* Ensure the project resolves a `@astrojs/cloudflare` adapter at or above the release that
|
|
41
41
|
* fixes the base-path bug (withastro/astro#16276, fixed in 13.3.1). Companion to
|
|
42
|
-
* `
|
|
43
|
-
*
|
|
42
|
+
* `assertAdapterNestedUnderMount`: forcing a fixed adapter is what keeps that guard nearly
|
|
43
|
+
* unreachable — a buggy 13.0.0–13.3.0 adapter emits the client tree
|
|
44
44
|
* WITHOUT the base prefix, so assets end up at the wrong URL no matter how we copy them.
|
|
45
45
|
*
|
|
46
46
|
* - Adapter absent → install our pinned version.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astro5.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro5.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAelB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IAgCtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C/B,oBAAoB,IAAI,cAAc;IAOtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"astro5.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro5.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAelB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IAgCtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C/B,oBAAoB,IAAI,cAAc;IAOtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;IAS9B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAkEpC,eAAe,IAAI,MAAM;IAIzB,yBAAyB,IAAI,sBAAsB;WAWnC,uBAAuB,IAAI,WAAW;CAUvD"}
|
|
@@ -188,7 +188,11 @@ class Astro5Builder extends base_1.FrameworkBuilder {
|
|
|
188
188
|
}
|
|
189
189
|
getAdditionalConfigFiles() {
|
|
190
190
|
const loader = this.getWebflowLoader();
|
|
191
|
-
return [
|
|
191
|
+
return [
|
|
192
|
+
loader.templatePath,
|
|
193
|
+
path.join(SHARED_TEMPLATE_BASE, 'astro.config.webflow.ts'),
|
|
194
|
+
path.join(SHARED_TEMPLATE_BASE, 'webflow-image-url.ts'),
|
|
195
|
+
];
|
|
192
196
|
}
|
|
193
197
|
async prepareConfig() {
|
|
194
198
|
const { log, cwd, userEnv } = this.ctx;
|
|
@@ -205,12 +209,25 @@ class Astro5Builder extends base_1.FrameworkBuilder {
|
|
|
205
209
|
log.info('no user astro.config.{mjs,cjs,js,ts} found — writing empty clouduser.astro.config.mjs stub');
|
|
206
210
|
fs.writeFileSync(path.join(cwd, 'clouduser.astro.config.mjs'), 'export default {};\n');
|
|
207
211
|
}
|
|
208
|
-
// Copy the merge-logic library (real source, not a template).
|
|
212
|
+
// Copy the merge-logic library (real source, not a template). The generated
|
|
213
|
+
// astro.config.mjs statically imports it, so fail loudly if the package did
|
|
214
|
+
// not ship it rather than failing later with an opaque module error.
|
|
209
215
|
const webflowConfigSrc = path.join(SHARED_TEMPLATE_BASE, 'astro.config.webflow.ts');
|
|
210
|
-
if ((0, utils_1.fileExists)(webflowConfigSrc)) {
|
|
211
|
-
|
|
212
|
-
|
|
216
|
+
if (!(0, utils_1.fileExists)(webflowConfigSrc)) {
|
|
217
|
+
throw new Error(`Missing packaged template: ${webflowConfigSrc}`);
|
|
218
|
+
}
|
|
219
|
+
log.info('Copying astro.config.webflow.ts...');
|
|
220
|
+
fs.copyFileSync(webflowConfigSrc, path.join(cwd, 'astro.config.webflow.ts'));
|
|
221
|
+
// Copy the shared image-url helper that webflow-loader.ts imports. It is a
|
|
222
|
+
// hard dependency of the generated loader, so fail loudly if the package did
|
|
223
|
+
// not ship it rather than letting the user's build fail later with an opaque
|
|
224
|
+
// "Cannot find module './webflow-image-url'".
|
|
225
|
+
const imageUrlSrc = path.join(SHARED_TEMPLATE_BASE, 'webflow-image-url.ts');
|
|
226
|
+
if (!(0, utils_1.fileExists)(imageUrlSrc)) {
|
|
227
|
+
throw new Error(`Missing packaged template: ${imageUrlSrc}`);
|
|
213
228
|
}
|
|
229
|
+
log.info('Copying webflow-image-url.ts...');
|
|
230
|
+
fs.copyFileSync(imageUrlSrc, path.join(cwd, 'webflow-image-url.ts'));
|
|
214
231
|
// Render the single astro.config.mjs template.
|
|
215
232
|
const templatePath = path.join(TEMPLATE_BASE, 'astro.config.mjs.template');
|
|
216
233
|
const destPath = path.join(cwd, 'astro.config.mjs');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astro5.js","sourceRoot":"","sources":["../../../src/frameworks/astro/astro5.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"astro5.js","sourceRoot":"","sources":["../../../src/frameworks/astro/astro5.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astro6.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro6.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAgBlB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IAgCtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD/B,oBAAoB,IAAI,cAAc;IAUtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8C1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"astro6.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro6.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAgBlB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IAgCtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD/B,oBAAoB,IAAI,cAAc;IAUtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA8C1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;IAS9B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAkEpC,eAAe,IAAI,MAAM;IAIzB,yBAAyB,IAAI,sBAAsB;WAWnC,uBAAuB,IAAI,WAAW;CAkBvD"}
|
|
@@ -156,8 +156,8 @@ class Astro6Builder extends base_1.FrameworkBuilder {
|
|
|
156
156
|
async installDependencies() {
|
|
157
157
|
const { log, cwd, runCommand } = this.ctx;
|
|
158
158
|
// @astrojs/cloudflare < 13.3.1 has the base-path bug (withastro/astro#16276); force a
|
|
159
|
-
// fixed version so
|
|
160
|
-
// over broken (unprefixed) asset URLs.
|
|
159
|
+
// fixed version so the assets-copy guard (assertAdapterNestedUnderMount) is nearly
|
|
160
|
+
// unreachable rather than papering over broken (unprefixed) asset URLs.
|
|
161
161
|
const adapter = this.getCloudflareAdapter();
|
|
162
162
|
await (0, ensure_fixed_cloudflare_adapter_1.ensureFixedCloudflareAdapter)({
|
|
163
163
|
log,
|
|
@@ -207,7 +207,11 @@ class Astro6Builder extends base_1.FrameworkBuilder {
|
|
|
207
207
|
}
|
|
208
208
|
getAdditionalConfigFiles() {
|
|
209
209
|
const loader = this.getWebflowLoader();
|
|
210
|
-
return [
|
|
210
|
+
return [
|
|
211
|
+
loader.templatePath,
|
|
212
|
+
path.join(SHARED_TEMPLATE_BASE, 'astro.config.webflow.ts'),
|
|
213
|
+
path.join(SHARED_TEMPLATE_BASE, 'webflow-image-url.ts'),
|
|
214
|
+
];
|
|
211
215
|
}
|
|
212
216
|
async prepareConfig() {
|
|
213
217
|
const { log, cwd, userEnv } = this.ctx;
|
|
@@ -224,12 +228,25 @@ class Astro6Builder extends base_1.FrameworkBuilder {
|
|
|
224
228
|
log.info('no user astro.config.{mjs,cjs,js,ts} found — writing empty clouduser.astro.config.mjs stub');
|
|
225
229
|
fs.writeFileSync(path.join(cwd, 'clouduser.astro.config.mjs'), 'export default {};\n');
|
|
226
230
|
}
|
|
227
|
-
// Copy the merge-logic library (real source, not a template).
|
|
231
|
+
// Copy the merge-logic library (real source, not a template). The generated
|
|
232
|
+
// astro.config.mjs statically imports it, so fail loudly if the package did
|
|
233
|
+
// not ship it rather than failing later with an opaque module error.
|
|
228
234
|
const webflowConfigSrc = path.join(SHARED_TEMPLATE_BASE, 'astro.config.webflow.ts');
|
|
229
|
-
if ((0, utils_1.fileExists)(webflowConfigSrc)) {
|
|
230
|
-
|
|
231
|
-
|
|
235
|
+
if (!(0, utils_1.fileExists)(webflowConfigSrc)) {
|
|
236
|
+
throw new Error(`Missing packaged template: ${webflowConfigSrc}`);
|
|
237
|
+
}
|
|
238
|
+
log.info('Copying astro.config.webflow.ts...');
|
|
239
|
+
fs.copyFileSync(webflowConfigSrc, path.join(cwd, 'astro.config.webflow.ts'));
|
|
240
|
+
// Copy the shared image-url helper that webflow-loader.ts imports. It is a
|
|
241
|
+
// hard dependency of the generated loader, so fail loudly if the package did
|
|
242
|
+
// not ship it rather than letting the user's build fail later with an opaque
|
|
243
|
+
// "Cannot find module './webflow-image-url'".
|
|
244
|
+
const imageUrlSrc = path.join(SHARED_TEMPLATE_BASE, 'webflow-image-url.ts');
|
|
245
|
+
if (!(0, utils_1.fileExists)(imageUrlSrc)) {
|
|
246
|
+
throw new Error(`Missing packaged template: ${imageUrlSrc}`);
|
|
232
247
|
}
|
|
248
|
+
log.info('Copying webflow-image-url.ts...');
|
|
249
|
+
fs.copyFileSync(imageUrlSrc, path.join(cwd, 'webflow-image-url.ts'));
|
|
233
250
|
// Render the single astro.config.mjs template.
|
|
234
251
|
const templatePath = path.join(TEMPLATE_BASE, 'astro.config.mjs.template');
|
|
235
252
|
const destPath = path.join(cwd, 'astro.config.mjs');
|
|
@@ -274,9 +291,9 @@ class Astro6Builder extends base_1.FrameworkBuilder {
|
|
|
274
291
|
// Astro 6 outputs multiple files (entry.mjs + chunks/*) that need bundling.
|
|
275
292
|
skipNoBundle: true,
|
|
276
293
|
// A fixed @astrojs/cloudflare nests the client tree under dist/client/<mount>/
|
|
277
|
-
// (base = mountPath), so the copy
|
|
278
|
-
//
|
|
279
|
-
|
|
294
|
+
// (base = mountPath), so the copy takes dist/client verbatim into the assets root
|
|
295
|
+
// instead of the blind Astro 5 / Next.js mount append.
|
|
296
|
+
staticAssetsMirrorUrlLayout: true,
|
|
280
297
|
// After wrangler dry-run, the bundled output is ./entry.mjs
|
|
281
298
|
dryRunEntryPath: './entry.mjs',
|
|
282
299
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astro6.js","sourceRoot":"","sources":["../../../src/frameworks/astro/astro6.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"astro6.js","sourceRoot":"","sources":["../../../src/frameworks/astro/astro6.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astro7.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro7.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAgBlB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IA2BtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C/B,oBAAoB,IAAI,cAAc;IAQtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"astro7.d.ts","sourceRoot":"","sources":["../../../src/frameworks/astro/astro7.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC3C,OAAO,KAAK,EACV,WAAW,EACX,aAAa,EACb,WAAW,EACX,WAAW,EACX,eAAe,EACf,cAAc,EACd,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,UAAU,CAAC;AAgBlB,qBAAa,aAAc,SAAQ,gBAAgB;IACjD,OAAgB,aAAa,SAAW;IAMxC,IAAI,IAAI,IAAI,aAAa,CAOxB;IAEQ,mBAAmB,IAAI,MAAM,GAAG,SAAS;IAQlD;;;;;;OAMG;WACa,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,WAAW,GAAG,eAAe;IA2BtF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C/B,oBAAoB,IAAI,cAAc;IAQtC,uBAAuB,IAAI,kBAAkB,EAAE;IAUzC,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IA+C1C,gBAAgB,IAAI,mBAAmB;IAQvC,qBAAqB,IAAI,MAAM,EAAE;IAIjC,uBAAuB,IAAI,MAAM;IAIjC,wBAAwB,IAAI,MAAM,EAAE;IAS9B,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAkEpC,eAAe,IAAI,MAAM;IAIzB,yBAAyB,IAAI,sBAAsB;WAWnC,uBAAuB,IAAI,WAAW;CAkBvD"}
|