fix: update eszip + std (#364)

* fix: update eszip + std * fix: revert to version of std that contains node * fix: revert back to node/url
netlify · Apr 12, 2023 · 4b78e4c · 4b78e4c
1 parent 3a436d1
commit 4b78e4c
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 69 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -29,7 +29,7 @@ jobs:
           # Should match the `DENO_VERSION_RANGE` constant in `node/bridge.ts`.
           deno-version: v1.22.0
       - name: Setup Deno dependencies
-        run: deno cache https://deno.land/x/eszip@v0.37.0/eszip.ts
+        run: deno cache https://deno.land/x/eszip@v0.40.0/eszip.ts
       - name: Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:

diff --git a/deno/lib/common.ts b/deno/lib/common.ts
@@ -1,6 +1,6 @@
-import { load } from "https://deno.land/x/eszip@v0.37.0/loader.ts";
-import { LoadResponse } from "https://deno.land/x/eszip@v0.37.0/mod.ts";
-import * as path from "https://deno.land/std@0.178.0/path/mod.ts";
+import { load } from "https://deno.land/x/eszip@v0.40.0/loader.ts";
+import { LoadResponse } from "https://deno.land/x/eszip@v0.40.0/mod.ts";
+import * as path from "https://deno.land/std@0.177.0/path/mod.ts";
 import { retryAsync } from "https://deno.land/x/retry@v2.0.0/mod.ts";
 import { isTooManyTries } from "https://deno.land/x/retry@v2.0.0/retry/tooManyTries.ts";
 

diff --git a/deno/lib/stage2.test.ts b/deno/lib/stage2.test.ts
@@ -1,7 +1,7 @@
-import { assertEquals, assertStringIncludes } from 'https://deno.land/std@0.127.0/testing/asserts.ts'
+import { assertEquals, assertStringIncludes } from 'https://deno.land/std@0.177.0/testing/asserts.ts'
 
-import { join } from 'https://deno.land/std@0.155.0/path/mod.ts'
-import { pathToFileURL } from 'https://deno.land/std@0.155.0/node/url.ts'
+import { join } from 'https://deno.land/std@0.177.0/path/mod.ts'
+import { pathToFileURL } from 'https://deno.land/std@0.177.0/node/url.ts'
 
 import { getStage2Entry } from './stage2.ts'
 import { virtualRoot } from './consts.ts'

diff --git a/deno/lib/stage2.ts b/deno/lib/stage2.ts
@@ -1,6 +1,6 @@
-import { build, LoadResponse } from 'https://deno.land/x/eszip@v0.37.0/mod.ts'
+import { build, LoadResponse } from 'https://deno.land/x/eszip@v0.40.0/mod.ts'
 
-import * as path from 'https://deno.land/std@0.178.0/path/mod.ts'
+import * as path from 'https://deno.land/std@0.177.0/path/mod.ts'
 
 import type { InputFunction, WriteStage2Options } from '../../shared/stage2.ts'
 import { importMapSpecifier, virtualRoot } from '../../shared/consts.ts'

diff --git a/...or/deno.land/std@0.178.0/_util/asserts.ts → ...or/deno.land/std@0.177.0/_util/asserts.ts b/...or/deno.land/std@0.178.0/_util/asserts.ts → ...or/deno.land/std@0.177.0/_util/asserts.ts
diff --git a/.../vendor/deno.land/std@0.178.0/_util/os.ts → .../vendor/deno.land/std@0.177.0/_util/os.ts b/.../vendor/deno.land/std@0.178.0/_util/os.ts → .../vendor/deno.land/std@0.177.0/_util/os.ts
diff --git a/.../deno.land/std@0.178.0/path/_constants.ts → .../deno.land/std@0.177.0/path/_constants.ts b/.../deno.land/std@0.178.0/path/_constants.ts → .../deno.land/std@0.177.0/path/_constants.ts
diff --git a/.../deno.land/std@0.178.0/path/_interface.ts → .../deno.land/std@0.177.0/path/_interface.ts b/.../deno.land/std@0.178.0/path/_interface.ts → .../deno.land/std@0.177.0/path/_interface.ts
diff --git a/...endor/deno.land/std@0.178.0/path/_util.ts → ...endor/deno.land/std@0.177.0/path/_util.ts b/...endor/deno.land/std@0.178.0/path/_util.ts → ...endor/deno.land/std@0.177.0/path/_util.ts
diff --git a/...ndor/deno.land/std@0.178.0/path/common.ts → ...ndor/deno.land/std@0.177.0/path/common.ts b/...ndor/deno.land/std@0.178.0/path/common.ts → ...ndor/deno.land/std@0.177.0/path/common.ts
diff --git a/...vendor/deno.land/std@0.178.0/path/glob.ts → ...vendor/deno.land/std@0.177.0/path/glob.ts b/...vendor/deno.land/std@0.178.0/path/glob.ts → ...vendor/deno.land/std@0.177.0/path/glob.ts
diff --git a/.../vendor/deno.land/std@0.178.0/path/mod.ts → .../vendor/deno.land/std@0.177.0/path/mod.ts b/.../vendor/deno.land/std@0.178.0/path/mod.ts → .../vendor/deno.land/std@0.177.0/path/mod.ts
diff --git a/...endor/deno.land/std@0.178.0/path/posix.ts → ...endor/deno.land/std@0.177.0/path/posix.ts b/...endor/deno.land/std@0.178.0/path/posix.ts → ...endor/deno.land/std@0.177.0/path/posix.ts
diff --git a/...r/deno.land/std@0.178.0/path/separator.ts → ...r/deno.land/std@0.177.0/path/separator.ts b/...r/deno.land/std@0.178.0/path/separator.ts → ...r/deno.land/std@0.177.0/path/separator.ts
diff --git a/...endor/deno.land/std@0.178.0/path/win32.ts → ...endor/deno.land/std@0.177.0/path/win32.ts b/...endor/deno.land/std@0.178.0/path/win32.ts → ...endor/deno.land/std@0.177.0/path/win32.ts
diff --git a/deno/vendor/deno.land/x/eszip@v0.37.0/eszip_wasm_bg.wasm b/deno/vendor/deno.land/x/eszip@v0.37.0/eszip_wasm_bg.wasm
diff --git a/...d/x/eszip@v0.37.0/eszip_wasm.generated.js → ...d/x/eszip@v0.40.0/eszip_wasm.generated.js b/...d/x/eszip@v0.37.0/eszip_wasm.generated.js → ...d/x/eszip@v0.40.0/eszip_wasm.generated.js
@@ -1,10 +1,10 @@
 // @generated file from wasmbuild -- do not edit
 // deno-lint-ignore-file
 // deno-fmt-ignore-file
-// source-hash: 89edd81d716c7387c15968a0de6fbb8736997e92
+// source-hash: bd411f63844f927a64e51f4af9e1e9b07bb6f88b
 let wasm;
 
-const heap = new Array(32).fill(undefined);
+const heap = new Array(128).fill(undefined);
 
 heap.push(undefined, null, true, false);
 
@@ -16,30 +16,30 @@ function isLikeNone(x) {
   return x === undefined || x === null;
 }
 
-let cachedFloat64Memory0 = new Float64Array();
+let cachedFloat64Memory0 = null;
 
 function getFloat64Memory0() {
-  if (cachedFloat64Memory0.byteLength === 0) {
+  if (cachedFloat64Memory0 === null || cachedFloat64Memory0.byteLength === 0) {
     cachedFloat64Memory0 = new Float64Array(wasm.memory.buffer);
   }
   return cachedFloat64Memory0;
 }
 
-let cachedInt32Memory0 = new Int32Array();
+let cachedInt32Memory0 = null;
 
 function getInt32Memory0() {
-  if (cachedInt32Memory0.byteLength === 0) {
+  if (cachedInt32Memory0 === null || cachedInt32Memory0.byteLength === 0) {
     cachedInt32Memory0 = new Int32Array(wasm.memory.buffer);
   }
   return cachedInt32Memory0;
 }
 
 let WASM_VECTOR_LEN = 0;
 
-let cachedUint8Memory0 = new Uint8Array();
+let cachedUint8Memory0 = null;
 
 function getUint8Memory0() {
-  if (cachedUint8Memory0.byteLength === 0) {
+  if (cachedUint8Memory0 === null || cachedUint8Memory0.byteLength === 0) {
     cachedUint8Memory0 = new Uint8Array(wasm.memory.buffer);
   }
   return cachedUint8Memory0;
@@ -111,7 +111,7 @@ function getStringFromWasm0(ptr, len) {
 }
 
 function dropObject(idx) {
-  if (idx < 36) return;
+  if (idx < 132) return;
   heap[idx] = heap_next;
   heap_next = idx;
 }
@@ -122,10 +122,12 @@ function takeObject(idx) {
   return ret;
 }
 
-let cachedBigInt64Memory0 = new BigInt64Array();
+let cachedBigInt64Memory0 = null;
 
 function getBigInt64Memory0() {
-  if (cachedBigInt64Memory0.byteLength === 0) {
+  if (
+    cachedBigInt64Memory0 === null || cachedBigInt64Memory0.byteLength === 0
+  ) {
     cachedBigInt64Memory0 = new BigInt64Array(wasm.memory.buffer);
   }
   return cachedBigInt64Memory0;
@@ -226,7 +228,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
 }
 function __wbg_adapter_40(arg0, arg1, arg2) {
   wasm
-    ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hdb89611f6af59487(
+    ._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h9728315a111a4c15(
       arg0,
       arg1,
       addHeapObject(arg2),
@@ -263,7 +265,7 @@ function handleError(f, args) {
   }
 }
 function __wbg_adapter_98(arg0, arg1, arg2, arg3) {
-  wasm.wasm_bindgen__convert__closures__invoke2_mut__h73ff6ec860ceda5d(
+  wasm.wasm_bindgen__convert__closures__invoke2_mut__h8467648828c8f7b6(
     arg0,
     arg1,
     addHeapObject(arg2),
@@ -407,47 +409,47 @@ const imports = {
       const ret = BigInt.asUintN(64, arg0);
       return addHeapObject(ret);
     },
-    __wbg_new_1d9a920c6bfc44a8: function () {
-      const ret = new Array();
-      return addHeapObject(ret);
-    },
-    __wbindgen_string_new: function (arg0, arg1) {
-      const ret = getStringFromWasm0(arg0, arg1);
-      return addHeapObject(ret);
-    },
-    __wbg_push_740e4b286702d964: function (arg0, arg1) {
-      const ret = getObject(arg0).push(getObject(arg1));
-      return ret;
-    },
-    __wbg_length_6e3bbe7c8bd4dbd8: function (arg0) {
+    __wbg_length_e498fbc24f9c1d4f: function (arg0) {
       const ret = getObject(arg0).length;
       return ret;
     },
-    __wbg_new_8d2af00bc1e329ee: function (arg0, arg1) {
+    __wbg_new_15d3966e9981a196: function (arg0, arg1) {
       const ret = new Error(getStringFromWasm0(arg0, arg1));
       return addHeapObject(ret);
     },
     __wbindgen_memory: function () {
       const ret = wasm.memory;
       return addHeapObject(ret);
     },
-    __wbg_buffer_3f3d764d4747d564: function (arg0) {
+    __wbg_buffer_cf65c07de34b9a08: function (arg0) {
       const ret = getObject(arg0).buffer;
       return addHeapObject(ret);
     },
-    __wbg_newwithbyteoffsetandlength_d9aa266703cb98be: function (
+    __wbg_newwithbyteoffsetandlength_9fb2f11355ecadf5: function (
       arg0,
       arg1,
       arg2,
     ) {
       const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
       return addHeapObject(ret);
     },
-    __wbg_new_8c3f0052272a457a: function (arg0) {
+    __wbg_new_537b7341ce90bb31: function (arg0) {
       const ret = new Uint8Array(getObject(arg0));
       return addHeapObject(ret);
     },
-    __wbg_String_91fba7ded13ba54c: function (arg0, arg1) {
+    __wbg_new_b525de17f44a8943: function () {
+      const ret = new Array();
+      return addHeapObject(ret);
+    },
+    __wbindgen_string_new: function (arg0, arg1) {
+      const ret = getStringFromWasm0(arg0, arg1);
+      return addHeapObject(ret);
+    },
+    __wbg_push_49c286f04dd3bf59: function (arg0, arg1) {
+      const ret = getObject(arg0).push(getObject(arg1));
+      return ret;
+    },
+    __wbg_String_88810dfeb4021902: function (arg0, arg1) {
       const ret = String(getObject(arg1));
       const ptr0 = passStringToWasm0(
         ret,
@@ -466,39 +468,39 @@ const imports = {
       const ret = new Error(getStringFromWasm0(arg0, arg1));
       return addHeapObject(ret);
     },
-    __wbg_iterator_6f9d4f28845f426c: function () {
+    __wbg_iterator_55f114446221aa5a: function () {
       const ret = Symbol.iterator;
       return addHeapObject(ret);
     },
-    __wbg_newwithlength_f5933855e4f48a19: function (arg0) {
+    __wbg_newwithlength_b56c882b57805732: function (arg0) {
       const ret = new Uint8Array(arg0 >>> 0);
       return addHeapObject(ret);
     },
-    __wbg_read_1bddf8e8af59d1d6: function (arg0, arg1) {
+    __wbg_read_43a845bca3122d77: function (arg0, arg1) {
       const ret = getObject(arg0).read(getObject(arg1));
       return addHeapObject(ret);
     },
     __wbg_done_1c9555f2eaa593e9: function (arg0) {
       const ret = getObject(arg0).done;
       return ret;
     },
-    __wbg_toString_7be108a12ef03bc2: function (arg0) {
+    __wbg_toString_8c529acfe543ce16: function (arg0) {
       const ret = getObject(arg0).toString();
       return addHeapObject(ret);
     },
     __wbg_value_a5e55ed0660d29ac: function (arg0) {
       const ret = getObject(arg0).value;
       return isLikeNone(ret) ? 0 : addHeapObject(ret);
     },
-    __wbg_byteLength_87a0436a74adc26c: function (arg0) {
+    __wbg_byteLength_29d6f6f493852fd4: function (arg0) {
       const ret = getObject(arg0).byteLength;
       return ret;
     },
-    __wbg_length_9e1ae1900cb0fbd5: function (arg0) {
+    __wbg_length_27a2afe8ab42b09f: function (arg0) {
       const ret = getObject(arg0).length;
       return ret;
     },
-    __wbg_call_3999bee59e9f7719: function () {
+    __wbg_call_96878afb7a8201ca: function () {
       return handleError(function (arg0, arg1, arg2, arg3) {
         const ret = getObject(arg0).call(
           getObject(arg1),
@@ -508,11 +510,11 @@ const imports = {
         return addHeapObject(ret);
       }, arguments);
     },
-    __wbg_resolve_99fe17964f31ffc0: function (arg0) {
+    __wbg_resolve_fd40f858d9db1a04: function (arg0) {
       const ret = Promise.resolve(getObject(arg0));
       return addHeapObject(ret);
     },
-    __wbg_new_9962f939219f1820: function (arg0, arg1) {
+    __wbg_new_9d3a9ce4282a18a8: function (arg0, arg1) {
       try {
         var state0 = { a: arg0, b: arg1 };
         var cb0 = (arg0, arg1) => {
@@ -559,62 +561,62 @@ const imports = {
       const ret = typeof (getObject(arg0)) === "function";
       return ret;
     },
-    __wbg_get_57245cc7d7c7619d: function (arg0, arg1) {
+    __wbg_get_27fe3dac1c4d0224: function (arg0, arg1) {
       const ret = getObject(arg0)[arg1 >>> 0];
       return addHeapObject(ret);
     },
-    __wbg_next_aaef7c8aa5e212ac: function () {
+    __wbg_next_88560ec06a094dea: function () {
       return handleError(function (arg0) {
         const ret = getObject(arg0).next();
         return addHeapObject(ret);
       }, arguments);
     },
-    __wbg_done_1b73b0672e15f234: function (arg0) {
+    __wbg_done_1ebec03bbd919843: function (arg0) {
       const ret = getObject(arg0).done;
       return ret;
     },
-    __wbg_value_1ccc36bc03462d71: function (arg0) {
+    __wbg_value_6ac8da5cc5b3efda: function (arg0) {
       const ret = getObject(arg0).value;
       return addHeapObject(ret);
     },
-    __wbg_get_765201544a2b6869: function () {
+    __wbg_get_baf4855f9a986186: function () {
       return handleError(function (arg0, arg1) {
         const ret = Reflect.get(getObject(arg0), getObject(arg1));
         return addHeapObject(ret);
       }, arguments);
     },
-    __wbg_call_97ae9d8645dc388b: function () {
+    __wbg_call_95d1ea488d03e4e8: function () {
       return handleError(function (arg0, arg1) {
         const ret = getObject(arg0).call(getObject(arg1));
         return addHeapObject(ret);
       }, arguments);
     },
-    __wbg_next_579e583d33566a86: function (arg0) {
+    __wbg_next_b7d530c04fd8b217: function (arg0) {
       const ret = getObject(arg0).next;
       return addHeapObject(ret);
     },
-    __wbg_isArray_27c46c67f498e15d: function (arg0) {
+    __wbg_isArray_39d28997bf6b96b4: function (arg0) {
       const ret = Array.isArray(getObject(arg0));
       return ret;
     },
-    __wbg_call_168da88779e35f61: function () {
+    __wbg_call_9495de66fdbe016b: function () {
       return handleError(function (arg0, arg1, arg2) {
         const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
       }, arguments);
     },
-    __wbg_isSafeInteger_dfa0593e8d7ac35a: function (arg0) {
+    __wbg_isSafeInteger_8c4789029e885159: function (arg0) {
       const ret = Number.isSafeInteger(getObject(arg0));
       return ret;
     },
-    __wbg_set_83db9690f9353e79: function (arg0, arg1, arg2) {
+    __wbg_set_17499e8aa4003ebd: function (arg0, arg1, arg2) {
       getObject(arg0).set(getObject(arg1), arg2 >>> 0);
     },
     __wbindgen_jsval_loose_eq: function (arg0, arg1) {
       const ret = getObject(arg0) == getObject(arg1);
       return ret;
     },
-    __wbg_instanceof_Uint8Array_971eeda69eb75003: function (arg0) {
+    __wbg_instanceof_Uint8Array_01cebe79ca606cca: function (arg0) {
       let result;
       try {
         result = getObject(arg0) instanceof Uint8Array;
@@ -624,7 +626,7 @@ const imports = {
       const ret = result;
       return ret;
     },
-    __wbg_instanceof_ArrayBuffer_e5e48f4762c5610b: function (arg0) {
+    __wbg_instanceof_ArrayBuffer_a69f02ee4c4f5065: function (arg0) {
       let result;
       try {
         result = getObject(arg0) instanceof ArrayBuffer;
@@ -634,14 +636,14 @@ const imports = {
       const ret = result;
       return ret;
     },
-    __wbg_entries_65a76a413fc91037: function (arg0) {
+    __wbg_entries_4e1315b774245952: function (arg0) {
       const ret = Object.entries(getObject(arg0));
       return addHeapObject(ret);
     },
     __wbindgen_bigint_get_as_i64: function (arg0, arg1) {
       const v = getObject(arg1);
       const ret = typeof (v) === "bigint" ? v : undefined;
-      getBigInt64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0n : ret;
+      getBigInt64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? BigInt(0) : ret;
       getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret);
     },
     __wbindgen_debug_string: function (arg0, arg1) {
@@ -667,16 +669,16 @@ const imports = {
       const ret = false;
       return ret;
     },
-    __wbg_then_11f7a54d67b4bfad: function (arg0, arg1) {
+    __wbg_then_ec5db6d509eb475f: function (arg0, arg1) {
       const ret = getObject(arg0).then(getObject(arg1));
       return addHeapObject(ret);
     },
-    __wbg_then_cedad20fbbd9418a: function (arg0, arg1, arg2) {
+    __wbg_then_f753623316e2873a: function (arg0, arg1, arg2) {
       const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
       return addHeapObject(ret);
     },
-    __wbindgen_closure_wrapper7365: function (arg0, arg1, arg2) {
-      const ret = makeMutClosure(arg0, arg1, 272, __wbg_adapter_40);
+    __wbindgen_closure_wrapper7456: function (arg0, arg1, arg2) {
+      const ret = makeMutClosure(arg0, arg1, 275, __wbg_adapter_40);
       return addHeapObject(ret);
     },
   },

diff --git a/deno/vendor/deno.land/x/eszip@v0.40.0/eszip_wasm_bg.wasm b/deno/vendor/deno.land/x/eszip@v0.40.0/eszip_wasm_bg.wasm
diff --git a/...endor/deno.land/x/eszip@v0.37.0/loader.ts → ...endor/deno.land/x/eszip@v0.40.0/loader.ts b/...endor/deno.land/x/eszip@v0.37.0/loader.ts → ...endor/deno.land/x/eszip@v0.40.0/loader.ts
diff --git a/deno/vendor/deno.land/x/eszip@v0.37.0/mod.ts → deno/vendor/deno.land/x/eszip@v0.40.0/mod.ts b/deno/vendor/deno.land/x/eszip@v0.37.0/mod.ts → deno/vendor/deno.land/x/eszip@v0.40.0/mod.ts
diff --git a/test/util.ts b/test/util.ts
@@ -50,7 +50,7 @@ const runESZIP = async (eszipPath: string) => {
   const extractCommand = execa('deno', [
     'run',
     '--allow-all',
-    'https://deno.land/x/eszip@v0.37.0/eszip.ts',
+    'https://deno.land/x/eszip@v0.40.0/eszip.ts',
     'x',
     eszipPath,
     tmpDir.path,