@astrojs/cloudflare 7.5.2 → 7.5.4

package/dist/util.js

@@ -1,18 +1,13 @@
-const isNode = typeof process === "object" && Object.prototype.toString.call(process) === "[object process]";
-function getProcessEnvProxy() {
-  return new Proxy(
-    {},
-    {
-      get: (target, prop) => {
-        console.warn(
-          // NOTE: \0 prevents Vite replacement
-          `Unable to access \`import.meta\0.env.${prop.toString()}\` on initialization as the Cloudflare platform only provides the environment variables per request. Please move the environment variable access inside a function that's only called after a request has been received.`
-        );
-      }
-    }
-  );
+export const isNode = typeof process === 'object' && Object.prototype.toString.call(process) === '[object process]';
+export function getProcessEnvProxy() {
+    return new Proxy({}, {
+        get: (target, prop) => {
+            console.warn(
+            // NOTE: \0 prevents Vite replacement
+            `Unable to access \`import.meta\0.env.${prop.toString()}\` on initialization ` +
+                `as the Cloudflare platform only provides the environment variables per request. ` +
+                `Please move the environment variable access inside a function ` +
+                `that's only called after a request has been received.`);
+        },
+    });
 }
-export {
-  getProcessEnvProxy,
-  isNode
-};

package/dist/utils/deduplicatePatterns.js

@@ -1,15 +1,23 @@
-function deduplicatePatterns(patterns) {
-  const openPatterns = [];
-  return [...new Set(patterns)].sort((a, b) => a.length - b.length).filter((pattern) => {
-    if (openPatterns.some((p) => p.test(pattern))) {
-      return false;
-    }
-    if (pattern.endsWith("*")) {
-      openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, ".*")}`));
-    }
-    return true;
-  });
+/**
+ * Remove duplicates and redundant patterns from an `include` or `exclude` list.
+ * Otherwise Cloudflare will throw an error on deployment. Plus, it saves more entries.
+ * E.g. `['/foo/*', '/foo/*', '/foo/bar'] => ['/foo/*']`
+ * @param patterns a list of `include` or `exclude` patterns
+ * @returns a deduplicated list of patterns
+ */
+export function deduplicatePatterns(patterns) {
+    const openPatterns = [];
+    // A value in the set may only occur once; it is unique in the set's collection.
+    // ref: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Set
+    return [...new Set(patterns)]
+        .sort((a, b) => a.length - b.length)
+        .filter((pattern) => {
+        if (openPatterns.some((p) => p.test(pattern))) {
+            return false;
+        }
+        if (pattern.endsWith('*')) {
+            openPatterns.push(new RegExp(`^${pattern.replace(/(\*\/)*\*$/g, '.*')}`));
+        }
+        return true;
+    });
 }
-export {
-  deduplicatePatterns
-};

package/dist/utils/getCFObject.js

@@ -1,68 +1,67 @@
-async function getCFObject(runtimeMode) {
-  const CF_ENDPOINT = "https://workers.cloudflare.com/cf.json";
-  const CF_FALLBACK = {
-    asOrganization: "",
-    asn: 395747,
-    colo: "DFW",
-    city: "Austin",
-    region: "Texas",
-    regionCode: "TX",
-    metroCode: "635",
-    postalCode: "78701",
-    country: "US",
-    continent: "NA",
-    timezone: "America/Chicago",
-    latitude: "30.27130",
-    longitude: "-97.74260",
-    clientTcpRtt: 0,
-    httpProtocol: "HTTP/1.1",
-    requestPriority: "weight=192;exclusive=0",
-    tlsCipher: "AEAD-AES128-GCM-SHA256",
-    tlsVersion: "TLSv1.3",
-    tlsClientAuth: {
-      certPresented: "0",
-      certVerified: "NONE",
-      certRevoked: "0",
-      certIssuerDN: "",
-      certSubjectDN: "",
-      certIssuerDNRFC2253: "",
-      certSubjectDNRFC2253: "",
-      certIssuerDNLegacy: "",
-      certSubjectDNLegacy: "",
-      certSerial: "",
-      certIssuerSerial: "",
-      certSKI: "",
-      certIssuerSKI: "",
-      certFingerprintSHA1: "",
-      certFingerprintSHA256: "",
-      certNotBefore: "",
-      certNotAfter: ""
-    },
-    edgeRequestKeepAliveStatus: 0,
-    hostMetadata: void 0,
-    clientTrustScore: 99,
-    botManagement: {
-      corporateProxy: false,
-      verifiedBot: false,
-      ja3Hash: "25b4882c2bcb50cd6b469ff28c596742",
-      staticResource: false,
-      detectionIds: [],
-      score: 99
+export async function getCFObject(runtimeMode) {
+    const CF_ENDPOINT = 'https://workers.cloudflare.com/cf.json';
+    const CF_FALLBACK = {
+        asOrganization: '',
+        asn: 395747,
+        colo: 'DFW',
+        city: 'Austin',
+        region: 'Texas',
+        regionCode: 'TX',
+        metroCode: '635',
+        postalCode: '78701',
+        country: 'US',
+        continent: 'NA',
+        timezone: 'America/Chicago',
+        latitude: '30.27130',
+        longitude: '-97.74260',
+        clientTcpRtt: 0,
+        httpProtocol: 'HTTP/1.1',
+        requestPriority: 'weight=192;exclusive=0',
+        tlsCipher: 'AEAD-AES128-GCM-SHA256',
+        tlsVersion: 'TLSv1.3',
+        tlsClientAuth: {
+            certPresented: '0',
+            certVerified: 'NONE',
+            certRevoked: '0',
+            certIssuerDN: '',
+            certSubjectDN: '',
+            certIssuerDNRFC2253: '',
+            certSubjectDNRFC2253: '',
+            certIssuerDNLegacy: '',
+            certSubjectDNLegacy: '',
+            certSerial: '',
+            certIssuerSerial: '',
+            certSKI: '',
+            certIssuerSKI: '',
+            certFingerprintSHA1: '',
+            certFingerprintSHA256: '',
+            certNotBefore: '',
+            certNotAfter: '',
+        },
+        edgeRequestKeepAliveStatus: 0,
+        hostMetadata: undefined,
+        clientTrustScore: 99,
+        botManagement: {
+            corporateProxy: false,
+            verifiedBot: false,
+            ja3Hash: '25b4882c2bcb50cd6b469ff28c596742',
+            staticResource: false,
+            detectionIds: [],
+            score: 99,
+        },
+    };
+    if (runtimeMode === 'local') {
+        return CF_FALLBACK;
     }
-  };
-  if (runtimeMode === "local") {
-    return CF_FALLBACK;
-  } else if (runtimeMode === "remote") {
-    try {
-      const res = await fetch(CF_ENDPOINT);
-      const cfText = await res.text();
-      const storedCf = JSON.parse(cfText);
-      return storedCf;
-    } catch (e) {
-      return CF_FALLBACK;
+    else if (runtimeMode === 'remote') {
+        try {
+            const res = await fetch(CF_ENDPOINT);
+            const cfText = await res.text();
+            const storedCf = JSON.parse(cfText);
+            return storedCf;
+        }
+        catch (e) {
+            return CF_FALLBACK;
+        }
     }
-  }
 }
-export {
-  getCFObject
-};

package/dist/utils/parser.js

@@ -1,144 +1,149 @@
-import TOML from "@iarna/toml";
-import dotenv from "dotenv";
-import { findUpSync } from "find-up";
-import * as fs from "node:fs";
-import { dirname, resolve } from "node:path";
+/**
+ * This file is a derivative work of wrangler by Cloudflare
+ * An upstream request for exposing this API was made here:
+ * https://github.com/cloudflare/workers-sdk/issues/3897
+ *
+ * Until further notice, we will be using this file as a workaround
+ * TODO: Tackle this file, once their is an decision on the upstream request
+ */
+import TOML from '@iarna/toml';
+import dotenv from 'dotenv';
+import { findUpSync } from 'find-up';
+import * as fs from 'node:fs';
+import { dirname, resolve } from 'node:path';
 let _wrangler;
 function findWranglerToml(referencePath = process.cwd(), preferJson = false) {
-  if (preferJson) {
-    return findUpSync(`wrangler.json`, { cwd: referencePath }) ?? findUpSync(`wrangler.toml`, { cwd: referencePath });
-  }
-  return findUpSync(`wrangler.toml`, { cwd: referencePath });
+    if (preferJson) {
+        return (findUpSync(`wrangler.json`, { cwd: referencePath }) ??
+            findUpSync(`wrangler.toml`, { cwd: referencePath }));
+    }
+    return findUpSync(`wrangler.toml`, { cwd: referencePath });
 }
 class ParseError extends Error {
-  text;
-  notes;
-  location;
-  kind;
-  constructor({ text, notes, location, kind }) {
-    super(text);
-    this.name = this.constructor.name;
-    this.text = text;
-    this.notes = notes ?? [];
-    this.location = location;
-    this.kind = kind ?? "error";
-  }
+    text;
+    notes;
+    location;
+    kind;
+    constructor({ text, notes, location, kind }) {
+        super(text);
+        this.name = this.constructor.name;
+        this.text = text;
+        this.notes = notes ?? [];
+        this.location = location;
+        this.kind = kind ?? 'error';
+    }
 }
-const TOML_ERROR_NAME = "TomlError";
-const TOML_ERROR_SUFFIX = " at row ";
+const TOML_ERROR_NAME = 'TomlError';
+const TOML_ERROR_SUFFIX = ' at row ';
 function parseTOML(input, file) {
-  try {
-    const normalizedInput = input.replace(/\r\n/g, "\n");
-    return TOML.parse(normalizedInput);
-  } catch (err) {
-    const { name, message, line, col } = err;
-    if (name !== TOML_ERROR_NAME) {
-      throw err;
+    try {
+        // Normalize CRLF to LF to avoid hitting https://github.com/iarna/iarna-toml/issues/33.
+        const normalizedInput = input.replace(/\r\n/g, '\n');
+        return TOML.parse(normalizedInput);
+    }
+    catch (err) {
+        const { name, message, line, col } = err;
+        if (name !== TOML_ERROR_NAME) {
+            throw err;
+        }
+        const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
+        const lineText = input.split('\n')[line];
+        const location = {
+            lineText,
+            line: line + 1,
+            column: col - 1,
+            file,
+            fileText: input,
+        };
+        throw new ParseError({ text, location });
     }
-    const text = message.substring(0, message.lastIndexOf(TOML_ERROR_SUFFIX));
-    const lineText = input.split("\n")[line];
-    const location = {
-      lineText,
-      line: line + 1,
-      column: col - 1,
-      file,
-      fileText: input
-    };
-    throw new ParseError({ text, location });
-  }
 }
 function tryLoadDotEnv(path) {
-  try {
-    const parsed = dotenv.parse(fs.readFileSync(path));
-    return { path, parsed };
-  } catch (e) {
-  }
+    try {
+        const parsed = dotenv.parse(fs.readFileSync(path));
+        return { path, parsed };
+    }
+    catch (e) {
+        // logger.debug(`Failed to load .env file "${path}":`, e);
+    }
 }
-function loadDotEnv(path) {
-  return tryLoadDotEnv(path);
+/**
+ * Loads a dotenv file from <path>, preferring to read <path>.<environment> if
+ * <environment> is defined and that file exists.
+ */
+export function loadDotEnv(path) {
+    return tryLoadDotEnv(path);
 }
 function getVarsForDev(config, configPath) {
-  const configDir = resolve(dirname(configPath ?? "."));
-  const devVarsPath = resolve(configDir, ".dev.vars");
-  const loaded = loadDotEnv(devVarsPath);
-  if (loaded !== void 0) {
-    return {
-      ...config.vars,
-      ...loaded.parsed
-    };
-  } else {
-    return config.vars;
-  }
+    const configDir = resolve(dirname(configPath ?? '.'));
+    const devVarsPath = resolve(configDir, '.dev.vars');
+    const loaded = loadDotEnv(devVarsPath);
+    if (loaded !== undefined) {
+        return {
+            ...config.vars,
+            ...loaded.parsed,
+        };
+    }
+    else {
+        return config.vars;
+    }
 }
 function parseConfig() {
-  if (_wrangler)
-    return _wrangler;
-  let rawConfig;
-  const configPath = findWranglerToml(process.cwd(), false);
-  if (!configPath) {
-    throw new Error("Could not find wrangler.toml");
-  }
-  if (configPath?.endsWith("toml")) {
-    rawConfig = parseTOML(fs.readFileSync(configPath).toString(), configPath);
-  }
-  _wrangler = { rawConfig, configPath };
-  return { rawConfig, configPath };
+    if (_wrangler)
+        return _wrangler;
+    let rawConfig;
+    const configPath = findWranglerToml(process.cwd(), false); // false = args.experimentalJsonConfig
+    if (!configPath) {
+        throw new Error('Could not find wrangler.toml');
+    }
+    // Load the configuration from disk if available
+    if (configPath?.endsWith('toml')) {
+        rawConfig = parseTOML(fs.readFileSync(configPath).toString(), configPath);
+    }
+    _wrangler = { rawConfig, configPath };
+    return { rawConfig, configPath };
 }
-async function getEnvVars() {
-  const { rawConfig, configPath } = parseConfig();
-  const vars = getVarsForDev(rawConfig, configPath);
-  return vars;
+export async function getEnvVars() {
+    const { rawConfig, configPath } = parseConfig();
+    const vars = getVarsForDev(rawConfig, configPath);
+    return vars;
 }
-async function getD1Bindings() {
-  const { rawConfig } = parseConfig();
-  if (!rawConfig)
-    return [];
-  if (!rawConfig?.d1_databases)
-    return [];
-  const bindings = (rawConfig?.d1_databases).map(
-    (binding) => binding.binding
-  );
-  return bindings;
+export async function getD1Bindings() {
+    const { rawConfig } = parseConfig();
+    if (!rawConfig)
+        return [];
+    if (!rawConfig?.d1_databases)
+        return [];
+    const bindings = (rawConfig?.d1_databases).map((binding) => binding.binding);
+    return bindings;
 }
-async function getR2Bindings() {
-  const { rawConfig } = parseConfig();
-  if (!rawConfig)
-    return [];
-  if (!rawConfig?.r2_buckets)
-    return [];
-  const bindings = (rawConfig?.r2_buckets).map(
-    (binding) => binding.binding
-  );
-  return bindings;
+export async function getR2Bindings() {
+    const { rawConfig } = parseConfig();
+    if (!rawConfig)
+        return [];
+    if (!rawConfig?.r2_buckets)
+        return [];
+    const bindings = (rawConfig?.r2_buckets).map((binding) => binding.binding);
+    return bindings;
 }
-async function getKVBindings() {
-  const { rawConfig } = parseConfig();
-  if (!rawConfig)
-    return [];
-  if (!rawConfig?.kv_namespaces)
-    return [];
-  const bindings = (rawConfig?.kv_namespaces).map(
-    (binding) => binding.binding
-  );
-  return bindings;
+export async function getKVBindings() {
+    const { rawConfig } = parseConfig();
+    if (!rawConfig)
+        return [];
+    if (!rawConfig?.kv_namespaces)
+        return [];
+    const bindings = (rawConfig?.kv_namespaces).map((binding) => binding.binding);
+    return bindings;
 }
-function getDOBindings() {
-  const { rawConfig } = parseConfig();
-  if (!rawConfig)
-    return {};
-  if (!rawConfig?.durable_objects)
-    return {};
-  const output = new Object({});
-  for (const binding of rawConfig?.durable_objects.bindings) {
-    Reflect.set(output, binding.name, { className: binding.class_name });
-  }
-  return output;
+export function getDOBindings() {
+    const { rawConfig } = parseConfig();
+    if (!rawConfig)
+        return {};
+    if (!rawConfig?.durable_objects)
+        return {};
+    const output = new Object({});
+    for (const binding of rawConfig?.durable_objects.bindings) {
+        Reflect.set(output, binding.name, { className: binding.class_name });
+    }
+    return output;
 }
-export {
-  getD1Bindings,
-  getDOBindings,
-  getEnvVars,
-  getKVBindings,
-  getR2Bindings,
-  loadDotEnv
-};

package/dist/utils/prependForwardSlash.js

@@ -1,6 +1,3 @@
-function prependForwardSlash(path) {
-  return path[0] === "/" ? path : "/" + path;
+export function prependForwardSlash(path) {
+    return path[0] === '/' ? path : '/' + path;
 }
-export {
-  prependForwardSlash
-};

package/dist/utils/rewriteWasmImportPath.js

@@ -1,25 +1,23 @@
-import esbuild from "esbuild";
-import { basename } from "node:path";
-function rewriteWasmImportPath({
-  relativePathToAssets
-}) {
-  return {
-    name: "wasm-loader",
-    setup(build) {
-      build.onResolve({ filter: /.*\.wasm.mjs$/ }, (args) => {
-        const updatedPath = [
-          relativePathToAssets.replaceAll("\\", "/"),
-          basename(args.path).replace(/\.mjs$/, "")
-        ].join("/");
-        return {
-          path: updatedPath,
-          external: true
-          // mark it as external in the bundle
-        };
-      });
-    }
-  };
+import esbuild from 'esbuild';
+import { basename } from 'node:path';
+/**
+ *
+ * @param relativePathToAssets - relative path from the final location for the current esbuild output bundle, to the assets directory.
+ */
+export function rewriteWasmImportPath({ relativePathToAssets, }) {
+    return {
+        name: 'wasm-loader',
+        setup(build) {
+            build.onResolve({ filter: /.*\.wasm.mjs$/ }, (args) => {
+                const updatedPath = [
+                    relativePathToAssets.replaceAll('\\', '/'),
+                    basename(args.path).replace(/\.mjs$/, ''),
+                ].join('/');
+                return {
+                    path: updatedPath,
+                    external: true, // mark it as external in the bundle
+                };
+            });
+        },
+    };
 }
-export {
-  rewriteWasmImportPath
-};