chore: Merge branch 'next' of into feat/create-qiankun

umijs · Dec 28, 2023 · 30304fc · 30304fc
2 parents a2e539b + ad64bec
commit 30304fc
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 23 deletions.
diff --git a/.changeset/clean-walls-hang.md b/.changeset/clean-walls-hang.md
@@ -0,0 +1,5 @@
+---
+"@qiankunjs/webpack-plugin": patch
+---
+
+fix: move cheerio to dependencies
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -13,6 +13,7 @@
   },
   "changesets": [
     "big-cougars-draw",
+    "clean-walls-hang",
     "clever-carpets-vanish",
     "clever-dragons-ring",
     "empty-lions-rescue",

diff --git a/packages/sandbox/src/core/membrane/index.ts b/packages/sandbox/src/core/membrane/index.ts
@@ -148,8 +148,8 @@ export class Membrane {
         const actualTarget = propertiesWithGetter.has(p)
           ? incubatorContext
           : p in membraneTarget
-          ? membraneTarget
-          : incubatorContext;
+            ? membraneTarget
+            : incubatorContext;
         const value = actualTarget[p as never];
 
         // frozen value should return directly, see https://github.com/umijs/qiankun/issues/2015

diff --git a/packages/shared/src/fetch-utils/wrapFetchWithCache.ts b/packages/shared/src/fetch-utils/wrapFetchWithCache.ts
@@ -23,7 +23,7 @@ export const wrapFetchWithCache: (fetch: Fetch) => Fetch = (fetch) => {
   const lruCache = getGlobalCache();
 
   const cachedFetch: Fetch = (input, init) => {
-    const fetchInput = input as Parameters<Fetch>[0];
+    const fetchInput = input;
     const cacheKey = getCacheKey(fetchInput);
     const wrapFetchPromise = async (promise: Promise<Response>): Promise<Response> => {
       try {

diff --git a/packages/webpack-plugin/CHANGELOG.md b/packages/webpack-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @qiankunjs/webpack-plugin
 
+## 0.0.1-rc.4
+
+### Patch Changes
+
+- 35f7863: fix: move cheerio to dependencies
+
 ## 0.0.1-rc.3
 
 ### Patch Changes

diff --git a/packages/webpack-plugin/package.json b/packages/webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@qiankunjs/webpack-plugin",
-  "version": "0.0.1-rc.3",
+  "version": "0.0.1-rc.4",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -20,11 +20,11 @@
   "author": "Hermanna",
   "license": "MIT",
   "dependencies": {
-    "webpack-sources": "^3.2.3"
+    "webpack-sources": "^3.2.3",
+    "cheerio": "1.0.0-rc.12"
   },
   "devDependencies": {
     "@types/webpack-sources": "^3.2.1",
-    "cheerio": "1.0.0-rc.12",
     "webpack": "^4.0.0 || ^5.0.0"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml