wrangler 3.100.0 → 3.101.0

package/config-schema.json

@@ -1368,9 +1368,6 @@
           },
           "type": "array"
         },
-        "configPath": {
-          "type": "string"
-        },
         "containers": {
           "additionalProperties": false,
           "description": "Container related configuration",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "3.100.0",
+  "version": "3.101.0",
   "description": "Command-line interface for all things Cloudflare Workers",
   "keywords": [
     "wrangler",
@@ -50,6 +50,7 @@
     "config-schema.json"
   ],
   "dependencies": {
+    "@aws-sdk/client-s3": "^3.721.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "blake3-wasm": "^2.1.5",
@@ -66,7 +67,7 @@
     "workerd": "1.20241230.0",
     "xxhash-wasm": "^1.0.1",
     "@cloudflare/kv-asset-handler": "0.3.4",
-    "miniflare": "3.20241230.0"
+    "miniflare": "3.20241230.1"
   },
   "devDependencies": {
     "@cloudflare/types": "6.18.4",
@@ -101,7 +102,7 @@
     "command-exists": "^1.2.9",
     "concurrently": "^8.2.2",
     "devtools-protocol": "^0.0.1182435",
-    "dotenv": "^16.0.0",
+    "dotenv": "^16.3.1",
     "execa": "^6.1.0",
     "express": "^4.18.1",
     "find-up": "^6.3.0",
@@ -137,9 +138,9 @@
     "ws": "^8.18.0",
     "xdg-app-paths": "^8.3.0",
     "yargs": "^17.7.2",
-    "@cloudflare/cli": "1.1.1",
     "@cloudflare/eslint-config-worker": "1.1.0",
-    "@cloudflare/pages-shared": "^0.12.1",
+    "@cloudflare/cli": "1.1.1",
+    "@cloudflare/pages-shared": "^0.13.0",
     "@cloudflare/workers-shared": "0.11.2",
     "@cloudflare/workers-tsconfig": "0.0.0"
   },
@@ -174,10 +175,10 @@
     "emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
     "generate-json-schema": "pnpm exec ts-json-schema-generator --no-type-check --path src/config/config.ts --type RawConfig --out config-schema.json",
     "start": "pnpm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-    "test": "pnpm run assert-git-version && vitest",
+    "test": "dotenv -- pnpm run assert-git-version && dotenv -- vitest",
     "test:ci": "pnpm run test run",
     "test:debug": "pnpm run test --silent=false --verbose=true",
-    "test:e2e": "vitest -c ./e2e/vitest.config.mts",
+    "test:e2e": "dotenv -- vitest -c ./e2e/vitest.config.mts",
     "test:watch": "pnpm run test --testTimeout=50000 --watch",
     "type:tests": "tsc -p ./src/__tests__/tsconfig.json && tsc -p ./e2e/tsconfig.json"
   }

package/wrangler-dist/cli.d.ts

@@ -772,6 +772,20 @@ declare type CloudchamberConfig = {
     ipv4?: boolean;
 };
 
+declare interface ComputedFields {
+    /** The path to the Wrangler configuration file (if any, and possibly redirected from the user Wrangler configuration) used to create this configuration. */
+    configPath: string | undefined;
+    /** The path to the user's Wrangler configuration file (if any), which may have been redirected to another file that used to create this configuration. */
+    userConfigPath: string | undefined;
+    /**
+     * The original top level name for the Worker in the raw configuration.
+     *
+     * When a raw configuration has been flattened to a single environment the worker name may have been replaced or transformed.
+     * It can be useful to know what the top-level name was before the flattening.
+     */
+    topLevelName: string | undefined;
+}
+
 declare class ConfigController extends Controller<ConfigControllerEventMap> {
     #private;
     latestInput?: StartDevWorkerInput;
@@ -787,7 +801,6 @@ declare type ConfigControllerEventMap = ControllerEventMap & {
 };
 
 declare interface ConfigFields<Dev extends RawDevConfig> {
-    configPath: string | undefined;
     /**
      * A boolean to enable "legacy" style wrangler environments (from Wrangler v1).
      * These have been superseded by Services, but there may be projects that won't
@@ -2476,9 +2489,10 @@ declare class ExecutionContext {
 
 export declare const experimental_patchConfig: (configPath: string, patch: Unstable_RawConfig, isArrayInsertion?: boolean) => string;
 
-export declare const experimental_readRawConfig: (args: ReadConfigCommandArgs) => {
+export declare const experimental_readRawConfig: (args: ReadConfigCommandArgs, options?: ReadConfigOptions) => {
     rawConfig: Unstable_RawConfig;
     configPath: string | undefined;
+    userConfigPath: string | undefined;
 };
 
 declare function fetch_2 (
@@ -3055,6 +3069,7 @@ declare type NormalizeAndValidateConfigArgs = {
     remote?: boolean;
     localProtocol?: string;
     upstreamProtocol?: string;
+    script?: string;
 };
 
 declare interface Observability {
@@ -25703,6 +25718,10 @@ declare type ReadConfigCommandArgs = NormalizeAndValidateConfigArgs & {
     script?: string;
 };
 
+declare type ReadConfigOptions = ResolveConfigPathOptions & {
+    hideWarnings?: boolean;
+};
+
 declare type ReadyEvent = {
     type: "ready";
     proxyWorker: Miniflare;
@@ -25831,6 +25850,10 @@ declare type RequestMode = 'cors' | 'navigate' | 'no-cors' | 'same-origin'
 
 declare type RequestRedirect = 'error' | 'follow' | 'manual'
 
+declare type ResolveConfigPathOptions = {
+    useRedirectIfAvailable?: boolean;
+};
+
 declare class Response_2 implements BodyMixin {
     constructor (body?: BodyInit, init?: ResponseInit_2)
 
@@ -26407,7 +26430,7 @@ export declare interface Unstable_ASSETSBindingsOptions {
  * - `@breaking`: the deprecation/optionality is a breaking change from Wrangler v1.
  * - `@todo`: there's more work to be done (with details attached).
  */
-export declare type Unstable_Config = ConfigFields<DevConfig> & PagesConfigFields & Environment;
+export declare type Unstable_Config = ComputedFields & ConfigFields<DevConfig> & PagesConfigFields & Environment;
 
 /**
  *  unstable_dev starts a wrangler dev server, and returns a promise that resolves with utility functions to interact with it.
@@ -26544,9 +26567,7 @@ export declare type Unstable_RawEnvironment = Partial<Environment> & Environment
 /**
  * Get the Wrangler configuration; read it from the give `configPath` if available.
  */
-export declare function unstable_readConfig(args: ReadConfigCommandArgs, options?: {
-    hideWarnings?: boolean;
-}): Unstable_Config;
+export declare function unstable_readConfig(args: ReadConfigCommandArgs, options?: ReadConfigOptions): Unstable_Config;
 
 /**
  * Split an SQLQuery into an array of statements