chore: Merge branch 'main' of https://github.com/web-infra-dev/garfish

web-infra-dev · Jan 24, 2024 · 029766d · 029766d
2 parents 1233f4f + bd8a4b1
commit 029766d
Show file tree

Hide file tree

Showing 29 changed files with 296 additions and 235 deletions.
diff --git a/package.json b/package.json
@@ -93,7 +93,7 @@
     "workspace-tools": "0.16.2",
     "zx": "4.2.0"
   },
-  "version": "1.17.1",
+  "version": "1.17.2",
   "packageManager": "[email protected]",
   "engines": {
     "node": ">=16.14.0"

diff --git a/packages/bridge-react-v18/package.json b/packages/bridge-react-v18/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/bridge-react-v18",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish module.",
   "keywords": [
     "garfish",
@@ -22,7 +22,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/bridge-react/package.json b/packages/bridge-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/bridge-react",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish module.",
   "keywords": [
     "garfish",
@@ -22,7 +22,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/bridge-vue-v2/package.json b/packages/bridge-vue-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/bridge-vue-v2",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish vue bridge for v2.",
   "keywords": [
     "garfish",
@@ -23,7 +23,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/bridge-vue-v3/package.json b/packages/bridge-vue-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/bridge-vue-v3",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish vue bridge for v3.",
   "keywords": [
     "garfish",
@@ -23,7 +23,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/browser-snapshot/package.json b/packages/browser-snapshot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/browser-snapshot",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "browser-snapshot module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/browser-vm/package.json b/packages/browser-vm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/browser-vm",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "vm-sandbox module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/browser-vm/src/dynamicNode/index.ts b/packages/browser-vm/src/dynamicNode/index.ts
@@ -114,7 +114,8 @@ export function makeElInjector(sandboxConfig: SandboxOptions) {
 
   if (typeof window.Element === 'function') {
     // iframe can read html container this can't point to proxyDocument has Illegal invocation error
-    if (sandboxConfig.fixBaseUrl) safeWrapper(() => handleOwnerDocument());
+    if (sandboxConfig.fixBaseUrl || sandboxConfig.fixOwnerDocument)
+      safeWrapper(() => handleOwnerDocument());
     const rewrite = (
       methods: Array<string>,
       builder: typeof injector | typeof injectorRemoveChild,

diff --git a/packages/browser-vm/src/pluginify.ts b/packages/browser-vm/src/pluginify.ts
@@ -130,11 +130,13 @@ function createOptions(Garfish: interfaces.Garfish) {
           fixStaticResourceBaseUrl: Boolean(
             appInfo.sandbox?.fixStaticResourceBaseUrl,
           ),
+          fixOwnerDocument: Boolean(appInfo.sandbox?.fixOwnerDocument),
           disableWith: Boolean(appInfo.sandbox?.disableWith),
           disableElementtiming: Boolean(appInfo.sandbox?.disableElementtiming),
           strictIsolation: Boolean(appInfo.sandbox?.strictIsolation),
           // 缓存模式，不收集副作用
-          disableCollect: appInfo.cache === undefined ? true : Boolean(appInfo.cache),
+          disableCollect:
+            appInfo.cache === undefined ? true : Boolean(appInfo.cache),
           el: () => appInstance.htmlNode,
           styleScopeId: () => appInstance.appContainer.id,
           protectVariable: () => appInfo.protectVariable || [],

diff --git a/packages/browser-vm/src/proxyInterceptor/document.ts b/packages/browser-vm/src/proxyInterceptor/document.ts
@@ -65,6 +65,12 @@ export function createGetter(sandbox: Sandbox) {
           const el = value.call(document, tagName, options);
           return setSandboxRef(el);
         };
+      }
+      if (p === 'createElementNS') {
+        return function (...args) {
+          const el = value.call(document, ...args);
+          return setSandboxRef(el);
+        };
       } else if (p === 'createTextNode') {
         return function (data) {
           const el = value.call(document, data);

diff --git a/packages/browser-vm/src/types.ts b/packages/browser-vm/src/types.ts
@@ -22,6 +22,7 @@ export interface SandboxOptions {
   namespace: string;
   baseUrl?: string;
   fixBaseUrl?: boolean;
+  fixOwnerDocument?: boolean;
   fixStaticResourceBaseUrl?: boolean;
   disableWith?: boolean;
   strictIsolation?: boolean;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/core",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "core module.",
   "keywords": [
     "garfish",
@@ -20,7 +20,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts
@@ -114,6 +114,7 @@ export const createDefaultOptions = () => {
       disableWith: false,
       strictIsolation: false,
       disableElementtiming: false,
+      fixOwnerDocument: false,
     },
     // global hooks
     beforeLoad: () => {},

diff --git a/packages/core/src/interface.ts b/packages/core/src/interface.ts
@@ -81,6 +81,7 @@ export namespace interfaces {
     disableWith?: boolean;
     strictIsolation?: boolean;
     disableElementtiming?: boolean;
+    fixOwnerDocument?: boolean;
   }
 
   export interface Config {

diff --git a/packages/css-scope/package.json b/packages/css-scope/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/css-scope",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "css scope",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/es-module/package.json b/packages/es-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/es-module",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "es module polyfill",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/garfish/package.json b/packages/garfish/package.json
@@ -1,6 +1,6 @@
 {
   "name": "garfish",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/hooks",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "hooks module.",
   "keywords": [
     "garfish",
@@ -12,7 +12,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/loader/package.json b/packages/loader/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/loader",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "loader module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/remote-module/package.json b/packages/remote-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/remote-module",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "remote-module module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/router/package.json b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/router",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "router module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/test-suite/package.json b/packages/test-suite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/test-suite",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "garfish test suite.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },

diff --git a/packages/utils/package.json b/packages/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@garfish/utils",
-  "version": "1.17.1",
+  "version": "1.17.2",
   "description": "utils module.",
   "keywords": [
     "garfish",
@@ -19,7 +19,8 @@
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js"
+      "require": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./*": "./*"
   },