From d356041cf52c30be6453fe4077a91dd09609d0b9 Mon Sep 17 00:00:00 2001 From: kyli Date: Mon, 27 Nov 2023 17:31:24 +0800 Subject: [PATCH] feat(runtime-utils): split parsed from browser --- .../runtime/plugin-router-v5/src/runtime/plugin.tsx | 2 +- .../plugin-runtime/src/router/runtime/plugin.tsx | 2 +- packages/runtime/plugin-runtime/src/ssr/index.tsx | 2 +- packages/toolkit/runtime-utils/package.json | 13 +++++++++++++ packages/toolkit/runtime-utils/src/browser/index.ts | 1 - .../runtime-utils/src/{browser => }/parsed.ts | 0 .../runtime-utils/tests/brower/parse.test.ts | 2 +- 7 files changed, 17 insertions(+), 5 deletions(-) rename packages/toolkit/runtime-utils/src/{browser => }/parsed.ts (100%) diff --git a/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx b/packages/runtime/plugin-router-v5/src/runtime/plugin.tsx index fcf74322e0b9..a903b3b52f8a 100644 --- 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 index f8a726eeac7e..e447e3e4e8b8 100644 --- 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 index 9200ad227731..591863f8da18 100644 --- 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 index 6d84a15ddff0..efcbf7673b75 100644 --- 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 index 2391c89f46d6..041e41af0deb 100644 --- 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/packages/toolkit/runtime-utils/src/browser/parsed.ts b/packages/toolkit/runtime-utils/src/parsed.ts similarity index 100% rename from packages/toolkit/runtime-utils/src/browser/parsed.ts rename to 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 index e151ea6e2db9..0f55e014dddc 100644 --- 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', () => {