@astrojs/cloudflare 7.5.3 → 7.5.4

package/dist/utils/wasm-module-loader.js

@@ -1,88 +1,101 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import {} from "vite";
-function wasmModuleLoader({
-  disabled,
-  assetsDirectory
-}) {
-  const postfix = ".wasm?module";
-  let isDev = false;
-  return {
-    name: "vite:wasm-module-loader",
-    enforce: "pre",
-    configResolved(config) {
-      isDev = config.command === "serve";
-    },
-    config(_, __) {
-      return {
-        assetsInclude: ["**/*.wasm?module"],
-        build: { rollupOptions: { external: /^__WASM_ASSET__.+\.wasm\.mjs$/i } }
-      };
-    },
-    load(id, _) {
-      if (!id.endsWith(postfix)) {
-        return;
-      }
-      if (disabled) {
-        throw new Error(
-          `WASM module's cannot be loaded unless you add \`wasmModuleImports: true\` to your astro config.`
-        );
-      }
-      const filePath = id.slice(0, -1 * "?module".length);
-      const data = fs.readFileSync(filePath);
-      const base64 = data.toString("base64");
-      const base64Module = `
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import {} from 'vite';
+/**
+ * Loads '*.wasm?module' imports as WebAssembly modules, which is the only way to load WASM in cloudflare workers.
+ * Current proposal for WASM modules: https://github.com/WebAssembly/esm-integration/tree/main/proposals/esm-integration
+ * Cloudflare worker WASM from javascript support: https://developers.cloudflare.com/workers/runtime-apis/webassembly/javascript/
+ * @param disabled - if true throws a helpful error message if wasm is encountered and wasm imports are not enabled,
+ * 								otherwise it will error obscurely in the esbuild and vite builds
+ * @param assetsDirectory - the folder name for the assets directory in the build directory. Usually '_astro'
+ * @returns Vite plugin to load WASM tagged with '?module' as a WASM modules
+ */
+export function wasmModuleLoader({ disabled, assetsDirectory, }) {
+    const postfix = '.wasm?module';
+    let isDev = false;
+    return {
+        name: 'vite:wasm-module-loader',
+        enforce: 'pre',
+        configResolved(config) {
+            isDev = config.command === 'serve';
+        },
+        config(_, __) {
+            // let vite know that file format and the magic import string is intentional, and will be handled in this plugin
+            return {
+                assetsInclude: ['**/*.wasm?module'],
+                build: { rollupOptions: { external: /^__WASM_ASSET__.+\.wasm\.mjs$/i } },
+            };
+        },
+        load(id, _) {
+            if (!id.endsWith(postfix)) {
+                return;
+            }
+            if (disabled) {
+                throw new Error(`WASM module's cannot be loaded unless you add \`wasmModuleImports: true\` to your astro config.`);
+            }
+            const filePath = id.slice(0, -1 * '?module'.length);
+            const data = fs.readFileSync(filePath);
+            const base64 = data.toString('base64');
+            const base64Module = `
 const wasmModule = new WebAssembly.Module(Uint8Array.from(atob("${base64}"), c => c.charCodeAt(0)));
 export default wasmModule
 `;
-      if (isDev) {
-        return base64Module;
-      } else {
-        let hash = hashString(base64);
-        const assetName = path.basename(filePath).split(".")[0] + "." + hash + ".wasm";
-        this.emitFile({
-          type: "asset",
-          // put it explicitly in the _astro assets directory with `fileName` rather than `name` so that
-          // vite doesn't give it a random id in its name. We need to be able to easily rewrite from
-          // the .mjs loader and the actual wasm asset later in the ESbuild for the worker
-          fileName: path.join(assetsDirectory, assetName),
-          source: fs.readFileSync(filePath)
-        });
-        const chunkId = this.emitFile({
-          type: "prebuilt-chunk",
-          fileName: assetName + ".mjs",
-          code: base64Module
-        });
-        return `
+            if (isDev) {
+                // no need to wire up the assets in dev mode, just rewrite
+                return base64Module;
+            }
+            else {
+                // just some shared ID
+                let hash = hashString(base64);
+                // emit the wasm binary as an asset file, to be picked up later by the esbuild bundle for the worker.
+                // give it a shared deterministic name to make things easy for esbuild to switch on later
+                const assetName = path.basename(filePath).split('.')[0] + '.' + hash + '.wasm';
+                this.emitFile({
+                    type: 'asset',
+                    // put it explicitly in the _astro assets directory with `fileName` rather than `name` so that
+                    // vite doesn't give it a random id in its name. We need to be able to easily rewrite from
+                    // the .mjs loader and the actual wasm asset later in the ESbuild for the worker
+                    fileName: path.join(assetsDirectory, assetName),
+                    source: fs.readFileSync(filePath),
+                });
+                // however, by default, the SSG generator cannot import the .wasm as a module, so embed as a base64 string
+                const chunkId = this.emitFile({
+                    type: 'prebuilt-chunk',
+                    fileName: assetName + '.mjs',
+                    code: base64Module,
+                });
+                return `
 import wasmModule from "__WASM_ASSET__${chunkId}.wasm.mjs";
 export default wasmModule;
 	`;
-      }
-    },
-    // output original wasm file relative to the chunk
-    renderChunk(code, chunk, _) {
-      if (isDev)
-        return;
-      if (!/__WASM_ASSET__/g.test(code))
-        return;
-      const final = code.replaceAll(/__WASM_ASSET__([a-z\d]+).wasm.mjs/g, (s, assetId) => {
-        const fileName = this.getFileName(assetId);
-        const relativePath = path.relative(path.dirname(chunk.fileName), fileName).replaceAll("\\", "/");
-        return `./${relativePath}`;
-      });
-      return { code: final };
-    }
-  };
+            }
+        },
+        // output original wasm file relative to the chunk
+        renderChunk(code, chunk, _) {
+            if (isDev)
+                return;
+            if (!/__WASM_ASSET__/g.test(code))
+                return;
+            const final = code.replaceAll(/__WASM_ASSET__([a-z\d]+).wasm.mjs/g, (s, assetId) => {
+                const fileName = this.getFileName(assetId);
+                const relativePath = path
+                    .relative(path.dirname(chunk.fileName), fileName)
+                    .replaceAll('\\', '/'); // fix windows paths for import
+                return `./${relativePath}`;
+            });
+            return { code: final };
+        },
+    };
 }
+/**
+ * Returns a deterministic 32 bit hash code from a string
+ */
 function hashString(str) {
-  let hash = 0;
-  for (let i = 0; i < str.length; i++) {
-    const char = str.charCodeAt(i);
-    hash = (hash << 5) - hash + char;
-    hash &= hash;
-  }
-  return new Uint32Array([hash])[0].toString(36);
+    let hash = 0;
+    for (let i = 0; i < str.length; i++) {
+        const char = str.charCodeAt(i);
+        hash = (hash << 5) - hash + char;
+        hash &= hash; // Convert to 32bit integer
+    }
+    return new Uint32Array([hash])[0].toString(36);
 }
-export {
-  wasmModuleLoader
-};

package/package.json

@@ -1,21 +1,22 @@
 {
+  "//comment": "test changeset-bot",
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "7.5.3",
+  "version": "7.5.4",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
-    "directory": "packages/integrations/cloudflare"
+    "url": "https://github.com/withastro/adapters.git",
+    "directory": "packages/cloudflare"
   },
   "keywords": [
     "withastro",
     "astro-adapter"
   ],
-  "bugs": "https://github.com/withastro/astro/issues",
+  "bugs": "https://github.com/withastro/adapters/issues",
   "homepage": "https://docs.astro.build/en/guides/integrations-guide/cloudflare/",
   "exports": {
     ".": "./dist/index.js",
@@ -27,38 +28,36 @@
     "dist"
   ],
   "dependencies": {
+    "@astrojs/underscore-redirects": "^0.3.0",
     "@cloudflare/workers-types": "^4.20230821.0",
-    "miniflare": "^3.20230918.0",
+    "miniflare": "3.20231010.0",
     "@iarna/toml": "^2.2.5",
-    "@miniflare/cache": "^2.14.1",
-    "@miniflare/shared": "^2.14.1",
-    "@miniflare/storage-memory": "^2.14.1",
     "dotenv": "^16.3.1",
     "esbuild": "^0.19.2",
     "find-up": "^6.3.0",
     "tiny-glob": "^0.2.9",
-    "vite": "^4.4.9",
-    "@astrojs/underscore-redirects": "0.3.1"
+    "vite": "^4.4.9"
   },
   "peerDependencies": {
     "astro": "^3.3.0"
   },
   "devDependencies": {
+    "execa": "^8.0.1",
+    "fast-glob": "^3.3.1",
     "@types/iarna__toml": "^2.0.2",
+    "strip-ansi": "^7.1.0",
+    "astro": "^3.2.3",
     "chai": "^4.3.7",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^10.2.0",
-    "wrangler": "^3.5.1",
-    "astro": "3.3.0",
-    "astro-scripts": "0.0.14"
+    "wrangler": "^3.11.0",
+    "@astrojs/test-utils": "0.0.1"
   },
   "publishConfig": {
     "provenance": true
   },
   "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
-    "build:ci": "astro-scripts build \"src/**/*.ts\"",
-    "dev": "astro-scripts dev \"src/**/*.ts\"",
+    "build": "tsc",
     "test": "mocha --exit --timeout 30000 test/",
     "test:match": "mocha --exit --timeout 30000 -g"
   }

package/LICENSE

@@ -1,61 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Fred K. Schott
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-"""
-This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/sveltejs/kit repository:
-
-Copyright (c) 2020 [these people](https://github.com/sveltejs/kit/graphs/contributors)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
-
-"""
-This license applies to parts of the `packages/create-astro` and `packages/astro` subdirectories originating from the https://github.com/vitejs/vite repository:
-
-MIT License
-
-Copyright (c) 2019-present, Yuxi (Evan) You and Vite contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-"""