fix: ensure to wrap fetch in setFetch

guybedford · guybedford · commit 767ce36ac361 · 2025-02-17T20:30:17.000-08:00
diff --git a/src/common/fetch.ts b/src/common/fetch.ts
@@ -45,7 +45,7 @@ let _fetch: WrappedFetch = wrappedFetch(fetchImpl);
  * Allows customizing the fetch implementation used by the generator.
  */
 export function setFetch(fetch: typeof globalThis.fetch | WrappedFetch) {
-  _fetch = fetch as WrappedFetch;
+  _fetch = wrappedFetch(fetch as WrappedFetch);
 }
 
 export { clearCache, _fetch as fetch };
diff --git a/test/test.html b/test/test.html
@@ -1,100 +1,85 @@
 <!DOCTYPE html>
 <!-- Generated by @jspm/generator - https://github.com/jspm/generator -->
-<script async src="https://ga.jspm.io/npm:es-module-shims@1.10.0/dist/es-module-shims.js" crossorigin="anonymous"></script>
+<script async src="https://ga.jspm.io/npm:es-module-shims@2.0.9/dist/es-module-shims.js" crossorigin="anonymous"></script>
 <script type="importmap">
 {
   "imports": {
     "@jspm/generator": "../dist/generator.js",
-    "assert": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/assert.js"
+    "assert": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/assert.js"
   },
   "scopes": {
     "../": {
       "#fetch": "../dist/fetch-native.js",
-      "@babel/core": "https://ga.jspm.io/npm:@babel/core@7.25.8/lib/index.js",
-      "@babel/plugin-syntax-import-attributes": "https://ga.jspm.io/npm:@babel/plugin-syntax-import-attributes@7.25.7/lib/index.js",
-      "@babel/preset-typescript": "https://ga.jspm.io/npm:@babel/preset-typescript@7.24.7/lib/index.js",
+      "@babel/core": "https://ga.jspm.io/npm:@babel/core@7.26.9/lib/index.js",
+      "@babel/plugin-syntax-import-attributes": "https://ga.jspm.io/npm:@babel/plugin-syntax-import-attributes@7.26.0/lib/index.js",
+      "@babel/preset-typescript": "https://ga.jspm.io/npm:@babel/preset-typescript@7.26.0/lib/index.js",
       "@jspm/import-map": "https://ga.jspm.io/npm:@jspm/import-map@1.1.0/dist/map.js",
-      "es-module-lexer": "https://ga.jspm.io/npm:es-module-lexer@1.5.4/dist/lexer.js",
-      "es-module-lexer/js": "https://ga.jspm.io/npm:es-module-lexer@1.5.4/dist/lexer.asm.js",
-      "fs": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/fs.js",
-      "process": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/process-production.js",
+      "es-module-lexer": "https://ga.jspm.io/npm:es-module-lexer@1.6.0/dist/lexer.js",
+      "es-module-lexer/js": "https://ga.jspm.io/npm:es-module-lexer@1.6.0/dist/lexer.asm.js",
+      "fs": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/fs.js",
+      "process": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/process-production.js",
       "sver": "https://ga.jspm.io/npm:sver@1.8.4/sver.js",
       "sver/convert-range.js": "https://ga.jspm.io/npm:sver@1.8.4/convert-range.js",
-      "url": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/url.js"
+      "url": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/url.js"
     },
     "https://ga.jspm.io/": {
-      "#lib/config/files/index.js": "https://ga.jspm.io/npm:@babel/core@7.25.8/lib/config/files/index-browser.js",
-      "#lib/config/resolve-targets.js": "https://ga.jspm.io/npm:@babel/core@7.25.8/lib/config/resolve-targets-browser.js",
-      "#lib/transform-file.js": "https://ga.jspm.io/npm:@babel/core@7.25.8/lib/transform-file-browser.js",
-      "#node.js": "https://ga.jspm.io/npm:browserslist@4.24.0/browser.js",
+      "#lib/config/files/index.js": "https://ga.jspm.io/npm:@babel/core@7.26.9/lib/config/files/index-browser.js",
+      "#lib/config/resolve-targets.js": "https://ga.jspm.io/npm:@babel/core@7.26.9/lib/config/resolve-targets-browser.js",
+      "#lib/transform-file.js": "https://ga.jspm.io/npm:@babel/core@7.26.9/lib/transform-file-browser.js",
+      "#node.js": "https://ga.jspm.io/npm:browserslist@4.24.4/browser.js",
       "@ampproject/remapping": "https://ga.jspm.io/npm:@ampproject/remapping@2.3.0/dist/remapping.umd.js",
-      "@babel/code-frame": "https://ga.jspm.io/npm:@babel/code-frame@7.25.7/lib/index.js",
-      "@babel/compat-data/native-modules": "https://ga.jspm.io/npm:@babel/compat-data@7.25.4/native-modules.js",
-      "@babel/compat-data/plugins": "https://ga.jspm.io/npm:@babel/compat-data@7.25.4/plugins.js",
-      "@babel/core": "https://ga.jspm.io/npm:@babel/core@7.25.8/lib/index.js",
-      "@babel/generator": "https://ga.jspm.io/npm:@babel/generator@7.25.6/lib/index.js",
-      "@babel/helper-annotate-as-pure": "https://ga.jspm.io/npm:@babel/helper-annotate-as-pure@7.25.7/lib/index.js",
-      "@babel/helper-compilation-targets": "https://ga.jspm.io/npm:@babel/helper-compilation-targets@7.25.2/lib/index.js",
-      "@babel/helper-create-class-features-plugin": "https://ga.jspm.io/npm:@babel/helper-create-class-features-plugin@7.25.7/lib/index.js",
-      "@babel/helper-member-expression-to-functions": "https://ga.jspm.io/npm:@babel/helper-member-expression-to-functions@7.25.7/lib/index.js",
-      "@babel/helper-module-imports": "https://ga.jspm.io/npm:@babel/helper-module-imports@7.24.7/lib/index.js",
-      "@babel/helper-module-transforms": "https://ga.jspm.io/npm:@babel/helper-module-transforms@7.25.2/lib/index.js",
-      "@babel/helper-optimise-call-expression": "https://ga.jspm.io/npm:@babel/helper-optimise-call-expression@7.25.7/lib/index.js",
-      "@babel/helper-plugin-utils": "https://ga.jspm.io/npm:@babel/helper-plugin-utils@7.25.7/lib/index.js",
-      "@babel/helper-replace-supers": "https://ga.jspm.io/npm:@babel/helper-replace-supers@7.25.0/lib/index.js",
-      "@babel/helper-simple-access": "https://ga.jspm.io/npm:@babel/helper-simple-access@7.24.7/lib/index.js",
-      "@babel/helper-skip-transparent-expression-wrappers": "https://ga.jspm.io/npm:@babel/helper-skip-transparent-expression-wrappers@7.25.7/lib/index.js",
-      "@babel/helper-string-parser": "https://ga.jspm.io/npm:@babel/helper-string-parser@7.25.7/lib/index.js",
-      "@babel/helper-validator-identifier": "https://ga.jspm.io/npm:@babel/helper-validator-identifier@7.25.7/lib/index.js",
-      "@babel/helper-validator-option": "https://ga.jspm.io/npm:@babel/helper-validator-option@7.24.8/lib/index.js",
-      "@babel/helpers": "https://ga.jspm.io/npm:@babel/helpers@7.25.6/lib/index.js",
-      "@babel/highlight": "https://ga.jspm.io/npm:@babel/highlight@7.25.7/lib/index.js",
-      "@babel/parser": "https://ga.jspm.io/npm:@babel/parser@7.25.8/lib/index.js",
-      "@babel/plugin-syntax-jsx": "https://ga.jspm.io/npm:@babel/plugin-syntax-jsx@7.24.7/lib/index.js",
-      "@babel/plugin-syntax-typescript": "https://ga.jspm.io/npm:@babel/plugin-syntax-typescript@7.25.4/lib/index.js",
-      "@babel/plugin-transform-modules-commonjs": "https://ga.jspm.io/npm:@babel/plugin-transform-modules-commonjs@7.24.8/lib/index.js",
-      "@babel/plugin-transform-typescript": "https://ga.jspm.io/npm:@babel/plugin-transform-typescript@7.25.2/lib/index.js",
-      "@babel/template": "https://ga.jspm.io/npm:@babel/template@7.25.7/lib/index.js",
-      "@babel/traverse": "https://ga.jspm.io/npm:@babel/traverse@7.25.6/lib/index.js",
-      "@babel/types": "https://ga.jspm.io/npm:@babel/types@7.25.8/lib/index.js",
-      "@jridgewell/gen-mapping": "https://ga.jspm.io/npm:@jridgewell/gen-mapping@0.3.5/dist/gen-mapping.umd.js",
+      "@babel/code-frame": "https://ga.jspm.io/npm:@babel/code-frame@7.26.2/lib/index.js",
+      "@babel/compat-data/native-modules": "https://ga.jspm.io/npm:@babel/compat-data@7.26.8/native-modules.js",
+      "@babel/compat-data/plugins": "https://ga.jspm.io/npm:@babel/compat-data@7.26.8/plugins.js",
+      "@babel/core": "https://ga.jspm.io/npm:@babel/core@7.26.9/lib/index.js",
+      "@babel/generator": "https://ga.jspm.io/npm:@babel/generator@7.26.9/lib/index.js",
+      "@babel/helper-annotate-as-pure": "https://ga.jspm.io/npm:@babel/helper-annotate-as-pure@7.25.9/lib/index.js",
+      "@babel/helper-compilation-targets": "https://ga.jspm.io/npm:@babel/helper-compilation-targets@7.26.5/lib/index.js",
+      "@babel/helper-create-class-features-plugin": "https://ga.jspm.io/npm:@babel/helper-create-class-features-plugin@7.26.9/lib/index.js",
+      "@babel/helper-member-expression-to-functions": "https://ga.jspm.io/npm:@babel/helper-member-expression-to-functions@7.25.9/lib/index.js",
+      "@babel/helper-module-imports": "https://ga.jspm.io/npm:@babel/helper-module-imports@7.25.9/lib/index.js",
+      "@babel/helper-module-transforms": "https://ga.jspm.io/npm:@babel/helper-module-transforms@7.26.0/lib/index.js",
+      "@babel/helper-optimise-call-expression": "https://ga.jspm.io/npm:@babel/helper-optimise-call-expression@7.25.9/lib/index.js",
+      "@babel/helper-plugin-utils": "https://ga.jspm.io/npm:@babel/helper-plugin-utils@7.26.5/lib/index.js",
+      "@babel/helper-replace-supers": "https://ga.jspm.io/npm:@babel/helper-replace-supers@7.26.5/lib/index.js",
+      "@babel/helper-skip-transparent-expression-wrappers": "https://ga.jspm.io/npm:@babel/helper-skip-transparent-expression-wrappers@7.25.9/lib/index.js",
+      "@babel/helper-string-parser": "https://ga.jspm.io/npm:@babel/helper-string-parser@7.25.9/lib/index.js",
+      "@babel/helper-validator-identifier": "https://ga.jspm.io/npm:@babel/helper-validator-identifier@7.25.9/lib/index.js",
+      "@babel/helper-validator-option": "https://ga.jspm.io/npm:@babel/helper-validator-option@7.25.9/lib/index.js",
+      "@babel/helpers": "https://ga.jspm.io/npm:@babel/helpers@7.26.9/lib/index.js",
+      "@babel/parser": "https://ga.jspm.io/npm:@babel/parser@7.26.9/lib/index.js",
+      "@babel/plugin-syntax-jsx": "https://ga.jspm.io/npm:@babel/plugin-syntax-jsx@7.25.9/lib/index.js",
+      "@babel/plugin-syntax-typescript": "https://ga.jspm.io/npm:@babel/plugin-syntax-typescript@7.25.9/lib/index.js",
+      "@babel/plugin-transform-modules-commonjs": "https://ga.jspm.io/npm:@babel/plugin-transform-modules-commonjs@7.26.3/lib/index.js",
+      "@babel/plugin-transform-typescript": "https://ga.jspm.io/npm:@babel/plugin-transform-typescript@7.26.8/lib/index.js",
+      "@babel/template": "https://ga.jspm.io/npm:@babel/template@7.26.9/lib/index.js",
+      "@babel/traverse": "https://ga.jspm.io/npm:@babel/traverse@7.26.9/lib/index.js",
+      "@babel/types": "https://ga.jspm.io/npm:@babel/types@7.26.9/lib/index.js",
+      "@jridgewell/gen-mapping": "https://ga.jspm.io/npm:@jridgewell/gen-mapping@0.3.8/dist/gen-mapping.umd.js",
       "@jridgewell/resolve-uri": "https://ga.jspm.io/npm:@jridgewell/resolve-uri@3.1.2/dist/resolve-uri.umd.js",
       "@jridgewell/set-array": "https://ga.jspm.io/npm:@jridgewell/set-array@1.2.1/dist/set-array.umd.js",
       "@jridgewell/sourcemap-codec": "https://ga.jspm.io/npm:@jridgewell/sourcemap-codec@1.5.0/dist/sourcemap-codec.umd.js",
       "@jridgewell/trace-mapping": "https://ga.jspm.io/npm:@jridgewell/trace-mapping@0.3.25/dist/trace-mapping.umd.js",
-      "ansi-styles": "https://ga.jspm.io/npm:ansi-styles@3.2.1/index.js",
-      "browserslist": "https://ga.jspm.io/npm:browserslist@4.24.0/index.js",
-      "buffer": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/buffer.js",
-      "caniuse-lite/dist/unpacker/agents": "https://ga.jspm.io/npm:caniuse-lite@1.0.30001664/dist/unpacker/agents.js",
-      "chalk": "https://ga.jspm.io/npm:chalk@2.4.2/index.js",
-      "color-convert": "https://ga.jspm.io/npm:color-convert@1.9.3/index.js",
-      "color-name": "https://ga.jspm.io/npm:color-name@1.1.3/index.js",
+      "browserslist": "https://ga.jspm.io/npm:browserslist@4.24.4/index.js",
+      "buffer": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/buffer.js",
+      "caniuse-lite/dist/unpacker/agents": "https://ga.jspm.io/npm:caniuse-lite@1.0.30001700/dist/unpacker/agents.js",
       "convert-source-map": "https://ga.jspm.io/npm:convert-source-map@2.0.0/index.js",
-      "debug": "https://ga.jspm.io/npm:debug@4.3.7/src/browser.js",
-      "electron-to-chromium/versions": "https://ga.jspm.io/npm:electron-to-chromium@1.5.37/versions.js",
-      "escape-string-regexp": "https://ga.jspm.io/npm:escape-string-regexp@1.0.5/index.js",
-      "fs": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/fs.js",
+      "debug": "https://ga.jspm.io/npm:debug@4.4.0/src/browser.js",
+      "electron-to-chromium/versions": "https://ga.jspm.io/npm:electron-to-chromium@1.5.102/versions.js",
+      "fs": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/fs.js",
       "gensync": "https://ga.jspm.io/npm:gensync@1.0.0-beta.2/index.js",
       "globals": "https://ga.jspm.io/npm:globals@11.12.0/index.js",
       "js-tokens": "https://ga.jspm.io/npm:js-tokens@4.0.0/index.js",
-      "jsesc": "https://ga.jspm.io/npm:jsesc@2.5.2/jsesc.js",
+      "jsesc": "https://ga.jspm.io/npm:jsesc@3.1.0/jsesc.js",
       "lru-cache": "https://ga.jspm.io/npm:lru-cache@5.1.1/index.js",
       "ms": "https://ga.jspm.io/npm:ms@2.1.3/index.js",
-      "node-releases/data/processed/envs.json": "https://ga.jspm.io/npm:node-releases@2.0.18/data/processed/envs.json.js",
-      "node-releases/data/release-schedule/release-schedule.json": "https://ga.jspm.io/npm:node-releases@2.0.18/data/release-schedule/release-schedule.json.js",
-      "path": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/path.js",
-      "picocolors": "https://ga.jspm.io/npm:picocolors@1.1.0/picocolors.browser.js",
-      "process": "https://ga.jspm.io/npm:@jspm/core@2.0.1/nodelibs/browser/process-production.js",
+      "node-releases/data/processed/envs.json": "https://ga.jspm.io/npm:node-releases@2.0.19/data/processed/envs.json.js",
+      "node-releases/data/release-schedule/release-schedule.json": "https://ga.jspm.io/npm:node-releases@2.0.19/data/release-schedule/release-schedule.json.js",
+      "path": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/path.js",
+      "picocolors": "https://ga.jspm.io/npm:picocolors@1.1.1/picocolors.browser.js",
+      "process": "https://ga.jspm.io/npm:@jspm/core@2.1.0/nodelibs/browser/process-production.js",
       "semver": "https://ga.jspm.io/npm:semver@6.3.1/semver.js",
-      "supports-color": "https://ga.jspm.io/npm:supports-color@5.5.0/browser.js",
-      "to-fast-properties": "https://ga.jspm.io/npm:to-fast-properties@2.0.0/index.js",
       "yallist": "https://ga.jspm.io/npm:yallist@3.1.1/yallist.js"
-    },
-    "https://ga.jspm.io/npm:@babel/helper-replace-supers@7.25.0/": {
-      "@babel/helper-member-expression-to-functions": "https://ga.jspm.io/npm:@babel/helper-member-expression-to-functions@7.24.8/lib/index.js"
-    },
-    "https://ga.jspm.io/npm:@babel/plugin-transform-typescript@7.25.2/": {
-      "@babel/helper-skip-transparent-expression-wrappers": "https://ga.jspm.io/npm:@babel/helper-skip-transparent-expression-wrappers@7.24.7/lib/index.js"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ let _fetch: WrappedFetch = wrappedFetch(fetchImpl);`
`45`	`45`	`* Allows customizing the fetch implementation used by the generator.`
`46`	`46`	`*/`
`47`	`47`	`export function setFetch(fetch: typeof globalThis.fetch \| WrappedFetch) {`
`48`		`- _fetch = fetch as WrappedFetch;`
	`48`	`+ _fetch = wrappedFetch(fetch as WrappedFetch);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`export { clearCache, _fetch as fetch };`