feat: add support for include and exclude when publishing site assets

cloudflare · Jan 24, 2022 · 2453577 · 2453577
1 parent 0289882
commit 2453577
Show file tree

Hide file tree

Showing 10 changed files with 635 additions and 129 deletions.
diff --git a/.changeset/fair-buses-fix.md b/.changeset/fair-buses-fix.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+feat: add support for include and exclude when publishing site assets
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/wrangler/package.json b/packages/wrangler/package.json
@@ -65,6 +65,7 @@
     "finalhandler": "^1.1.2",
     "find-up": "^6.2.0",
     "formdata-node": "^4.3.1",
+    "ignore": "^5.2.0",
     "ink": "^3.2.0",
     "ink-select-input": "^4.2.1",
     "ink-table": "^3.0.0",

diff --git a/packages/wrangler/src/__tests__/dev.test.tsx b/packages/wrangler/src/__tests__/dev.test.tsx
@@ -39,7 +39,7 @@ function renderDev({
   jsxFragment,
   bindings = {},
   public: publicDir,
-  site,
+  assetPaths,
   compatibilityDate,
   compatibilityFlags,
   usageModel,
@@ -56,7 +56,7 @@ function renderDev({
       jsxFactory={jsxFactory}
       jsxFragment={jsxFragment}
       accountId={accountId}
-      site={site}
+      assetPaths={assetPaths}
       public={publicDir}
       compatibilityDate={compatibilityDate}
       compatibilityFlags={compatibilityFlags}

diff --git a/packages/wrangler/src/__tests__/kv.test.ts b/packages/wrangler/src/__tests__/kv.test.ts
@@ -681,43 +681,6 @@ describe("wrangler", () => {
     });
 
     describe("list", () => {
-      function mockKeyListRequest(
-        expectedNamespaceId: string,
-        expectedKeys: string[],
-        keysPerRequest = 1000
-      ) {
-        const requests = { count: 0 };
-        // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
-        const expectedKeyObjects = expectedKeys.map((name) => ({
-          name,
-          expiration: 123456789,
-          metadata: {},
-        }));
-        setMockRawResponse(
-          "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
-          ([_url, accountId, namespaceId], _init, query) => {
-            requests.count++;
-            expect(accountId).toEqual("some-account-id");
-            expect(namespaceId).toEqual(expectedNamespaceId);
-            if (expectedKeyObjects.length <= keysPerRequest) {
-              return createFetchResult(expectedKeyObjects);
-            } else {
-              const start = parseInt(query.get("cursor") ?? "0") || 0;
-              const end = start + keysPerRequest;
-              const cursor = end < expectedKeyObjects.length ? end : undefined;
-              return createFetchResult(
-                expectedKeyObjects.slice(start, end),
-                true,
-                [],
-                [],
-                { cursor }
-              );
-            }
-          }
-        );
-        return requests;
-      }
-
       it("should list the keys of a namespace specified by namespace-id", async () => {
         const keys = ["key-1", "key-2", "key-3"];
         mockKeyListRequest("some-namespace-id", keys);
@@ -1196,3 +1159,41 @@ function writeWranglerConfig() {
     "utf-8"
   );
 }
+
+export function mockKeyListRequest(
+  expectedNamespaceId: string,
+  expectedKeys: string[],
+  keysPerRequest = 1000
+) {
+  const requests = { count: 0 };
+  // See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
+  const expectedKeyObjects = expectedKeys.map((name) => ({
+    name,
+    expiration: 123456789,
+    metadata: {},
+  }));
+  setMockRawResponse(
+    "/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
+    "GET",
+    ([_url, accountId, namespaceId], _init, query) => {
+      requests.count++;
+      expect(accountId).toEqual("some-account-id");
+      expect(namespaceId).toEqual(expectedNamespaceId);
+      if (expectedKeyObjects.length <= keysPerRequest) {
+        return createFetchResult(expectedKeyObjects);
+      } else {
+        const start = parseInt(query.get("cursor") ?? "0") || 0;
+        const end = start + keysPerRequest;
+        const cursor = end < expectedKeyObjects.length ? end : undefined;
+        return createFetchResult(
+          expectedKeyObjects.slice(start, end),
+          true,
+          [],
+          [],
+          { cursor }
+        );
+      }
+    }
+  );
+  return requests;
+}