fix: rename .wasm to -wasm to appease jest (nodejs#2064)

* fix: rename .wasm to -wasm to appease jest * fix: use local server for redirect node-fetch test
crysmags · Feb 27, 2024 · d836878 · d836878
1 parent e975645
commit d836878
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/build/wasm.js b/build/wasm.js
@@ -46,7 +46,7 @@ execSync(`${WASI_ROOT}/bin/clang \
 
 const base64Wasm = readFileSync(join(WASM_OUT, 'llhttp.wasm')).toString('base64')
 writeFileSync(
-  join(WASM_OUT, 'llhttp.wasm.js'),
+  join(WASM_OUT, 'llhttp-wasm.js'),
   `module.exports = "${base64Wasm}";\n`
 )
 
@@ -74,6 +74,6 @@ execSync(`${WASI_ROOT}/bin/clang \
 
 const base64WasmSimd = readFileSync(join(WASM_OUT, 'llhttp_simd.wasm')).toString('base64')
 writeFileSync(
-  join(WASM_OUT, 'llhttp_simd.wasm.js'),
+  join(WASM_OUT, 'llhttp_simd-wasm.js'),
   `module.exports = "${base64WasmSimd}";\n`
 )
diff --git a/lib/client.js b/lib/client.js
@@ -359,19 +359,19 @@ const createRedirectInterceptor = require('./interceptor/redirectInterceptor')
 const EMPTY_BUF = Buffer.alloc(0)
 
 async function lazyllhttp () {
-  const llhttpWasmData = process.env.JEST_WORKER_ID ? require('./llhttp/llhttp.wasm.js') : undefined
+  const llhttpWasmData = process.env.JEST_WORKER_ID ? require('./llhttp/llhttp-wasm.js') : undefined
 
   let mod
   try {
-    mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp_simd.wasm.js'), 'base64'))
+    mod = await WebAssembly.compile(Buffer.from(require('./llhttp/llhttp_simd-wasm.js'), 'base64'))
   } catch (e) {
     /* istanbul ignore next */
 
     // We could check if the error was caused by the simd option not
     // being enabled, but the occurring of this other error
     // * https://github.com/emscripten-core/emscripten/issues/11495
     // got me to remove that check to avoid breaking Node 12.
-    mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require('./llhttp/llhttp.wasm.js'), 'base64'))
+    mod = await WebAssembly.compile(Buffer.from(llhttpWasmData || require('./llhttp/llhttp-wasm.js'), 'base64'))
   }
 
   return await WebAssembly.instantiate(mod, {

diff --git a/lib/llhttp/llhttp.wasm.js → lib/llhttp/llhttp-wasm.js b/lib/llhttp/llhttp.wasm.js → lib/llhttp/llhttp-wasm.js
diff --git a/lib/llhttp/llhttp_simd.wasm.js → lib/llhttp/llhttp_simd-wasm.js b/lib/llhttp/llhttp_simd.wasm.js → lib/llhttp/llhttp_simd-wasm.js
diff --git a/test/node-fetch/main.js b/test/node-fetch/main.js
@@ -1648,15 +1648,15 @@ describe('node-fetch', () => {
 
   it('should allow manual redirect handling', function () {
     this.timeout(5000)
-    const url = 'https://httpbin.org/status/302'
+    const url = `${base}redirect/302`
     const options = {
       redirect: 'manual'
     }
     return fetch(url, options).then(res => {
       expect(res.status).to.equal(302)
       expect(res.url).to.equal(url)
       expect(res.type).to.equal('basic')
-      expect(res.headers.get('Location')).to.equal('/redirect/1')
+      expect(res.headers.get('Location')).to.equal('/inspect')
       expect(res.ok).to.be.false
     })
   })