feat(runtime-utils): split parsed from browser

web-infra-dev · Nov 27, 2023 · d356041 · d356041
1 parent e8d838c
commit d356041
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx b/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx
@@ -16,7 +16,7 @@ import {
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { RuntimeReactContext, isBrowser } from '@modern-js/runtime';
 import type { Plugin } from '@modern-js/runtime';
-import { parsedJSONFromElement } from '@modern-js/runtime-utils/browser';
+import { parsedJSONFromElement } from '@modern-js/runtime-utils/parsed';
 import { renderRoutes, getLocation, urlJoin } from './utils';
 import { modifyRoutesHook } from './hooks';
 

diff --git a/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx b/packages/runtime/plugin-runtime/src/router/runtime/plugin.tsx
@@ -9,7 +9,7 @@ import {
   RouteObject,
 } from '@modern-js/runtime-utils/router';
 import hoistNonReactStatics from 'hoist-non-react-statics';
-import { parsedJSONFromElement } from '@modern-js/runtime-utils/browser';
+import { parsedJSONFromElement } from '@modern-js/runtime-utils/parsed';
 import type { RouterSubscriber } from '@modern-js/runtime-utils/remix-router';
 import { Plugin, RuntimeReactContext } from '../../core';
 import { modifyRoutes as modifyRoutesHook } from './hooks';

diff --git a/packages/runtime/plugin-runtime/src/ssr/index.tsx b/packages/runtime/plugin-runtime/src/ssr/index.tsx
@@ -1,6 +1,6 @@
 import { loadableReady } from '@loadable/component';
 import hoistNonReactStatics from 'hoist-non-react-statics';
-import { parsedJSONFromElement } from '@modern-js/runtime-utils/browser';
+import { parsedJSONFromElement } from '@modern-js/runtime-utils/parsed';
 import type { Plugin } from '../core';
 import {
   RenderLevel,

diff --git a/packages/toolkit/runtime-utils/package.json b/packages/toolkit/runtime-utils/package.json
@@ -47,6 +47,11 @@
       "jsnext:source": "./src/time.ts",
       "require": "./dist/cjs/time.js",
       "default": "./dist/esm/time.js"
+    },
+    "./parsed": {
+      "jsnext:source": "./src/parsed.ts",
+      "require": "./dist/cjs/parsed.js",
+      "default": "./dist/esm/parsed.js"
     }
   },
   "publishConfig": {
@@ -84,6 +89,11 @@
         "types": "./dist/types/time.d.ts",
         "require": "./dist/cjs/time.js",
         "default": "./dist/esm/time.js"
+      },
+      "./parsed": {
+        "types": "./dist/types/parsed.d.ts",
+        "require": "./dist/cjs/parsed.js",
+        "default": "./dist/esm/parsed.js"
       }
     }
   },
@@ -106,6 +116,9 @@
       ],
       "time": [
         "./dist/types/time.d.ts"
+      ],
+      "parsed": [
+        "./dist/types/parsed.d.ts"
       ]
     }
   },

diff --git a/packages/toolkit/runtime-utils/src/browser/index.ts b/packages/toolkit/runtime-utils/src/browser/index.ts
@@ -1,2 +1 @@
-export * from './parsed';
 export * from './nestedRoutes';
diff --git a/...olkit/runtime-utils/src/browser/parsed.ts → packages/toolkit/runtime-utils/src/parsed.ts b/...olkit/runtime-utils/src/browser/parsed.ts → packages/toolkit/runtime-utils/src/parsed.ts
diff --git a/packages/toolkit/runtime-utils/tests/brower/parse.test.ts b/packages/toolkit/runtime-utils/tests/brower/parse.test.ts
@@ -1,4 +1,4 @@
-import { parsedJSONFromElement } from '../../src/browser';
+import { parsedJSONFromElement } from '../../src/parsed';
 
 describe('parsed utils', () => {
   it('should return null if no alias config', () => {