;)gsy#|o%?ydLuusF=L4
z*^H(N%cIc_cr;y;hdY$Wn(z#=|I}vd);p}*dYX&?R~OaJ1yRqj=`?)V_@jc%+A2C0
zaiW@w2K%({w=DDwbg7P_;-#wiAZ`o3wuClyVKe82;xF{{w~pA>sd!@c$PiEURk`A?v@l`!nmYL(3W92Xxm!vqHo6)&B$N
C1#Ij9
literal 0
HcmV?d00001
diff --git a/examples/rsc-project/src/pages/index.module.css b/examples/rsc-project/src/pages/index.module.css
new file mode 100644
index 0000000000..ef450095a5
--- /dev/null
+++ b/examples/rsc-project/src/pages/index.module.css
@@ -0,0 +1,3 @@
+.title {
+ color: red;
+}
\ No newline at end of file
diff --git a/examples/rsc-project/src/pages/index.tsx b/examples/rsc-project/src/pages/index.tsx
new file mode 100644
index 0000000000..a031b10da4
--- /dev/null
+++ b/examples/rsc-project/src/pages/index.tsx
@@ -0,0 +1,57 @@
+import { Suspense, lazy } from 'react';
+import { Link, useData, useConfig, definePageConfig, defineDataLoader, useAppContext } from 'ice';
+// Not recommended but works.
+import { Button } from 'antd-mobile';
+import styles from './index.module.css';
+
+const Bar = lazy(() => import('../components/bar'));
+
+export default function Home(props) {
+ console.log('render Home', props);
+
+ const appContext = useAppContext();
+ console.log('get AppContext', appContext);
+
+ const data = useData();
+ const config = useConfig();
+
+ console.log('render Home', 'data', data, 'config', config);
+
+ return (
+ <>
+ Home Page
+ about
+ hello}>
+
+
+
+
+ );
+}
+
+export const pageConfig = definePageConfig(() => {
+ return {
+ title: 'Home',
+ meta: [
+ {
+ name: 'theme-color',
+ content: '#000',
+ },
+ {
+ name: 'title-color',
+ content: '#f00',
+ },
+ ],
+ auth: ['admin'],
+ };
+});
+
+export const dataLoader = defineDataLoader(() => {
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ resolve({
+ name: 'Home',
+ });
+ }, 1 * 100);
+ });
+});
diff --git a/examples/rsc-project/src/pages/layout.tsx b/examples/rsc-project/src/pages/layout.tsx
new file mode 100644
index 0000000000..6361a03aa6
--- /dev/null
+++ b/examples/rsc-project/src/pages/layout.tsx
@@ -0,0 +1,38 @@
+import { Outlet, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
+
+export default () => {
+ const data = useData();
+ const config = useConfig();
+
+ console.log('render Layout', 'data', data, 'config', config);
+
+ return (
+
+
Layout
+
+
+ );
+};
+
+export const pageConfig = definePageConfig(() => {
+ return {
+ title: 'Layout',
+ meta: [
+ {
+ name: 'layout-color',
+ content: '#f00',
+ },
+ ],
+ auth: ['admin'],
+ };
+});
+
+export const dataLoader = defineDataLoader(() => {
+ return new Promise((resolve) => {
+ setTimeout(() => {
+ resolve({
+ layout: true,
+ });
+ }, 1 * 100);
+ });
+});
diff --git a/examples/rsc-project/src/types.ts b/examples/rsc-project/src/types.ts
new file mode 100644
index 0000000000..2b7ee052a3
--- /dev/null
+++ b/examples/rsc-project/src/types.ts
@@ -0,0 +1,6 @@
+export interface AppData {
+ title: string;
+ auth: {
+ [key: string]: boolean;
+ };
+}
\ No newline at end of file
diff --git a/examples/rsc-project/src/typings.d.ts b/examples/rsc-project/src/typings.d.ts
new file mode 100644
index 0000000000..1f6ba4ffa6
--- /dev/null
+++ b/examples/rsc-project/src/typings.d.ts
@@ -0,0 +1 @@
+///
diff --git a/examples/rsc-project/tsconfig.json b/examples/rsc-project/tsconfig.json
new file mode 100644
index 0000000000..26fd9ec799
--- /dev/null
+++ b/examples/rsc-project/tsconfig.json
@@ -0,0 +1,32 @@
+{
+ "compileOnSave": false,
+ "buildOnSave": false,
+ "compilerOptions": {
+ "baseUrl": ".",
+ "outDir": "build",
+ "module": "esnext",
+ "target": "es6",
+ "jsx": "react-jsx",
+ "moduleResolution": "node",
+ "allowSyntheticDefaultImports": true,
+ "lib": ["es6", "dom"],
+ "sourceMap": true,
+ "allowJs": true,
+ "rootDir": "./",
+ "forceConsistentCasingInFileNames": true,
+ "noImplicitReturns": true,
+ "noImplicitThis": true,
+ "noImplicitAny": false,
+ "importHelpers": true,
+ "strictNullChecks": true,
+ "suppressImplicitAnyIndexErrors": true,
+ "noUnusedLocals": true,
+ "skipLibCheck": true,
+ "paths": {
+ "@/*": ["./src/*"],
+ "ice": [".ice"]
+ }
+ },
+ "include": ["src", ".ice", "ice.config.*"],
+ "exclude": ["build", "public"]
+}
\ No newline at end of file
From c0eac2b6e0a9c36b3530a7e1639db3489a03b697 Mon Sep 17 00:00:00 2001
From: Coooder-X <1104143015@qq.com>
Date: Mon, 14 Aug 2023 15:20:33 +0800
Subject: [PATCH 2/8] feat: rsc first edition
---
examples/basic-project/package.json | 5 +-
examples/rsc-project/package.json | 14 +-
examples/rsc-project/src/app.tsx | 1 +
examples/rsc-project/src/components/bar.tsx | 1 +
examples/rsc-project/src/document.tsx | 20 +-
examples/rsc-project/src/documentClient.tsx | 22 +
examples/rsc-project/src/pages/about.tsx | 1 +
examples/rsc-project/src/pages/blog.tsx | 1 +
examples/rsc-project/src/pages/index.tsx | 21 +-
examples/rsc-project/src/pages/layout.tsx | 1 +
examples/rsc-project/src/rscServerRouter.tsx | 108 +
examples/rsc-project/src/testClient.tsx | 6 +
package.json | 4 +-
packages/ice/package.json | 5 +-
packages/ice/src/config.ts | 8 +
packages/ice/src/createService.ts | 4 +
.../ice/src/middlewares/renderMiddleware.ts | 1 +
packages/ice/src/plugins/web/task.ts | 1 +
packages/ice/src/service/config.ts | 1 +
packages/ice/src/service/webpackCompiler.ts | 19 +
packages/ice/src/types/userConfig.ts | 1 +
packages/ice/src/utils/generateEntry.ts | 3 +
.../ice/src/utils/getServerCompilerPlugin.ts | 2 +-
.../ice/templates/core/entry.client.tsx.ejs | 1 +
.../ice/templates/core/entry.server.ts.ejs | 7 +
packages/ice/templates/core/index.ts.ejs | 4 +
packages/runtime/package.json | 10 +-
packages/runtime/src/ServerRouter.tsx | 3 +-
packages/runtime/src/index.ts | 6 +
packages/runtime/src/routes.tsx | 1 +
packages/runtime/src/rsc-router.tsx | 123 +
packages/runtime/src/runClientApp.tsx | 19 +-
packages/runtime/src/runServerApp.tsx | 167 +-
packages/runtime/src/types.ts | 6 +
pnpm-lock.yaml | 11248 +++++++++-------
35 files changed, 6728 insertions(+), 5117 deletions(-)
create mode 100644 examples/rsc-project/src/documentClient.tsx
create mode 100644 examples/rsc-project/src/rscServerRouter.tsx
create mode 100644 examples/rsc-project/src/testClient.tsx
create mode 100644 packages/runtime/src/rsc-router.tsx
diff --git a/examples/basic-project/package.json b/examples/basic-project/package.json
index 8219b64d40..68029d127c 100644
--- a/examples/basic-project/package.json
+++ b/examples/basic-project/package.json
@@ -24,5 +24,6 @@
"@types/react-dom": "^18.0.2",
"speed-measure-webpack-plugin": "^1.5.0",
"webpack": "^5.86.0"
- }
-}
+ },
+ "repository": "git@github.com:alibaba/ice.git"
+}
\ No newline at end of file
diff --git a/examples/rsc-project/package.json b/examples/rsc-project/package.json
index c26c080d32..147b79119a 100644
--- a/examples/rsc-project/package.json
+++ b/examples/rsc-project/package.json
@@ -4,7 +4,8 @@
"private": true,
"scripts": {
"start": "ice start",
- "build": "ice build"
+ "build": "ice build",
+ "serve": "tsx server.mts"
},
"description": "",
"author": "",
@@ -14,13 +15,18 @@
"@ice/plugin-auth": "workspace:*",
"@ice/runtime": "workspace:*",
"antd-mobile": "^5.12.6",
- "react": "^18.0.0",
- "react-dom": "^18.0.0"
+ "compression": "^1.7.4",
+ "react": "^18.3.0-canary-1cea38448-20230530",
+ "react-dom": "^18.3.0-canary-1cea38448-20230530",
+ "react-server-dom-webpack": "^18.3.0-canary-1cea38448-20230530",
+ "react-router-dom": "6.11.2"
},
"devDependencies": {
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"speed-measure-webpack-plugin": "^1.5.0",
- "webpack": "^5.86.0"
+ "webpack": "^5.86.0",
+ "tslib": "^2.5.0",
+ "tsx": "^3.12.1"
}
}
diff --git a/examples/rsc-project/src/app.tsx b/examples/rsc-project/src/app.tsx
index ca63767920..a5617d81d8 100644
--- a/examples/rsc-project/src/app.tsx
+++ b/examples/rsc-project/src/app.tsx
@@ -1,3 +1,4 @@
+'use client';
import { defineAppConfig } from 'ice';
import { defineAuthConfig } from '@ice/plugin-auth/types';
diff --git a/examples/rsc-project/src/components/bar.tsx b/examples/rsc-project/src/components/bar.tsx
index 7861bf5cb4..7f1b27b826 100644
--- a/examples/rsc-project/src/components/bar.tsx
+++ b/examples/rsc-project/src/components/bar.tsx
@@ -1,3 +1,4 @@
+'use client';
export default function Bar() {
return (
diff --git a/examples/rsc-project/src/document.tsx b/examples/rsc-project/src/document.tsx
index 1e7b99c49d..7d4d1aef2c 100644
--- a/examples/rsc-project/src/document.tsx
+++ b/examples/rsc-project/src/document.tsx
@@ -1,21 +1,27 @@
-import { Meta, Title, Links, Main, Scripts } from 'ice';
+'use client';
-function Document() {
+import { DocumentClientBody, DocumentClientHead } from './documentClient';
+// import RscServerRouter from './rscServerRouter';
+
+// import { Meta, Title, Links, Main, Scripts } from 'ice';
+
+function Document(props) {
return (
-
-
-
+
-
-
+
+ // <>
+ //
+ //
+ //
);
}
diff --git a/examples/rsc-project/src/documentClient.tsx b/examples/rsc-project/src/documentClient.tsx
new file mode 100644
index 0000000000..785f04b8f9
--- /dev/null
+++ b/examples/rsc-project/src/documentClient.tsx
@@ -0,0 +1,22 @@
+'use client';
+import { Meta, Title, Links, Main, Scripts } from 'ice';
+
+export function DocumentClientHead() {
+ return (
+ <>
+
+
+
+
+ );
+}
+
+export function DocumentClientBody() {
+ return (
+ <>
+
+
+
+ );
+}
+
diff --git a/examples/rsc-project/src/pages/about.tsx b/examples/rsc-project/src/pages/about.tsx
index b1123130b3..1df48d4879 100644
--- a/examples/rsc-project/src/pages/about.tsx
+++ b/examples/rsc-project/src/pages/about.tsx
@@ -1,3 +1,4 @@
+'use client';
// @ts-expect-error
import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
import url from './ice.png';
diff --git a/examples/rsc-project/src/pages/blog.tsx b/examples/rsc-project/src/pages/blog.tsx
index 237031bc49..1d03c2e284 100644
--- a/examples/rsc-project/src/pages/blog.tsx
+++ b/examples/rsc-project/src/pages/blog.tsx
@@ -1,3 +1,4 @@
+'use client';
import { Link, useData, useConfig, definePageConfig } from 'ice';
interface Data {
diff --git a/examples/rsc-project/src/pages/index.tsx b/examples/rsc-project/src/pages/index.tsx
index a031b10da4..60d500c3d5 100644
--- a/examples/rsc-project/src/pages/index.tsx
+++ b/examples/rsc-project/src/pages/index.tsx
@@ -1,16 +1,17 @@
-import { Suspense, lazy } from 'react';
-import { Link, useData, useConfig, definePageConfig, defineDataLoader, useAppContext } from 'ice';
+'use client';
+import { Suspense } from 'react';
+import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
// Not recommended but works.
-import { Button } from 'antd-mobile';
import styles from './index.module.css';
+// import { Button } from 'antd-mobile';
-const Bar = lazy(() => import('../components/bar'));
+// const Bar = lazy(() => import('../components/bar'));
-export default function Home(props) {
- console.log('render Home', props);
+export default function Home() {
+ // console.log('render Home', props);
- const appContext = useAppContext();
- console.log('get AppContext', appContext);
+ // const appContext = useAppContext();
+ // console.log('get AppContext', appContext);
const data = useData();
const config = useConfig();
@@ -22,8 +23,8 @@ export default function Home(props) {
Home Page
about
hello}>
-
-
+ {/* */}
+ {/* */}
);
diff --git a/examples/rsc-project/src/pages/layout.tsx b/examples/rsc-project/src/pages/layout.tsx
index 6361a03aa6..87426c1340 100644
--- a/examples/rsc-project/src/pages/layout.tsx
+++ b/examples/rsc-project/src/pages/layout.tsx
@@ -1,3 +1,4 @@
+'use client';
import { Outlet, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
export default () => {
diff --git a/examples/rsc-project/src/rscServerRouter.tsx b/examples/rsc-project/src/rscServerRouter.tsx
new file mode 100644
index 0000000000..9967350e81
--- /dev/null
+++ b/examples/rsc-project/src/rscServerRouter.tsx
@@ -0,0 +1,108 @@
+'use client';
+import { RouteErrorComponent, WrapRouteComponent, createRouteLoader } from '@ice/runtime';
+// import { NestedRouteManifest } from "../../../packages/route-manifest/esm";
+import { StaticRouterProvider, createStaticRouter } from 'react-router-dom/server.mjs';
+import { path } from 'ice';
+// import { App } from '@ice/runtime';
+import { createServerRoutes } from '@ice/runtime';
+import { useAppContext } from '@ice/runtime';
+import React from 'react';
+import { AppErrorBoundary } from '@ice/runtime';
+import TestClient from './testClient';
+
+async function generateRoutesDefinition(nestRouteManifest, /* : NestedRouteManifest[] */ renderMode) {
+ const routeDefinitionObj: any[] = [];
+ console.log('generateRoutesDefinition', nestRouteManifest);
+
+ for (const route of nestRouteManifest) {
+ const { children, path: routePath, index, componentName, file, id, layout, exports } = route;
+ console.log('route', route);
+ console.log('id', id);
+ console.log('file', file, path.extname(file));
+ // const componentPath = id.startsWith('__') ? file : `../../src/pages/${file}`.replace(new RegExp(`${path.extname(file)}$`), '');
+ const componentPath = '../../src/pages/layout';
+ const componentModule = await import('@/pages/layout');
+ console.log('componentModule', componentModule);
+
+ const currentRouteDefinition = {
+ path: formatPath(routePath || ''),
+ async lazy() {
+ return {
+ ...componentModule,
+ Component: () => WrapRouteComponent({
+ routeId: id,
+ isLayout: layout,
+ routeExports: componentModule,
+ }),
+ loader: createRouteLoader({
+ routeId: id,
+ // requestContext,
+ renderMode,
+ module: componentModule,
+ }),
+ };
+ },
+ errorElement: ,
+ componentName,
+ index,
+ id,
+ exact: true,
+ exports: JSON.stringify(exports),
+ layout,
+ };
+
+ if (children) {
+ const res = generateRoutesDefinition(children, renderMode);
+ currentRouteDefinition['children'] = res;
+ }
+ routeDefinitionObj.push(currentRouteDefinition);
+ console.log('after push', routeDefinitionObj);
+ }
+
+ return routeDefinitionObj;
+}
+
+export default async function RscServerRouter(props) {
+ // // 这里的 routes 应该是一个可序列化的对象
+ // const { routerContext, routes: routeManifest, requestContext, renderMode } = props;
+ // const routes = await generateRoutesDefinition(routeManifest, renderMode);
+ // console.log('执行了 client 组件', routerContext, routeManifest);
+ // console.log('执行 client')
+ // console.log('serverRouter rscRouter', routes);
+ // // Server router only be called once.
+ // const router = createStaticRouter(createServerRoutes(routes), routerContext);
+
+ return (
+ <>
+ {/* */}
+ {/* */}
+ {/* */}
+ {/* {alert('sdafasfdaf')}}>faisudhfasd89fg7as9
*/}
+ { alert('asfas'); }} />
+ {/* */}
+
+ );
+}
+
+function formatPath(pathStr) {
+ return pathStr; // process.platform === 'win32' ? pathStr.split(path.sep).join('/') :
+}
+
+function App({ children }) {
+ const { appConfig } = useAppContext();
+ const { strict, errorBoundary } = appConfig.app;
+ const StrictMode = strict ? React.StrictMode : React.Fragment;
+ const ErrorBoundary = errorBoundary ? AppErrorBoundary : React.Fragment;
+
+ return (
+
+
+ {children}
+
+
+ );
+}
\ No newline at end of file
diff --git a/examples/rsc-project/src/testClient.tsx b/examples/rsc-project/src/testClient.tsx
new file mode 100644
index 0000000000..014744116f
--- /dev/null
+++ b/examples/rsc-project/src/testClient.tsx
@@ -0,0 +1,6 @@
+'use client';
+export default function TestClient(props) {
+ return (
+ client test {props.name}
+ );
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index aa57443cdb..4975b1a211 100644
--- a/package.json
+++ b/package.json
@@ -57,8 +57,8 @@
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"puppeteer": "^19.6.3",
- "react": "^18.2.0",
- "react-dom": "^18.2.0",
+ "react": "^18.3.0-canary-1cea38448-20230530",
+ "react-dom": "^18.3.0-canary-1cea38448-20230530",
"rimraf": "^3.0.2",
"stylelint": "^14.10.0",
"tsx": "^3.12.1",
diff --git a/packages/ice/package.json b/packages/ice/package.json
index 70002f8c51..24be8a65d1 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -65,7 +65,8 @@
"semver": "^7.3.5",
"source-map-support": "^0.5.21",
"temp": "^0.9.4",
- "yargs-parser": "^21.1.1"
+ "yargs-parser": "^21.1.1",
+ "react-server-dom-webpack": "^18.3.0-canary-1cea38448-20230530"
},
"devDependencies": {
"@types/babel__generator": "^7.6.4",
@@ -79,7 +80,7 @@
"chokidar": "^3.5.3",
"esbuild": "^0.17.16",
"jest": "^29.0.2",
- "react": "^18.2.0",
+ "react": "^18.3.0-canary-1cea38448-20230530",
"react-router": "6.11.2",
"sass": "^1.50.0",
"unplugin": "^0.9.0",
diff --git a/packages/ice/src/config.ts b/packages/ice/src/config.ts
index 15148d6364..3009f00e76 100644
--- a/packages/ice/src/config.ts
+++ b/packages/ice/src/config.ts
@@ -131,6 +131,14 @@ const userConfig = [
validation: 'boolean',
defaultValue: false,
},
+ {
+ name: 'rsc',
+ validation: 'boolean',
+ defaultValue: false,
+ setConfig: (config: Config, rsc: UserConfig['rsc']) => {
+ return mergeDefaultValue(config, 'rsc', rsc);
+ },
+ },
{
name: 'server',
validation: 'object',
diff --git a/packages/ice/src/createService.ts b/packages/ice/src/createService.ts
index de69a8e14d..25deaf5253 100644
--- a/packages/ice/src/createService.ts
+++ b/packages/ice/src/createService.ts
@@ -231,6 +231,9 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
const hasExportAppData = (await getFileExports({ rootDir, file: 'src/app' })).includes('dataLoader');
const csr = !userConfig.ssr && !userConfig.ssg;
+ const { rsc } = userConfig;
+
+ console.log('userConfig.rsc', rsc);
const disableRouter = userConfig?.optimization?.router && routesInfo.routesCount <= 1;
if (disableRouter) {
@@ -272,6 +275,7 @@ async function createService({ rootDir, command, commandArgs }: CreateServiceOpt
dataLoader: userConfig.dataLoader,
routeImports,
routeDefinition,
+ rsc,
});
dataCache.set('routes', JSON.stringify(routesInfo));
dataCache.set('hasExportAppData', hasExportAppData ? 'true' : '');
diff --git a/packages/ice/src/middlewares/renderMiddleware.ts b/packages/ice/src/middlewares/renderMiddleware.ts
index ab7357659a..416de9e2a8 100644
--- a/packages/ice/src/middlewares/renderMiddleware.ts
+++ b/packages/ice/src/middlewares/renderMiddleware.ts
@@ -49,6 +49,7 @@ export default function createRenderMiddleware(options: Options): Middleware {
serverModule.renderToResponse(requestContext, {
renderMode,
documentOnly,
+ useRsc: userConfig.rsc,
});
}
} else {
diff --git a/packages/ice/src/plugins/web/task.ts b/packages/ice/src/plugins/web/task.ts
index 78d6ce4da4..1952ebad15 100644
--- a/packages/ice/src/plugins/web/task.ts
+++ b/packages/ice/src/plugins/web/task.ts
@@ -31,6 +31,7 @@ const getWebTask = ({ rootDir, command, userConfig }): Config => {
'@swc/helpers': path.dirname(require.resolve('@swc/helpers/package.json')),
'universal-env': envReplacement,
'@uni/env': envReplacement,
+ 'react-server-dom-webpack/client': require.resolve('react-server-dom-webpack/client.browser'),
},
swcOptions: {
removeExportExprs,
diff --git a/packages/ice/src/service/config.ts b/packages/ice/src/service/config.ts
index b1303641df..fddcf6a6d3 100644
--- a/packages/ice/src/service/config.ts
+++ b/packages/ice/src/service/config.ts
@@ -107,6 +107,7 @@ class Config {
};
public getConfig = async (keepExports: string[]) => {
+ console.log('log: getConfig');
const targetFile = await this.getConfigFile(keepExports);
if (targetFile) return await dynamicImport(targetFile, true);
};
diff --git a/packages/ice/src/service/webpackCompiler.ts b/packages/ice/src/service/webpackCompiler.ts
index 297c0b655b..c3698656a3 100644
--- a/packages/ice/src/service/webpackCompiler.ts
+++ b/packages/ice/src/service/webpackCompiler.ts
@@ -4,6 +4,7 @@ import lodash from '@ice/bundles/compiled/lodash/index.js';
import type { TaskConfig, Context } from 'build-scripts';
import type { Config } from '@ice/webpack-config/types';
import type webpack from 'webpack';
+import ReactServerWebpackPlugin from 'react-server-dom-webpack/plugin';
import type { Urls, ServerCompiler, GetAppConfig, GetRoutesConfig, ExtendsPluginAPI, GetDataloaderConfig } from '../types/plugin.js';
import formatWebpackMessages from '../utils/formatWebpackMessages.js';
import type ServerCompilerPlugin from '../webpack/ServerCompilerPlugin';
@@ -67,6 +68,8 @@ async function webpackCompiler(options: {
if (useDevServer) {
const outputDir = webpackConfig.output.path;
+ console.log('output dir', outputDir);
+
if (command === 'start' && serverRunner) {
// Add server runner plugin
webpackConfig.plugins.push(new ServerRunnerPlugin(
@@ -87,6 +90,22 @@ async function webpackCompiler(options: {
},
});
webpackConfig.plugins.push(serverCompilerPlugin);
+
+ if (userConfig.rsc) {
+ console.log('rsc plugin');
+ webpackConfig.plugins.push(new ReactServerWebpackPlugin({
+ isServer: false,
+ clientReferences: [{
+ directory: `${rootDir}/src`,
+ recursive: true,
+ include: /\.(js|ts|jsx|tsx)$/,
+ exclude: /types.ts|.d.ts/,
+ }],
+ clientManifestFilename: 'rsc-client-manifest.json',
+ // clientManifestFilename: `${rootDir}/rsc-folder/rsc-client-manifest.json`,
+ // ssrManifestFilename: `$react-ssr-manifest.json`,
+ }));
+ }
}
// Add re-compile plugin
diff --git a/packages/ice/src/types/userConfig.ts b/packages/ice/src/types/userConfig.ts
index 4f6de461ca..4fba8e888c 100644
--- a/packages/ice/src/types/userConfig.ts
+++ b/packages/ice/src/types/userConfig.ts
@@ -67,6 +67,7 @@ export interface UserConfig {
eslint?: Config['eslintOptions'] | boolean;
ssr?: boolean;
ssg?: boolean;
+ rsc?: boolean;
server?: {
onDemand?: boolean;
format?: 'esm' | 'cjs';
diff --git a/packages/ice/src/utils/generateEntry.ts b/packages/ice/src/utils/generateEntry.ts
index 87f802799e..0ae7f9c99d 100644
--- a/packages/ice/src/utils/generateEntry.ts
+++ b/packages/ice/src/utils/generateEntry.ts
@@ -127,6 +127,7 @@ async function renderEntry(
distType = ['html'],
prependCode = '',
renderMode,
+ useRsc,
}: {
routePath: string;
serverEntry: any;
@@ -134,6 +135,7 @@ async function renderEntry(
distType?: DistType;
renderMode?: RenderMode;
prependCode?: string;
+ useRsc?: boolean; // 暂时这么写，或许可以合到 distType 中？
},
) {
const serverContext: ServerContext = {
@@ -155,6 +157,7 @@ async function renderEntry(
serverOnlyBasename: '/',
distType,
prependCode,
+ useRsc,
});
return {
diff --git a/packages/ice/src/utils/getServerCompilerPlugin.ts b/packages/ice/src/utils/getServerCompilerPlugin.ts
index ecddd9eb85..024ee38efa 100644
--- a/packages/ice/src/utils/getServerCompilerPlugin.ts
+++ b/packages/ice/src/utils/getServerCompilerPlugin.ts
@@ -26,7 +26,7 @@ function getServerCompilerPlugin(serverCompiler: ServerCompiler, options: Option
runtimeDefineVars,
} = options;
const entryPoint = getServerEntry(rootDir, serverEntry);
- const { ssg, ssr, server: { format } } = userConfig;
+ const { ssg, ssr, rsc, server: { format } } = userConfig;
const isEsm = userConfig?.server?.format === 'esm';
return new ServerCompilerPlugin(
serverCompiler,
diff --git a/packages/ice/templates/core/entry.client.tsx.ejs b/packages/ice/templates/core/entry.client.tsx.ejs
index 1f21299a91..f3740fbf8e 100644
--- a/packages/ice/templates/core/entry.client.tsx.ejs
+++ b/packages/ice/templates/core/entry.client.tsx.ejs
@@ -37,6 +37,7 @@ const render = (customOptions: Record = {}) => {
<% if (enableRoutes) { %>createRoutes,<% } %>
basename: getRouterBasename(),
hydrate: <%- hydrate %>,
+ rsc: <%- rsc -%>,
memoryRouter: <%- memoryRouter || false %>,
dataLoaderFetcher,
dataLoaderDecorator,
diff --git a/packages/ice/templates/core/entry.server.ts.ejs b/packages/ice/templates/core/entry.server.ts.ejs
index 48b7a4eb0f..f9641f2402 100644
--- a/packages/ice/templates/core/entry.server.ts.ejs
+++ b/packages/ice/templates/core/entry.server.ts.ejs
@@ -11,6 +11,9 @@ import type { RenderToPipeableStreamOptions } from 'react-dom/server';
import assetsManifest from 'virtual:assets-manifest.json';
import createRoutes from './routes';
import routesConfig from './routes-config.bundle.mjs';
+import routeManifest from './route-manifest.json';
+import RscServerRouter from '../src/rscServerRouter';
+
<% if(dataLoaderImport.imports) {-%><%-dataLoaderImport.imports%><% } -%>
<%- runtimeOptions.imports %>
<% if(!hydrate) {-%>
@@ -44,6 +47,8 @@ interface RenderOptions {
publicPath?: string;
serverData?: any;
streamOptions?: RenderToPipeableStreamOptions;
+ useRsc?: boolean;
+ routeManifest?: Array;
}
export async function renderToHTML(requestContext, options: RenderOptions = {}) {
@@ -83,9 +88,11 @@ function mergeOptions(options) {
...options,
app,
assetsManifest,
+ routeManifest,
createRoutes,
runtimeModules,
Document,
+ RscServerRouter,
basename: basename || getRouterBasename(),
renderMode,
routesConfig,
diff --git a/packages/ice/templates/core/index.ts.ejs b/packages/ice/templates/core/index.ts.ejs
index dd9ac73f16..b04140711d 100644
--- a/packages/ice/templates/core/index.ts.ejs
+++ b/packages/ice/templates/core/index.ts.ejs
@@ -2,6 +2,8 @@
import '<%= globalStyle %>'
<% } -%>
import type { PageConfig, PageConfigDefinition } from './types';
+import path from 'path';
+import routeManifest from './route-manifest.json';
<%- framework.imports %>
<%- framework.variablesStr %>
@@ -16,6 +18,8 @@ function definePageConfig(pageConfig: PageConfig | PageConfigDefinition): PageCo
}
export {
+ path,
+ routeManifest,
definePageConfig,
<% if (framework.exports) { -%><%- framework.exports %><% } -%>
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index b7ea3f3a4d..c8238e0c3f 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -37,12 +37,13 @@
"postinstall": "node ./scripts/postinstall.mjs"
},
"devDependencies": {
+ "@remix-run/web-fetch": "^4.3.3",
"@types/react": "^18.0.8",
"@types/react-dom": "^18.0.3",
- "react": "^18.0.0",
- "react-dom": "^18.0.0",
- "regenerator-runtime": "^0.13.9",
- "@remix-run/web-fetch": "^4.3.3"
+ "react": "^18.3.0-canary-1cea38448-20230530",
+ "react-dom": "^18.3.0-canary-1cea38448-20230530",
+ "react-server-dom-webpack": "^18.3.0-canary-1cea38448-20230530",
+ "regenerator-runtime": "^0.13.9"
},
"sideEffects": [
"./esm/polyfills/signal.js",
@@ -56,6 +57,7 @@
"fs-extra": "^10.0.0",
"history": "^5.3.0",
"htmlparser2": "^8.0.1",
+ "path": "^0.12.7",
"react-router-dom": "6.11.2",
"semver": "^7.4.0",
"source-map": "^0.7.4"
diff --git a/packages/runtime/src/ServerRouter.tsx b/packages/runtime/src/ServerRouter.tsx
index 8cdb32ebb1..aa82031da9 100644
--- a/packages/runtime/src/ServerRouter.tsx
+++ b/packages/runtime/src/ServerRouter.tsx
@@ -5,7 +5,7 @@ import { RouteComponent } from './routes.js';
import type { ServerAppRouterProps } from './types.js';
import App from './App.js';
-function createServerRoutes(routes: RouteObject[]) {
+export function createServerRoutes(routes: RouteObject[]) {
return routes.map((route) => {
let dataRoute = {
// Static Router need element or Component when matched.
@@ -30,6 +30,7 @@ function ServerRouter(props: ServerAppRouterProps) {
const { routerContext, routes } = props;
// Server router only be called once.
const router = createStaticRouter(createServerRoutes(routes), routerContext);
+ console.log('serverRouter router', router);
return (
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index cf443b086a..99d9934618 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -1,3 +1,4 @@
+import path from 'path';
import {
Link,
Outlet,
@@ -26,6 +27,7 @@ import type { RunClientAppOptions } from './runClientApp.js';
import { useAppContext as useInternalAppContext, useAppData, AppContextProvider } from './AppContext.js';
import { getAppData } from './appData.js';
import { useData, useConfig } from './RouteContext.js';
+import App from './App.js';
import {
Meta,
Title,
@@ -54,6 +56,7 @@ import useMounted from './useMounted.js';
import usePageLifecycle from './usePageLifecycle.js';
import { withSuspense, useSuspenseData } from './Suspense.js';
import { createRouteLoader, WrapRouteComponent, RouteErrorComponent, Await } from './routes.js';
+import { createServerRoutes } from './ServerRouter.js';
function useAppContext() {
console.warn('import { useAppContext } from \'@ice/runtime\'; is deprecated, please use import { useAppContext } from \'ice\'; instead.');
@@ -106,6 +109,9 @@ export {
Data,
Main,
usePageAssets,
+ path,
+ App,
+ createServerRoutes,
// API for data-loader.
dataLoader,
callDataLoader,
diff --git a/packages/runtime/src/routes.tsx b/packages/runtime/src/routes.tsx
index 0ab6f54c7b..a7bf305049 100644
--- a/packages/runtime/src/routes.tsx
+++ b/packages/runtime/src/routes.tsx
@@ -70,6 +70,7 @@ export function WrapRouteComponent(options: {
export function RouteComponent({ id }: { id: string }) {
// get current route component from latest routeModules
const { routeModules } = useAppContext();
+ console.log('useAppContext', useAppContext());
const { Component } = routeModules[id] || {};
if (process.env.NODE_ENV === 'development') {
if (!Component) {
diff --git a/packages/runtime/src/rsc-router.tsx b/packages/runtime/src/rsc-router.tsx
new file mode 100644
index 0000000000..c6bc54944a
--- /dev/null
+++ b/packages/runtime/src/rsc-router.tsx
@@ -0,0 +1,123 @@
+'use client';
+// @ts-ignore
+import React, {
+ createContext,
+ startTransition,
+ useContext,
+ useState,
+ useEffect,
+ ReactElement,
+} from 'react';
+import pkg from 'react-server-dom-webpack/client';
+import { ClientAppRouterProps } from './types.js';
+import AppErrorBoundary from './AppErrorBoundary.js';
+const { createFromFetch, createFromReadableStream } = pkg;
+
+console.log('use route');
+const RouterContext = createContext(null);
+const initialCache = new Map();
+
+export function RSCRouter(): React.ReactElement {
+ const [cache, setCache] = useState(initialCache);
+ // const [location, setLocation] = useState({
+ // param: 'param'
+ // });
+
+ const locationKey = JSON.stringify(location);
+ let content = cache.get(locationKey);
+ if (!content) {
+ console.log('createFromFetch');
+ content = createFromFetch(
+ // fetch('/app?location=' + encodeURIComponent(locationKey))
+ fetch('/rsc'),
+ );
+ // cache.set(locationKey, content);
+ }
+
+ function refresh(response) {
+ startTransition(() => {
+ const nextCache = new Map();
+ if (response != null) {
+ const locationKey = response.headers.get('X-Location');
+ const nextLocation = JSON.parse(locationKey);
+ const nextContent = createFromReadableStream(response.body);
+ nextCache.set(locationKey, nextContent);
+ navigate(nextLocation);
+ }
+ setCache(nextCache);
+ });
+ }
+
+ function navigate(nextLocation) {
+ startTransition(() => {
+ // setLocation(loc => ({
+ // ...loc,
+ // ...nextLocation
+ // }));
+ });
+ }
+
+ const [finalContent, setFinalContent] = useState(null);
+ useEffect(() => {
+ content.then((res: any) => {
+ console.log('content res', res);
+ setFinalContent(res);
+ // console.log('finalContent', finalContent)
+ }, (e): any => {
+ console.error(e);
+ });
+ }, []);
+
+ return (
+
+
+ 123
+ {finalContent}
+
+
+ );
+}
+
+export function useRouter() {
+ return useContext(RouterContext);
+}
+
+export function useMutation({ endpoint, method }) {
+ const { refresh } = useRouter();
+ const [isSaving, setIsSaving] = useState(false);
+ const [didError, setDidError] = useState(false);
+ const [error, setError] = useState(null);
+ if (didError) {
+ // Let the nearest error boundary handle errors while saving.
+ throw error;
+ }
+
+ async function performMutation(payload, requestedLocation) {
+ setIsSaving(true);
+ try {
+ const response = await fetch(
+ `${endpoint}?location=${encodeURIComponent(
+ JSON.stringify(requestedLocation),
+ )}`,
+ {
+ method,
+ body: JSON.stringify(payload),
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ },
+ );
+ if (!response.ok) {
+ throw new Error(await response.text());
+ }
+ refresh(response);
+ } catch (e) {
+ setDidError(true);
+ setError(e);
+ } finally {
+ setIsSaving(false);
+ }
+ }
+
+ return [isSaving, performMutation];
+}
\ No newline at end of file
diff --git a/packages/runtime/src/runClientApp.tsx b/packages/runtime/src/runClientApp.tsx
index 4d2016a403..f591e44fe3 100644
--- a/packages/runtime/src/runClientApp.tsx
+++ b/packages/runtime/src/runClientApp.tsx
@@ -19,12 +19,14 @@ import ClientRouter from './ClientRouter.js';
import addLeadingSlash from './utils/addLeadingSlash.js';
import { AppContextProvider } from './AppContext.js';
import { deprecatedHistory } from './utils/deprecatedHistory.js';
+import { RSCRouter } from './rsc-router.js';
export interface RunClientAppOptions {
app: AppExport;
runtimeModules: RuntimeModules;
createRoutes?: (options: Pick) => RouteItem[];
hydrate?: boolean;
+ rsc?: boolean;
basename?: string;
memoryRouter?: boolean;
runtimeOptions?: Record;
@@ -39,12 +41,15 @@ export default async function runClientApp(options: RunClientAppOptions) {
runtimeModules,
basename,
hydrate,
+ rsc,
memoryRouter,
runtimeOptions,
dataLoaderFetcher,
dataLoaderDecorator,
} = options;
+ console.log('rsc: ', rsc);
+
const windowContext: WindowContext = (window as any).__ICE_APP_CONTEXT__ || {};
const assetsManifest: AssetsManifest = (window as any).__ICE_ASSETS_MANIFEST__ || {};
let {
@@ -128,16 +133,17 @@ export default async function runClientApp(options: RunClientAppOptions) {
await Promise.all(runtimeModules.commons.map(m => runtime.loadModule(m)).filter(Boolean));
}
- return render({ runtime, history, needHydrate });
+ return render({ runtime, history, needHydrate, useRsc: rsc });
}
interface RenderOptions {
history: History;
runtime: Runtime;
needHydrate: boolean;
+ useRsc: boolean; // TODO: 后续放到更好的地方判断是否使用 rsc
}
-async function render({ history, runtime, needHydrate }: RenderOptions) {
+async function render({ history, runtime, needHydrate, useRsc }: RenderOptions) {
const appContext = runtime.getAppContext();
const { appConfig, loaderData, routes, basename } = appContext;
const appRender = runtime.getRender();
@@ -188,7 +194,14 @@ async function render({ history, runtime, needHydrate }: RenderOptions) {
}
const renderRoot = appRender(
root,
-
+ useRsc
+ ?
+ //
+ //
+ //
+ //
+ //
+ :
) => RouteItem[];
runtimeModules: RuntimeModules;
Document: DocumentComponent;
+ RscServerRouter: any;
documentOnly?: boolean;
renderMode?: RenderMode;
// basename is used both for server and client, once set, it will be sync to client.
@@ -53,6 +59,17 @@ interface RenderOptions {
prependCode?: string;
serverData?: any;
streamOptions?: RenderToPipeableStreamOptions;
+ useRsc?: boolean;
+ routeManifest?: Array;
+}
+
+interface RouteManifest {
+ id: string;
+ file: string;
+ componentname: string;
+ layout: boolean;
+ export: string[];
+ children: any[];
}
interface Piper {
@@ -160,6 +177,13 @@ export async function renderToResponse(requestContext: ServerContext, renderOpti
const { onShellReady, onShellError, onError, onAllReady } = streamOptions;
return new Promise((resolve, reject) => {
+ if (renderOptions.useRsc) {
+ console.log('render RSC and sendResponse');
+ pipe(res);
+ // sendResponse(req, res, result);
+ resolve();
+ return;
+ }
// Send stream result to ServerResponse.
pipe(res, {
onShellReady: () => {
@@ -231,6 +255,9 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
renderMode,
runtimeOptions,
serverData,
+ useRsc,
+ routeManifest,
+ RscServerRouter,
} = renderOptions;
const finalBasename = addLeadingSlash(serverOnlyBasename || basename);
const location = getLocation(req.url);
@@ -256,7 +283,11 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
serverData,
};
const runtime = new Runtime(appContext, runtimeOptions);
- runtime.setAppRouter(ServerRouter);
+ if (useRsc) {
+ runtime.setAppRouter(RscServerRouter);
+ } else {
+ runtime.setAppRouter(ServerRouter);
+ }
// Load static module before getAppData.
if (runtimeModules.statics) {
await Promise.all(runtimeModules.statics.map(m => runtime.loadModule(m)).filter(Boolean));
@@ -265,7 +296,7 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
// don't need to execute getAppData in CSR
if (!documentOnly) {
try {
- appData = await getAppData(app, requestContext);
+ appData = await getAppData(app, requestContext); // 在 SSR 下请求数据
} catch (err) {
console.error('Error: get app data error when SSR.', err);
}
@@ -278,6 +309,31 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
const matches = matchRoutes(routes, location, finalBasename);
const routePath = getCurrentRoutePath(matches);
+
+ console.log('server use RSC', useRsc);
+ if (useRsc && location.pathname === '/rsc') {
+ // const routeModules = await loadRouteModules(matches.map(({ route: { id, lazy } }) => ({ id, lazy })));
+ // const loaderData = {};
+ // for (const routeId in routeModules) {
+ // const { loader } = routeModules[routeId];
+ // if (loader) {
+ // const { data, pageConfig } = await loader();
+ // loaderData[routeId] = {
+ // data,
+ // pageConfig,
+ // };
+ // }
+ // }
+ // const revalidate = renderMode === 'SSG' && needRevalidate(matches);
+ // runtime.setAppContext({ ...appContext, revalidate, routeModules, loaderData, routePath, matches, appData });
+ return renderRsc(requestContext, routeManifest, {
+ runtime,
+ matches,
+ location,
+ renderOptions,
+ });
+ }
+
if (documentOnly) {
return renderDocument({ matches, routePath, routes, renderOptions });
} else if (!matches.length) {
@@ -488,6 +544,113 @@ function renderDocument(options: RenderDocumentOptions): Response {
};
}
+// 函数位置可能要改
+export function renderReactTree(ReactServerApp, props): Response { // props 是根 RSC 组件的 props
+ // await waitForWebpack();
+ const manifest = readFileSync(
+ path.resolve('./build/rsc-client-manifest.json'),
+ 'utf8',
+ );
+ const moduleMap = JSON.parse(manifest);
+ console.log('reactserverAPp', React.createElement(ReactServerApp));
+ const { pipe, abort } = ReactServerDomWebpack.renderToPipeableStream(
+ React.createElement(ReactServerApp),
+ moduleMap,
+ );
+ return {
+ value: {
+ pipe,
+ fallback: abort,
+ },
+ };
+}
+
+/**
+ * Render and send the result to ServerResponse.
+ */
+export async function renderRsc( // renderToRscFlow
+ requestContext,
+ routeManifest,
+ {
+ runtime,
+ matches,
+ location,
+ renderOptions,
+ }: RenderServerEntry,
+) {
+ const appContext = runtime.getAppContext();
+ // console.log('appconfig', appContext.routes)
+ const { routes, routePath, loaderData, basename } = appContext;
+ const AppRuntimeProvider = runtime.composeAppProvider() || React.Fragment;
+ const AppRouter = runtime.getAppRouter();
+ const routerContext: ServerAppRouterProps['routerContext'] = {
+ // @ts-expect-error matches type should be use `AgnosticDataRouteMatch[]`
+ matches,
+ basename,
+ loaderData,
+ location,
+ };
+
+ const { Document, renderMode, RscServerRouter } = renderOptions;
+ console.log('routerContext', routerContext);
+
+ // function eraseFunction(object) {
+ // if(!object) {
+ // return;
+ // }
+ // for (let key in object) {
+ // if (typeof object[key] === 'function' && key === 'lazy') {
+ // delete object[key];
+ // } else if (typeof object[key] === 'object') {
+ // eraseFunction(object[key]);
+ // }
+ // }
+ // }
+ // eraseFunction(routes)
+
+ const documentContext = {
+ main: (
+
+ ),
+ };
+
+ // function isPlainObject(obj) {
+ // if (typeof obj !== 'object' || obj === null) return false
+
+ // let proto = obj
+ // while (Object.getPrototypeOf(proto) !== null) {
+ // proto = Object.getPrototypeOf(proto)
+ // }
+
+ // return Object.getPrototypeOf(obj) === proto
+ // }
+
+ // console.log('route is plain', isPlainObject(routes))
+ // console.log('routeManifest is plain', isPlainObject(routeManifest))
+ // console.log('routerContext is plain', isPlainObject(routerContext))
+ // console.log('routeManifest\n', routeManifest)
+ // console.log('requestContext', requestContext)
+
+ const ReactServerApp = () => {
+ return (
+
+
+ {/* */}
+
+ {/* */}
+ {/* */}
+ {/* runServerApp
*/}
+ {/* */}
+ {/* */}
+
+
{alert('sdafasfdaf')}}>faisudhfasd89fg7as9
*/}
- { alert('asfas'); }} />
- {/* */}
+ {/* */}
+ 34efa3
+ // <>
+ // {/* */}
+ // {/* */}
+ // {/* */}
+ // {/* {alert('sdafasfdaf')}}>faisudhfasd89fg7as9
*/}
+ // {/* { alert('asfas'); }} /> */}
+ // {/* */}
+ // 34efa3
+ // {/* */}
+ //
);
}
-function formatPath(pathStr) {
- return pathStr; // process.platform === 'win32' ? pathStr.split(path.sep).join('/') :
-}
+// export default RscServerRouter;
-function App({ children }) {
- const { appConfig } = useAppContext();
- const { strict, errorBoundary } = appConfig.app;
- const StrictMode = strict ? React.StrictMode : React.Fragment;
- const ErrorBoundary = errorBoundary ? AppErrorBoundary : React.Fragment;
+// function formatPath(pathStr) {
+// return pathStr; // process.platform === 'win32' ? pathStr.split(path.sep).join('/') :
+// }
- return (
-
-
- {children}
-
-
- );
-}
\ No newline at end of file
+// function App({ children }) {
+// const { appConfig } = useAppContext();
+// const { strict, errorBoundary } = appConfig.app;
+// const StrictMode = strict ? React.StrictMode : React.Fragment;
+// const ErrorBoundary = errorBoundary ? AppErrorBoundary : React.Fragment;
+
+// return (
+//
+//
+// {children}
+//
+//
+// );
+// }
\ No newline at end of file
diff --git a/packages/ice/package.json b/packages/ice/package.json
index 24be8a65d1..35a5a99fb3 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -42,6 +42,9 @@
"@ice/webpack-config": "1.0.18",
"@swc/helpers": "0.5.1",
"@types/express": "^4.17.14",
+ "acorn": "^8.10.0",
+ "acorn-jsx": "^5.3.2",
+ "acorn-loose": "^8.3.0",
"address": "^1.1.2",
"build-scripts": "^2.1.1-0",
"chalk": "^4.0.0",
@@ -60,13 +63,14 @@
"mrmime": "^1.0.0",
"open": "^8.4.0",
"path-to-regexp": "^6.2.0",
+ "react-server-dom-webpack": "18.3.0-canary-1cea38448-20230530",
+ "recast": "^0.23.4",
"regenerator-runtime": "^0.13.0",
"resolve.exports": "^1.1.0",
"semver": "^7.3.5",
"source-map-support": "^0.5.21",
"temp": "^0.9.4",
- "yargs-parser": "^21.1.1",
- "react-server-dom-webpack": "^18.3.0-canary-1cea38448-20230530"
+ "yargs-parser": "^21.1.1"
},
"devDependencies": {
"@types/babel__generator": "^7.6.4",
diff --git a/packages/ice/src/commands/build.ts b/packages/ice/src/commands/build.ts
index 2349bd2423..9f718d175e 100644
--- a/packages/ice/src/commands/build.ts
+++ b/packages/ice/src/commands/build.ts
@@ -187,13 +187,13 @@ const build = async (
appConfig,
});
- await removeServerOutput(outputDir, userConfig.ssr);
+ await removeServerOutput(outputDir, userConfig.ssr || userConfig.rsc);
return { compiler };
};
-async function removeServerOutput(outputDir: string, ssr: boolean) {
- if (!ssr) {
+async function removeServerOutput(outputDir: string, retainBuild: boolean) {
+ if (!retainBuild) {
await fse.remove(path.join(outputDir, SERVER_OUTPUT_DIR));
}
}
diff --git a/packages/ice/src/esbuild/rscServerRegister.ts b/packages/ice/src/esbuild/rscServerRegister.ts
new file mode 100644
index 0000000000..cecc827a33
--- /dev/null
+++ b/packages/ice/src/esbuild/rscServerRegister.ts
@@ -0,0 +1,154 @@
+import fs from 'fs';
+import url from 'url';
+import type { Loader, Plugin, PluginBuild } from 'esbuild';
+import { Parser } from 'acorn';
+import jsx from 'acorn-jsx';
+import recast from 'recast';
+
+// TODO：整理代码
+const rscServerRegister = (): Plugin => {
+ return {
+ name: 'rsc-server-register',
+ setup: async (build: PluginBuild) => {
+ build.onLoad({ filter: /\/src\/.*\.(js|ts|jsx|tsx)$/ }, async (args) => { // /src\/.*\
+ console.log('register call--------');
+ const { path } = args;
+ console.log(path, '+++++++++++++=================++++++++++++');
+ const loader = path.endsWith('.tsx') || path.endsWith('.ts') ? 'tsx' : 'jsx';
+ const content = await fs.promises.readFile(path, 'utf-8');
+ if (path.indexOf('routes-config') > 0) {
+ console.log('path.indexOf(\'routes-config\') > 0');
+ return { contents: content, loader };
+ }
+
+ if (content.indexOf('routes_config_default') > 0) {
+ console.log('aaa', content);
+ }
+ if (path.indexOf('/src/') === -1) {
+ return { contents: content, loader };
+ }
+ console.log('rsc 编译', path, content.indexOf('use client'), content.indexOf('use server'));
+
+ if (content.indexOf('use client') === -1 && content.indexOf('use server') === -1) {
+ return { contents: content, loader };
+ }
+
+ let body;
+ try {
+ body = (Parser.extend(jsx()).parse(content, {
+ ecmaVersion: 2024,
+ sourceType: 'module',
+ }) as any).body;
+ } catch (x) {
+ console.error('Error parsing %s %s %s', url, x.message, path);
+ console.log(content);
+ return { contents: content, loader };
+ }
+
+ let useClient = false;
+ let useServer = false;
+ for (let i = 0; i < body.length; i++) {
+ const node = body[i];
+ if (node.type !== 'ExpressionStatement' || !node.directive) {
+ break;
+ }
+ if (node.directive === 'use client') {
+ useClient = true;
+ }
+ if (node.directive === 'use server') {
+ useServer = true;
+ }
+ }
+
+ if (!useClient && !useServer) {
+ return { contents: content, loader };
+ }
+
+ if (useClient && useServer) {
+ throw new Error(
+ 'Cannot have both "use client" and "use server" directives in the same file.',
+ );
+ }
+
+ let source = content;
+ if (useClient) {
+ const moduleId: string = url.pathToFileURL(path).href;
+ source = 'import {createClientModuleProxy} from \'@ice/runtime\';';
+ source += transformContent(moduleId);
+ }
+
+ if (useServer) {
+ source = 'import {registerServerReference} from \'@ice/runtime\';';
+ const moduleId: string = url.pathToFileURL(path).href;
+
+ // // This module is imported server to server, but opts in to exposing functions by
+ // // reference. If there are any functions in the export.
+ body = (Parser.extend(jsx()).parse(content, {
+ ecmaVersion: 2024,
+ sourceType: 'module',
+ }) as any).body;
+ for (let i = 0; i < body.length; i++) {
+ const node = body[i];
+ if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
+ const { declaration } = node;
+ if (declaration.type === 'FunctionDeclaration') {
+ if (moduleId.indexOf('/pages') !== -1) {
+ source += `\
+ var toExport${i} = ${recast.print(declaration).code};
+ const pageConfig = registerServerReference(toExport${i}, '${moduleId}', null);\n
+ export {pageConfig};
+ `;
+ } else {
+ source += `\
+ var toExport${i} = ${recast.print(declaration).code};
+ const comp = registerServerReference(toExport${i}, '${moduleId}', null);\n
+ export default comp;
+ `;
+ }
+ }
+ }
+ }
+ console.log('服务端组件编译结果', source);
+ }
+
+ source += ';console.log(\'------------==============---------\');';
+ source = source.replace(/^(\'|\")use (client|server)(\';|\'|\";|\")/, '');
+ return { contents: source, loader };
+ });
+
+ // there are some .png file are imported in .tsx file
+ build.onLoad({ filter: /.\.png$/ }, async (args) => {
+ const fileContents = await fs.promises.readFile(args.path);
+ const base64 = fileContents.toString('base64');
+ const contents = `export default "data:image/png;base64,${base64}"`;
+ return { contents, loader: 'js' };
+ });
+ },
+ };
+};
+
+function transformContent(moduleId: string) { // ${exports.$$typeof.toString()}
+ // const exports = createClientModuleProxy(moduleId);
+ // console.log('default', exports.default)
+ // const content = `const comp = {
+ // $$typeof: {value: Symbol.for('react.client.reference')},
+ // $$id: {value: '${exports.$$id}'},
+ // $$async: {value: ${exports.$$async}},
+ // };export default comp;`
+ // let name = moduleId.match(/\/([^/]+)$/)[1];
+ // name = name.replace(/\.[^/.]+$/, '');
+ let content = '';
+ if (moduleId.indexOf('/pages') !== -1) {
+ content = `\
+ const pageConfig = createClientModuleProxy('${moduleId}');\n
+ export {pageConfig};`;
+ } else {
+ content = `\
+ const comp = createClientModuleProxy('${moduleId}');
+ export default comp`;
+ }
+ console.log('客户端组件编译结果', content);
+ return content;
+}
+
+export default rscServerRegister;
diff --git a/packages/ice/src/service/serverCompiler.ts b/packages/ice/src/service/serverCompiler.ts
index ff320a7abb..9905724f74 100644
--- a/packages/ice/src/service/serverCompiler.ts
+++ b/packages/ice/src/service/serverCompiler.ts
@@ -10,6 +10,7 @@ import type { ServerCompiler } from '../types/plugin.js';
import type { UserConfig } from '../types/userConfig.js';
import escapeLocalIdent from '../utils/escapeLocalIdent.js';
import cssModulesPlugin from '../esbuild/cssModules.js';
+import rscServerRegister from '../esbuild/rscServerRegister.js';
import externalPlugin from '../esbuild/external.js';
import ignorePlugin from '../esbuild/ignore.js';
import createAssetsPlugin from '../esbuild/assets.js';
@@ -195,6 +196,7 @@ export function createServerCompiler(options: Options) {
externals: server.externals,
}),
server?.ignores && ignorePlugin(server.ignores),
+ rscServerRegister(),
cssModulesPlugin({
extract: false,
generateLocalIdentName: function (name: string, filename: string) {
diff --git a/packages/ice/templates/core/index.ts.ejs b/packages/ice/templates/core/index.ts.ejs
index b04140711d..a23f845c8d 100644
--- a/packages/ice/templates/core/index.ts.ejs
+++ b/packages/ice/templates/core/index.ts.ejs
@@ -2,8 +2,10 @@
import '<%= globalStyle %>'
<% } -%>
import type { PageConfig, PageConfigDefinition } from './types';
-import path from 'path';
+//import path from 'path';
import routeManifest from './route-manifest.json';
+import {createClientModuleProxy} from '@ice/runtime';
+import {registerServerReference} from '@ice/runtime';
<%- framework.imports %>
<%- framework.variablesStr %>
@@ -18,8 +20,10 @@ function definePageConfig(pageConfig: PageConfig | PageConfigDefinition): PageCo
}
export {
- path,
+ //path,
routeManifest,
+ createClientModuleProxy,
+ registerServerReference,
definePageConfig,
<% if (framework.exports) { -%><%- framework.exports %><% } -%>
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index c8238e0c3f..74c29ac7eb 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -42,7 +42,7 @@
"@types/react-dom": "^18.0.3",
"react": "^18.3.0-canary-1cea38448-20230530",
"react-dom": "^18.3.0-canary-1cea38448-20230530",
- "react-server-dom-webpack": "^18.3.0-canary-1cea38448-20230530",
+ "react-server-dom-webpack": "18.3.0-canary-1cea38448-20230530",
"regenerator-runtime": "^0.13.9"
},
"sideEffects": [
diff --git a/packages/runtime/src/Document.tsx b/packages/runtime/src/Document.tsx
index 242f95f8b3..5858cb9d91 100644
--- a/packages/runtime/src/Document.tsx
+++ b/packages/runtime/src/Document.tsx
@@ -1,3 +1,4 @@
+'use client';
import * as React from 'react';
import type { WindowContext, RouteMatch, AssetsManifest } from './types.js';
import { useAppContext, useAppData } from './AppContext.js';
diff --git a/packages/runtime/src/index.ts b/packages/runtime/src/index.ts
index 99d9934618..4bd3c3ed05 100644
--- a/packages/runtime/src/index.ts
+++ b/packages/runtime/src/index.ts
@@ -45,6 +45,7 @@ import type {
DataType,
MainType,
} from './Document.js';
+import { createClientModuleProxy, registerServerReference } from './reactFlightWebpackReference.js';
import dataLoader, { defineDataLoader, defineServerDataLoader, defineStaticDataLoader, callDataLoader } from './dataLoader.js';
import getRequestContext from './requestContext.js';
import AppErrorBoundary from './AppErrorBoundary.js';
@@ -111,6 +112,8 @@ export {
usePageAssets,
path,
App,
+ createClientModuleProxy,
+ registerServerReference,
createServerRoutes,
// API for data-loader.
dataLoader,
diff --git a/packages/runtime/src/reactFlightWebpackReference.ts b/packages/runtime/src/reactFlightWebpackReference.ts
new file mode 100644
index 0000000000..691edbc033
--- /dev/null
+++ b/packages/runtime/src/reactFlightWebpackReference.ts
@@ -0,0 +1,226 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// Modified from https://github.com/facebook/react/blob/main/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js
+
+const CLIENT_REFERENCE = Symbol.for('react.client.reference');
+const SERVER_REFERENCE = Symbol.for('react.server.reference');
+const PROMISE_PROTOTYPE = Promise.prototype;
+
+const FunctionBind = Function.prototype.bind;
+// $FlowFixMe[method-unbinding]
+const ArraySlice = Array.prototype.slice;
+function bind(ctx) {
+ const newFn = FunctionBind.apply(ctx, arguments);
+ if (ctx.$$typeof === SERVER_REFERENCE) {
+ const args = ArraySlice.call(arguments, 1);
+ newFn.$$typeof = SERVER_REFERENCE;
+ newFn.$$id = ctx.$$id;
+ newFn.$$bound = ctx.$$bound ? ctx.$$bound.concat(args) : args;
+ }
+ return newFn;
+}
+
+export function registerServerReference(
+ reference: any,
+ id: string,
+ exportName: null | string,
+) {
+ return Object.defineProperties(reference, {
+ $$typeof: { value: SERVER_REFERENCE },
+ $$id: { value: exportName === null ? id : `${id}#${exportName}` },
+ $$bound: { value: null },
+ bind: { value: bind },
+ });
+}
+
+const deepProxyHandlers = {
+ get: function (target: any, name: string, _receiver: ProxyHandler) {
+ switch (name) {
+ // These names are read by the Flight runtime if you end up using the exports object.
+ case '$$typeof':
+ // These names are a little too common. We should probably have a way to
+ // have the Flight runtime extract the inner target instead.
+ return target.$$typeof;
+ case '$$id':
+ return target.$$id;
+ case '$$async':
+ return target.$$async;
+ case 'name':
+ return target.name;
+ case 'displayName':
+ return undefined;
+ // We need to special case this because createElement reads it if we pass this
+ // reference.
+ case 'defaultProps':
+ return undefined;
+ // Avoid this attempting to be serialized.
+ case 'toJSON':
+ return undefined;
+ case Symbol.toPrimitive.toString():
+ // @ts-ignore
+ return Object.prototype[Symbol.toPrimitive];
+ case 'Provider':
+ throw new Error(
+ 'Cannot render a Client Context Provider on the Server. ' +
+ 'Instead, you can export a Client Component wrapper ' +
+ 'that itself renders a Client Context Provider.',
+ );
+ default:
+ break;
+ }
+ const expression = `${String(target.name)}.${String(name)}`;
+ throw new Error(
+ `Cannot access ${expression} on the server. ` +
+ 'You cannot dot into a client module from a server component. ' +
+ 'You can only pass the imported name through.',
+ );
+ },
+ set: function () {
+ throw new Error('Cannot assign to a client module from a server module.');
+ },
+};
+
+const proxyHandlers = {
+ get: function (target: any, name: string, _receiver: ProxyHandler) {
+ switch (name) {
+ // These names are read by the Flight runtime if you end up using the exports object.
+ case '$$typeof':
+ return target.$$typeof;
+ case '$$id':
+ return target.$$id;
+ case '$$async':
+ return target.$$async;
+ case 'name':
+ return target.name;
+ // We need to special case this because createElement reads it if we pass this
+ // reference.
+ case 'defaultProps':
+ return undefined;
+ // Avoid this attempting to be serialized.
+ case 'toJSON':
+ return undefined;
+ case Symbol.toPrimitive.toString():
+ // @ts-ignore
+ return Object.prototype[Symbol.toPrimitive];
+ case '__esModule':
+ // Something is conditionally checking which export to use. We'll pretend to be
+ // an ESM compat module but then we'll check again on the client.
+ const moduleId = target.$$id;
+ target.default = Object.defineProperties(
+ () => {
+ throw new Error(
+ `Attempted to call the default export of ${moduleId} from the server ` +
+ 'but it\'s on the client. It\'s not possible to invoke a client function from ' +
+ 'the server, it can only be rendered as a Component or passed to props of a ' +
+ 'Client Component.',
+ );
+ },
+ {
+ $$typeof: { value: CLIENT_REFERENCE },
+ // This a placeholder value that tells the client to conditionally use the
+ // whole object or just the default export.
+ $$id: { value: `${target.$$id}#` },
+ $$async: { value: target.$$async },
+ },
+ );
+ return true;
+ case 'then':
+ if (target.then) {
+ // Use a cached value
+ return target.then;
+ }
+ if (!target.$$async) {
+ // If this module is expected to return a Promise (such as an AsyncModule) then
+ // we should resolve that with a client reference that unwraps the Promise on
+ // the client.
+
+ const clientReference = Object.defineProperties(
+ {},
+ {
+ $$typeof: { value: CLIENT_REFERENCE },
+ $$id: { value: target.$$id },
+ $$async: { value: true },
+ },
+ );
+ const proxy = new Proxy(clientReference, proxyHandlers);
+
+ // Treat this as a resolved Promise for React's use()
+ target.status = 'fulfilled';
+ target.value = proxy;
+
+ const then = (target.then = Object.defineProperties(
+ (resolve: any, _reject: any) => {
+ // Expose to React.
+ return Promise.resolve(
+ // $FlowFixMe[incompatible-call] found when upgrading Flow
+ resolve(proxy),
+ );
+ },
+ // If this is not used as a Promise but is treated as a reference to a `.then`
+ // export then we should treat it as a reference to that name.
+ {
+ $$typeof: { value: CLIENT_REFERENCE },
+ $$id: { value: target.$$id },
+ $$async: { value: false },
+ },
+ ));
+ return then;
+ } else {
+ // Since typeof .then === 'function' is a feature test we'd continue recursing
+ // indefinitely if we return a function. Instead, we return an object reference
+ // if we check further.
+ return undefined;
+ }
+ default:
+ break;
+ }
+ let cachedReference = target[name];
+ if (!cachedReference) {
+ const reference = Object.defineProperties(
+ () => {
+ throw new Error(
+ `Attempted to call ${String(name)}() from the server but ${String(
+ name,
+ )} is on the client. ` +
+ 'It\'s not possible to invoke a client function from the server, it can ' +
+ 'only be rendered as a Component or passed to props of a Client Component.',
+ );
+ },
+ {
+ $$typeof: { value: CLIENT_REFERENCE },
+ $$id: { value: `${target.$$id}#${name}` },
+ $$async: { value: target.$$async },
+ },
+ );
+ cachedReference = target[name] = new Proxy(reference, deepProxyHandlers);
+ }
+ return cachedReference;
+ },
+ getPrototypeOf(_target: any): object {
+ // Pretend to be a Promise in case anyone asks.
+ return PROMISE_PROTOTYPE;
+ },
+ set: function () {
+ throw new Error('Cannot assign to a client module from a server module.');
+ },
+};
+
+export function createClientModuleProxy(moduleId: string) {
+ const clientReference = Object.defineProperties(
+ {},
+ {
+ $$typeof: { value: CLIENT_REFERENCE },
+ // Represents the whole Module object instead of a particular import.
+ $$id: { value: moduleId },
+ $$async: { value: false },
+ },
+ );
+ const pxy = new Proxy(clientReference, proxyHandlers);
+ console.log('proxy', pxy);
+ return pxy; // new Proxy(clientReference, proxyHandlers)
+}
diff --git a/packages/runtime/src/runServerApp.tsx b/packages/runtime/src/runServerApp.tsx
index acc998215d..13ee6596be 100644
--- a/packages/runtime/src/runServerApp.tsx
+++ b/packages/runtime/src/runServerApp.tsx
@@ -502,10 +502,11 @@ function renderDocument(options: RenderDocumentOptions): Response {
matches.forEach(async (match) => {
const { id } = match.route;
const pageConfig = routesConfig[id];
-
- loaderData[id] = {
- pageConfig: pageConfig ? pageConfig({}) : {},
- };
+ if (!pageConfig['$$id']) { // rsc文件编译转换后，变成proxy对象而不是函数，应该也不需要执行这里的逻辑，暂时特判解决
+ loaderData[id] = {
+ pageConfig: pageConfig ? pageConfig({}) : {},
+ };
+ }
});
const appContext: AppContext = {
@@ -552,9 +553,9 @@ export function renderReactTree(ReactServerApp, props): Response { // props 是
'utf8',
);
const moduleMap = JSON.parse(manifest);
- console.log('reactserverAPp', React.createElement(ReactServerApp));
+ const App = React.createElement(ReactServerApp, null, null);
const { pipe, abort } = ReactServerDomWebpack.renderToPipeableStream(
- React.createElement(ReactServerApp),
+ App,
moduleMap,
);
return {
@@ -631,18 +632,20 @@ export async function renderRsc( // renderToRscFlow
// console.log('routeManifest\n', routeManifest)
// console.log('requestContext', requestContext)
+ console.log('RscServerRouter', RscServerRouter);
+
const ReactServerApp = () => {
return (
-
- {/* */}
-
- {/* */}
- {/* */}
- {/* runServerApp
*/}
- {/* */}
- {/* */}
-
+ {/*
*/}
+ {/* */}
+
+ {/* */}
+ {/* */}
+ runServerApp
+ {/* */}
+ {/* */}
+ {/* */}
- {/*
*/}
{/* */}
- {/* */}
- {/* */}
runServerApp
- {/* */}
- {/* */}
- {/* */}
34efa3
+
+ Server component: rscServerRouter
// <>
- // {/* */}
- // {/* */}
// {/* */}
- // {/* {alert('sdafasfdaf')}}>faisudhfasd89fg7as9
*/}
- // {/* { alert('asfas'); }} /> */}
- // {/* */}
- // 34efa3
// {/* */}
//
);
diff --git a/packages/ice/src/esbuild/rscServerRegister.ts b/packages/ice/src/esbuild/rscServerRegister.ts
index cecc827a33..c5f886d440 100644
--- a/packages/ice/src/esbuild/rscServerRegister.ts
+++ b/packages/ice/src/esbuild/rscServerRegister.ts
@@ -11,9 +11,7 @@ const rscServerRegister = (): Plugin => {
name: 'rsc-server-register',
setup: async (build: PluginBuild) => {
build.onLoad({ filter: /\/src\/.*\.(js|ts|jsx|tsx)$/ }, async (args) => { // /src\/.*\
- console.log('register call--------');
const { path } = args;
- console.log(path, '+++++++++++++=================++++++++++++');
const loader = path.endsWith('.tsx') || path.endsWith('.ts') ? 'tsx' : 'jsx';
const content = await fs.promises.readFile(path, 'utf-8');
if (path.indexOf('routes-config') > 0) {
@@ -21,9 +19,6 @@ const rscServerRegister = (): Plugin => {
return { contents: content, loader };
}
- if (content.indexOf('routes_config_default') > 0) {
- console.log('aaa', content);
- }
if (path.indexOf('/src/') === -1) {
return { contents: content, loader };
}
@@ -87,9 +82,12 @@ const rscServerRegister = (): Plugin => {
ecmaVersion: 2024,
sourceType: 'module',
}) as any).body;
- for (let i = 0; i < body.length; i++) {
+ for (let i = 0; i < body.length; i++) { // TODO：编译后的的代码其实是不完整的，忽略了有一些全局定义的变量的情况
const node = body[i];
- if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
+ if (node.type === 'ImportDeclaration') { // TODO: 如果是 import 语句的情况
+ const { start, end } = node;
+ source += content.substring(start, end);
+ } else if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
const { declaration } = node;
if (declaration.type === 'FunctionDeclaration') {
if (moduleId.indexOf('/pages') !== -1) {
@@ -105,6 +103,8 @@ const rscServerRegister = (): Plugin => {
export default comp;
`;
}
+ } else { // TODO: 不是 function 类型的导出的情况
+ //
}
}
}
@@ -127,16 +127,7 @@ const rscServerRegister = (): Plugin => {
};
};
-function transformContent(moduleId: string) { // ${exports.$$typeof.toString()}
- // const exports = createClientModuleProxy(moduleId);
- // console.log('default', exports.default)
- // const content = `const comp = {
- // $$typeof: {value: Symbol.for('react.client.reference')},
- // $$id: {value: '${exports.$$id}'},
- // $$async: {value: ${exports.$$async}},
- // };export default comp;`
- // let name = moduleId.match(/\/([^/]+)$/)[1];
- // name = name.replace(/\.[^/.]+$/, '');
+function transformContent(moduleId: string) { // TODO: 还没处理 import 语句的情况，待加入
let content = '';
if (moduleId.indexOf('/pages') !== -1) {
content = `\
diff --git a/packages/runtime/src/rsc-router.tsx b/packages/runtime/src/rsc-router.tsx
index c6bc54944a..339ce0d304 100644
--- a/packages/runtime/src/rsc-router.tsx
+++ b/packages/runtime/src/rsc-router.tsx
@@ -7,6 +7,7 @@ import React, {
useState,
useEffect,
ReactElement,
+ Suspense,
} from 'react';
import pkg from 'react-server-dom-webpack/client';
import { ClientAppRouterProps } from './types.js';
@@ -62,7 +63,6 @@ export function RSCRouter(): React.ReactElement {
content.then((res: any) => {
console.log('content res', res);
setFinalContent(res);
- // console.log('finalContent', finalContent)
}, (e): any => {
console.error(e);
});
@@ -72,7 +72,10 @@ export function RSCRouter(): React.ReactElement {
123
- {finalContent}
+ loading...}>
+ {finalContent}
+ {/* {use(content)} */}
+
);
From d754d6c1bf11e194b1d9a17529f4cca607d090d9 Mon Sep 17 00:00:00 2001
From: Coooder-X <1104143015@qq.com>
Date: Wed, 30 Aug 2023 17:13:59 +0800
Subject: [PATCH 6/8] refactor: upgrate devDependencies and clean code
---
examples/rsc-project/package.json | 4 +-
examples/rsc-project/src/pages/about.tsx | 1 -
examples/rsc-project/src/pages/blog.tsx | 1 -
examples/rsc-project/src/pages/index.tsx | 1 -
examples/rsc-project/src/pages/layout.tsx | 1 -
package.json | 4 +-
packages/ice/package.json | 2 +-
packages/runtime/package.json | 4 +-
pnpm-lock.yaml | 362 +++++++++++-----------
9 files changed, 188 insertions(+), 192 deletions(-)
diff --git a/examples/rsc-project/package.json b/examples/rsc-project/package.json
index 04da6eeda7..6680cc72e2 100644
--- a/examples/rsc-project/package.json
+++ b/examples/rsc-project/package.json
@@ -16,8 +16,8 @@
"@ice/runtime": "workspace:*",
"antd-mobile": "^5.12.6",
"compression": "^1.7.4",
- "react": "^18.3.0-canary-1cea38448-20230530",
- "react-dom": "^18.3.0-canary-1cea38448-20230530",
+ "react": "^0.0.0-experimental-1cea38448-20230530",
+ "react-dom": "^0.0.0-experimental-1cea38448-20230530",
"react-router-dom": "6.11.2",
"react-server-dom-webpack": "18.3.0-canary-1cea38448-20230530"
},
diff --git a/examples/rsc-project/src/pages/about.tsx b/examples/rsc-project/src/pages/about.tsx
index 9f8a7b7e1f..d14c62fe78 100644
--- a/examples/rsc-project/src/pages/about.tsx
+++ b/examples/rsc-project/src/pages/about.tsx
@@ -1,4 +1,3 @@
-// 'use /client';
// @ts-expect-error
import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
import url from './ice.png';
diff --git a/examples/rsc-project/src/pages/blog.tsx b/examples/rsc-project/src/pages/blog.tsx
index 69144c0278..6f0c905925 100644
--- a/examples/rsc-project/src/pages/blog.tsx
+++ b/examples/rsc-project/src/pages/blog.tsx
@@ -1,4 +1,3 @@
-// 'use /server';
import { Link, useData, useConfig, definePageConfig } from 'ice';
// interface Data {
diff --git a/examples/rsc-project/src/pages/index.tsx b/examples/rsc-project/src/pages/index.tsx
index c65e3af9f2..e7725417c6 100644
--- a/examples/rsc-project/src/pages/index.tsx
+++ b/examples/rsc-project/src/pages/index.tsx
@@ -1,4 +1,3 @@
-// 'use /client';
import { Suspense } from 'react';
import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
// Not recommended but works.
diff --git a/examples/rsc-project/src/pages/layout.tsx b/examples/rsc-project/src/pages/layout.tsx
index 1091c97691..917d58bf8b 100644
--- a/examples/rsc-project/src/pages/layout.tsx
+++ b/examples/rsc-project/src/pages/layout.tsx
@@ -1,4 +1,3 @@
-// 'use /client';
import { Outlet, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
export default () => {
diff --git a/package.json b/package.json
index 4975b1a211..a40efac7ee 100644
--- a/package.json
+++ b/package.json
@@ -57,8 +57,8 @@
"lint-staged": "^13.0.3",
"prettier": "^2.7.1",
"puppeteer": "^19.6.3",
- "react": "^18.3.0-canary-1cea38448-20230530",
- "react-dom": "^18.3.0-canary-1cea38448-20230530",
+ "react": "^0.0.0-experimental-1cea38448-20230530",
+ "react-dom": "^0.0.0-experimental-1cea38448-20230530",
"rimraf": "^3.0.2",
"stylelint": "^14.10.0",
"tsx": "^3.12.1",
diff --git a/packages/ice/package.json b/packages/ice/package.json
index 35a5a99fb3..277e6525be 100644
--- a/packages/ice/package.json
+++ b/packages/ice/package.json
@@ -84,7 +84,7 @@
"chokidar": "^3.5.3",
"esbuild": "^0.17.16",
"jest": "^29.0.2",
- "react": "^18.3.0-canary-1cea38448-20230530",
+ "react": "^0.0.0-experimental-1cea38448-20230530",
"react-router": "6.11.2",
"sass": "^1.50.0",
"unplugin": "^0.9.0",
diff --git a/packages/runtime/package.json b/packages/runtime/package.json
index 74c29ac7eb..7818199d10 100644
--- a/packages/runtime/package.json
+++ b/packages/runtime/package.json
@@ -40,8 +40,8 @@
"@remix-run/web-fetch": "^4.3.3",
"@types/react": "^18.0.8",
"@types/react-dom": "^18.0.3",
- "react": "^18.3.0-canary-1cea38448-20230530",
- "react-dom": "^18.3.0-canary-1cea38448-20230530",
+ "react": "0.0.0-experimental-1cea38448-20230530",
+ "react-dom": "0.0.0-experimental-1cea38448-20230530",
"react-server-dom-webpack": "18.3.0-canary-1cea38448-20230530",
"regenerator-runtime": "^0.13.9"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 798fe37005..9394cb2cfe 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -25,7 +25,7 @@ importers:
version: link:packages/bundles
'@testing-library/react':
specifier: ^13.3.0
- version: 13.4.0(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
+ version: 13.4.0(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
'@types/eslint':
specifier: ^8.4.5
version: 8.21.1
@@ -96,11 +96,11 @@ importers:
specifier: ^19.6.3
version: 19.7.3(typescript@4.9.5)
react:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530
+ specifier: ^0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530
react-dom:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ specifier: ^0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
rimraf:
specifier: ^3.0.2
version: 3.0.2
@@ -582,22 +582,22 @@ importers:
version: link:../../packages/runtime
antd-mobile:
specifier: ^5.12.6
- version: 5.28.1(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
+ version: 5.28.1(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
compression:
specifier: ^1.7.4
version: 1.7.4
react:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530
+ specifier: ^0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530
react-dom:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ specifier: ^0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
react-router-dom:
specifier: 6.11.2
- version: 6.11.2(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
+ version: 6.11.2(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
react-server-dom-webpack:
specifier: 18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)(webpack@5.86.0)
+ version: 18.3.0-canary-1cea38448-20230530(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)(webpack@5.86.0)
devDependencies:
'@types/react':
specifier: ^18.0.0
@@ -1506,7 +1506,7 @@ importers:
version: link:../route-manifest
'@ice/runtime':
specifier: ^1.2.4
- version: 1.2.7(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530)
+ version: 1.2.7(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530)
'@ice/webpack-config':
specifier: 1.0.18
version: link:../webpack-config
@@ -1581,10 +1581,10 @@ importers:
version: 6.2.1
react-dom:
specifier: '>=18.0.0'
- version: 18.2.0(react@18.3.0-canary-1cea38448-20230530)
+ version: 18.2.0(react@0.0.0-experimental-1cea38448-20230530)
react-server-dom-webpack:
specifier: 18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530)(webpack@5.86.0)
+ version: 18.3.0-canary-1cea38448-20230530(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530)(webpack@5.86.0)
recast:
specifier: ^0.23.4
version: 0.23.4
@@ -1641,11 +1641,11 @@ importers:
specifier: ^29.0.2
version: 29.5.0(@types/node@17.0.45)
react:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530
+ specifier: ^0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530
react-router:
specifier: 6.11.2
- version: 6.11.2(react@18.3.0-canary-1cea38448-20230530)
+ version: 6.11.2(react@0.0.0-experimental-1cea38448-20230530)
sass:
specifier: ^1.50.0
version: 1.50.0
@@ -2162,7 +2162,7 @@ importers:
version: 0.12.7
react-router-dom:
specifier: 6.11.2
- version: 6.11.2(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
+ version: 6.11.2(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
semver:
specifier: ^7.4.0
version: 7.4.0
@@ -2180,14 +2180,14 @@ importers:
specifier: ^18.0.3
version: 18.0.11
react:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530
+ specifier: 0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530
react-dom:
- specifier: ^18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ specifier: 0.0.0-experimental-1cea38448-20230530
+ version: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
react-server-dom-webpack:
specifier: 18.3.0-canary-1cea38448-20230530
- version: 18.3.0-canary-1cea38448-20230530(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)(webpack@5.86.0)
+ version: 18.3.0-canary-1cea38448-20230530(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)(webpack@5.86.0)
regenerator-runtime:
specifier: ^0.13.9
version: 0.13.11
@@ -6060,22 +6060,22 @@ packages:
/@humanwhocodes/object-schema@1.2.1:
resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
- /@ice/jsx-runtime@0.2.1(react@18.2.0):
+ /@ice/jsx-runtime@0.2.1(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-X+IMfhmrfAFSA1Kh0fCr3+xJKRR048uljfB8zBIzoQyEf8MEkifUHtoS8UXQPp8fjyPCyt1hKXzAvz+LTLgO5g==}
peerDependencies:
react: ^16 || ^17 || ^18
dependencies:
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
style-unit: 3.0.5
+ dev: false
- /@ice/jsx-runtime@0.2.1(react@18.3.0-canary-1cea38448-20230530):
+ /@ice/jsx-runtime@0.2.1(react@18.2.0):
resolution: {integrity: sha512-X+IMfhmrfAFSA1Kh0fCr3+xJKRR048uljfB8zBIzoQyEf8MEkifUHtoS8UXQPp8fjyPCyt1hKXzAvz+LTLgO5g==}
peerDependencies:
react: ^16 || ^17 || ^18
dependencies:
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
style-unit: 3.0.5
- dev: false
/@ice/pkg-plugin-component@1.0.0:
resolution: {integrity: sha512-Mff6Em1RwY2NOZgciQyy2NXL65u9ebHV2Jqb5746vUVEh0l7Xpokb+3djV1pKcgED4wU8pSuSQ6jj+hXd9Ht1Q==}
@@ -6163,46 +6163,46 @@ packages:
- supports-color
dev: true
- /@ice/runtime@1.2.7(react-dom@18.2.0)(react@18.2.0):
+ /@ice/runtime@1.2.7(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-31fJyhinvkVvptCEF+qcPnMLEADZfFC+5bsHGvtG0cVM69e06f7tBQtfsXMnwcwDEad7Y3cC+Zdd7aBUtCbGhQ==}
requiresBuild: true
peerDependencies:
react: ^18.1.0
react-dom: ^18.1.0
dependencies:
- '@ice/jsx-runtime': 0.2.1(react@18.2.0)
+ '@ice/jsx-runtime': 0.2.1(react@0.0.0-experimental-1cea38448-20230530)
'@remix-run/router': 1.7.2
abortcontroller-polyfill: 1.7.5
ejs: 3.1.8
fs-extra: 10.1.0
history: 5.3.0
htmlparser2: 8.0.1
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
- react-router-dom: 6.14.2(react-dom@18.2.0)(react@18.2.0)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 18.2.0(react@0.0.0-experimental-1cea38448-20230530)
+ react-router-dom: 6.14.2(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530)
semver: 7.4.0
source-map: 0.7.4
+ dev: false
- /@ice/runtime@1.2.7(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530):
+ /@ice/runtime@1.2.7(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-31fJyhinvkVvptCEF+qcPnMLEADZfFC+5bsHGvtG0cVM69e06f7tBQtfsXMnwcwDEad7Y3cC+Zdd7aBUtCbGhQ==}
requiresBuild: true
peerDependencies:
react: ^18.1.0
react-dom: ^18.1.0
dependencies:
- '@ice/jsx-runtime': 0.2.1(react@18.3.0-canary-1cea38448-20230530)
+ '@ice/jsx-runtime': 0.2.1(react@18.2.0)
'@remix-run/router': 1.7.2
abortcontroller-polyfill: 1.7.5
ejs: 3.1.8
fs-extra: 10.1.0
history: 5.3.0
htmlparser2: 8.0.1
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.2.0(react@18.3.0-canary-1cea38448-20230530)
- react-router-dom: 6.14.2(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530)
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ react-router-dom: 6.14.2(react-dom@18.2.0)(react@18.2.0)
semver: 7.4.0
source-map: 0.7.4
- dev: false
/@ice/sandbox@1.1.4:
resolution: {integrity: sha512-MEVF0Ze3McKDutnFiUAhUoc+WwOFxITVBgSSHmbGpKtWbXJX9kUVlx3VsEVJvdqU3O1kiBNx6zE1sFMjKPRTIQ==}
@@ -7104,104 +7104,104 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /@react-spring/animated@9.6.1(react@18.2.0):
+ /@react-spring/animated@9.6.1(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/shared': 9.6.1(react@18.2.0)
+ '@react-spring/shared': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
'@react-spring/types': 9.6.1
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
dev: false
- /@react-spring/animated@9.6.1(react@18.3.0-canary-1cea38448-20230530):
+ /@react-spring/animated@9.6.1(react@18.2.0):
resolution: {integrity: sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/shared': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
+ '@react-spring/shared': 9.6.1(react@18.2.0)
'@react-spring/types': 9.6.1
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
- /@react-spring/core@9.6.1(react@18.2.0):
+ /@react-spring/core@9.6.1(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/animated': 9.6.1(react@18.2.0)
+ '@react-spring/animated': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
'@react-spring/rafz': 9.6.1
- '@react-spring/shared': 9.6.1(react@18.2.0)
+ '@react-spring/shared': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
'@react-spring/types': 9.6.1
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
dev: false
- /@react-spring/core@9.6.1(react@18.3.0-canary-1cea38448-20230530):
+ /@react-spring/core@9.6.1(react@18.2.0):
resolution: {integrity: sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/animated': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
+ '@react-spring/animated': 9.6.1(react@18.2.0)
'@react-spring/rafz': 9.6.1
- '@react-spring/shared': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
+ '@react-spring/shared': 9.6.1(react@18.2.0)
'@react-spring/types': 9.6.1
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
/@react-spring/rafz@9.6.1:
resolution: {integrity: sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ==}
dev: false
- /@react-spring/shared@9.6.1(react@18.2.0):
+ /@react-spring/shared@9.6.1(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
'@react-spring/rafz': 9.6.1
'@react-spring/types': 9.6.1
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
dev: false
- /@react-spring/shared@9.6.1(react@18.3.0-canary-1cea38448-20230530):
+ /@react-spring/shared@9.6.1(react@18.2.0):
resolution: {integrity: sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
'@react-spring/rafz': 9.6.1
'@react-spring/types': 9.6.1
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
/@react-spring/types@9.6.1:
resolution: {integrity: sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q==}
dev: false
- /@react-spring/web@9.6.1(react-dom@18.2.0)(react@18.2.0):
+ /@react-spring/web@9.6.1(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/animated': 9.6.1(react@18.2.0)
- '@react-spring/core': 9.6.1(react@18.2.0)
- '@react-spring/shared': 9.6.1(react@18.2.0)
+ '@react-spring/animated': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
+ '@react-spring/core': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
+ '@react-spring/shared': 9.6.1(react@0.0.0-experimental-1cea38448-20230530)
'@react-spring/types': 9.6.1
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
dev: false
- /@react-spring/web@9.6.1(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /@react-spring/web@9.6.1(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- '@react-spring/animated': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
- '@react-spring/core': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
- '@react-spring/shared': 9.6.1(react@18.3.0-canary-1cea38448-20230530)
+ '@react-spring/animated': 9.6.1(react@18.2.0)
+ '@react-spring/core': 9.6.1(react@18.2.0)
+ '@react-spring/shared': 9.6.1(react@18.2.0)
'@react-spring/types': 9.6.1
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
dev: false
/@remix-run/router@1.6.1:
@@ -7913,7 +7913,7 @@ packages:
redent: 3.0.0
dev: true
- /@testing-library/react@13.4.0(react-dom@18.2.0)(react@18.2.0):
+ /@testing-library/react@13.4.0(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==}
engines: {node: '>=12'}
peerDependencies:
@@ -7923,11 +7923,11 @@ packages:
'@babel/runtime': 7.21.0
'@testing-library/dom': 8.20.0
'@types/react-dom': 18.0.11
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
dev: true
- /@testing-library/react@13.4.0(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /@testing-library/react@13.4.0(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==}
engines: {node: '>=12'}
peerDependencies:
@@ -7937,8 +7937,8 @@ packages:
'@babel/runtime': 7.21.0
'@testing-library/dom': 8.20.0
'@types/react-dom': 18.0.11
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
dev: true
/@tootallnate/once@2.0.0:
@@ -8670,22 +8670,22 @@ packages:
resolution: {integrity: sha512-4lFhHc8so4yIHkBEs641DnEsBxPyhJ5GEjB4PURFDH4p/FcZriH6w99knZgI63zN/MBFfylMyb8+PDuj6RIXKQ==}
dev: false
- /@use-gesture/react@10.2.20(react@18.2.0):
+ /@use-gesture/react@10.2.20(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-KnJq9ZSqprWA6uNhWTUHZqTCh+rfa0j8ehTzqeBhktUPrmTj7yVOBvEQ/vSFU/7d72cGgWSsJ0f5T6GQCHXnvg==}
peerDependencies:
react: '>= 16.8.0'
dependencies:
'@use-gesture/core': 10.2.20
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
dev: false
- /@use-gesture/react@10.2.20(react@18.3.0-canary-1cea38448-20230530):
+ /@use-gesture/react@10.2.20(react@18.2.0):
resolution: {integrity: sha512-KnJq9ZSqprWA6uNhWTUHZqTCh+rfa0j8ehTzqeBhktUPrmTj7yVOBvEQ/vSFU/7d72cGgWSsJ0f5T6GQCHXnvg==}
peerDependencies:
react: '>= 16.8.0'
dependencies:
'@use-gesture/core': 10.2.20
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
/@vercel/ncc@0.33.4:
@@ -8947,7 +8947,7 @@ packages:
resolution: {integrity: sha512-V7uUvAwnimu6eh/PED4mCDjE7tokeZQLKlxg9lCTMPhN+NjsSbtdacByVlR1oluXQzD3MOw55wylDmQo4+S9ZQ==}
dev: false
- /ahooks@3.7.5(react@18.2.0):
+ /ahooks@3.7.5(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-RWkJYK5xj9ZXROj9jABRDqdpTBimkY1tlyeJQ8Ci7MAl1sC5xzSzwO20ydk6BjtdbWt56DPCYZhq4lGu3O2Zwg==}
engines: {node: '>=8.0.0'}
peerDependencies:
@@ -8959,13 +8959,13 @@ packages:
intersection-observer: 0.12.2
js-cookie: 2.2.1
lodash: 4.17.21
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
resize-observer-polyfill: 1.5.1
screenfull: 5.2.0
tslib: 2.5.0
dev: false
- /ahooks@3.7.5(react@18.3.0-canary-1cea38448-20230530):
+ /ahooks@3.7.5(react@18.2.0):
resolution: {integrity: sha512-RWkJYK5xj9ZXROj9jABRDqdpTBimkY1tlyeJQ8Ci7MAl1sC5xzSzwO20ydk6BjtdbWt56DPCYZhq4lGu3O2Zwg==}
engines: {node: '>=8.0.0'}
peerDependencies:
@@ -8977,7 +8977,7 @@ packages:
intersection-observer: 0.12.2
js-cookie: 2.2.1
lodash: 4.17.21
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
resize-observer-polyfill: 1.5.1
screenfull: 5.2.0
tslib: 2.5.0
@@ -9132,56 +9132,56 @@ packages:
resolution: {integrity: sha512-YGsiEDCPUDz3SzfXi6gLZn/HpeSMW+jgPc4qiYUr1fSopg3hkUie2TnooJdExgfiETHefH3Ggs58He0OVfegLA==}
dev: false
- /antd-mobile@5.28.1(react-dom@18.2.0)(react@18.2.0):
+ /antd-mobile@5.28.1(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-TFhwLstHig8HoJ34DiBelM2h7md0xn+VR54CVCZfm3nQ+LQEHaHOB6oJRHSMdm67kR8G8MyU618qeF+gK9JKxw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
'@floating-ui/dom': 1.2.3
'@rc-component/mini-decimal': 1.0.1
- '@react-spring/web': 9.6.1(react-dom@18.2.0)(react@18.2.0)
- '@use-gesture/react': 10.2.20(react@18.2.0)
- ahooks: 3.7.5(react@18.2.0)
+ '@react-spring/web': 9.6.1(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
+ '@use-gesture/react': 10.2.20(react@0.0.0-experimental-1cea38448-20230530)
+ ahooks: 3.7.5(react@0.0.0-experimental-1cea38448-20230530)
antd-mobile-icons: 0.3.0
antd-mobile-v5-count: 1.0.1
classnames: 2.3.2
dayjs: 1.11.7
lodash: 4.17.21
- rc-field-form: 1.27.4(react-dom@18.2.0)(react@18.2.0)
- rc-util: 5.28.0(react-dom@18.2.0)(react@18.2.0)
- react: 18.2.0
+ rc-field-form: 1.27.4(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
+ rc-util: 5.28.0(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
+ react: 0.0.0-experimental-1cea38448-20230530
react-is: 17.0.2
runes: 0.4.3
- staged-components: 1.1.3(react@18.2.0)
+ staged-components: 1.1.3(react@0.0.0-experimental-1cea38448-20230530)
tslib: 2.5.0
- use-sync-external-store: 1.2.0(react@18.2.0)
+ use-sync-external-store: 1.2.0(react@0.0.0-experimental-1cea38448-20230530)
transitivePeerDependencies:
- react-dom
dev: false
- /antd-mobile@5.28.1(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /antd-mobile@5.28.1(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-TFhwLstHig8HoJ34DiBelM2h7md0xn+VR54CVCZfm3nQ+LQEHaHOB6oJRHSMdm67kR8G8MyU618qeF+gK9JKxw==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
'@floating-ui/dom': 1.2.3
'@rc-component/mini-decimal': 1.0.1
- '@react-spring/web': 9.6.1(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
- '@use-gesture/react': 10.2.20(react@18.3.0-canary-1cea38448-20230530)
- ahooks: 3.7.5(react@18.3.0-canary-1cea38448-20230530)
+ '@react-spring/web': 9.6.1(react-dom@18.2.0)(react@18.2.0)
+ '@use-gesture/react': 10.2.20(react@18.2.0)
+ ahooks: 3.7.5(react@18.2.0)
antd-mobile-icons: 0.3.0
antd-mobile-v5-count: 1.0.1
classnames: 2.3.2
dayjs: 1.11.7
lodash: 4.17.21
- rc-field-form: 1.27.4(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
- rc-util: 5.28.0(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
- react: 18.3.0-canary-1cea38448-20230530
+ rc-field-form: 1.27.4(react-dom@18.2.0)(react@18.2.0)
+ rc-util: 5.28.0(react-dom@18.2.0)(react@18.2.0)
+ react: 18.2.0
react-is: 17.0.2
runes: 0.4.3
- staged-components: 1.1.3(react@18.3.0-canary-1cea38448-20230530)
+ staged-components: 1.1.3(react@18.2.0)
tslib: 2.5.0
- use-sync-external-store: 1.2.0(react@18.3.0-canary-1cea38448-20230530)
+ use-sync-external-store: 1.2.0(react@18.2.0)
transitivePeerDependencies:
- react-dom
dev: false
@@ -18940,7 +18940,7 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /rc-field-form@1.27.4(react-dom@18.2.0)(react@18.2.0):
+ /rc-field-form@1.27.4(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-PQColQnZimGKArnOh8V2907+VzDCXcqtFvHgevDLtqWc/P7YASb/FqntSmdS8q3VND5SHX3Y1vgMIzY22/f/0Q==}
engines: {node: '>=8.x'}
peerDependencies:
@@ -18949,12 +18949,12 @@ packages:
dependencies:
'@babel/runtime': 7.21.0
async-validator: 4.2.5
- rc-util: 5.28.0(react-dom@18.2.0)(react@18.2.0)
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
+ rc-util: 5.28.0(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
dev: false
- /rc-field-form@1.27.4(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /rc-field-form@1.27.4(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-PQColQnZimGKArnOh8V2907+VzDCXcqtFvHgevDLtqWc/P7YASb/FqntSmdS8q3VND5SHX3Y1vgMIzY22/f/0Q==}
engines: {node: '>=8.x'}
peerDependencies:
@@ -18963,9 +18963,9 @@ packages:
dependencies:
'@babel/runtime': 7.21.0
async-validator: 4.2.5
- rc-util: 5.28.0(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ rc-util: 5.28.0(react-dom@18.2.0)(react@18.2.0)
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
dev: false
/rc-field-form@1.29.2(react-dom@18.2.0)(react@18.2.0):
@@ -19630,27 +19630,27 @@ packages:
react-dom: 18.2.0(react@18.2.0)
dev: false
- /rc-util@5.28.0(react-dom@18.2.0)(react@18.2.0):
+ /rc-util@5.28.0(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-KYDjhGodswVj29v0TRciKTqRPgumIFvFDndbCD227pitQ+0Cei196rxk+OXb/blu6V8zdTRK5RjCJn+WmHLvBA==}
peerDependencies:
react: '>=16.9.0'
react-dom: '>=16.9.0'
dependencies:
'@babel/runtime': 7.21.0
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
react-is: 16.13.1
dev: false
- /rc-util@5.28.0(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /rc-util@5.28.0(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-KYDjhGodswVj29v0TRciKTqRPgumIFvFDndbCD227pitQ+0Cei196rxk+OXb/blu6V8zdTRK5RjCJn+WmHLvBA==}
peerDependencies:
react: '>=16.9.0'
react-dom: '>=16.9.0'
dependencies:
'@babel/runtime': 7.21.0
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
react-is: 16.13.1
dev: false
@@ -19740,6 +19740,15 @@ packages:
- supports-color
- vue-template-compiler
+ /react-dom@0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530):
+ resolution: {integrity: sha512-rix6VfqhsqW1C72M9m5ANs1hvZC9wpckL3T8oxi9AMjB4IxAjIWBvVfRlScfJIt5L1DBnj1OtO7qUG3JIVf5yw==}
+ peerDependencies:
+ react: 0.0.0-experimental-1cea38448-20230530
+ dependencies:
+ loose-envify: 1.4.0
+ react: 0.0.0-experimental-1cea38448-20230530
+ scheduler: 0.0.0-experimental-1cea38448-20230530
+
/react-dom@17.0.2(react@17.0.2):
resolution: {integrity: sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==}
peerDependencies:
@@ -19750,33 +19759,24 @@ packages:
react: 17.0.2
scheduler: 0.20.2
- /react-dom@18.2.0(react@18.2.0):
+ /react-dom@18.2.0(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
peerDependencies:
react: ^18.2.0
dependencies:
loose-envify: 1.4.0
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
scheduler: 0.23.0
+ dev: false
- /react-dom@18.2.0(react@18.3.0-canary-1cea38448-20230530):
+ /react-dom@18.2.0(react@18.2.0):
resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==}
peerDependencies:
react: ^18.2.0
dependencies:
loose-envify: 1.4.0
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
scheduler: 0.23.0
- dev: false
-
- /react-dom@18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530):
- resolution: {integrity: sha512-rZM2gIE+zUBfWtb8lcUp8cjmX+A5mR7xvkhrjGX+y3hDwMeR3cfmKQInDxKKm98zfIwYUQl+7+GWLKHrAv6iFw==}
- peerDependencies:
- react: 18.3.0-canary-1cea38448-20230530
- dependencies:
- loose-envify: 1.4.0
- react: 18.3.0-canary-1cea38448-20230530
- scheduler: 0.24.0-canary-1cea38448-20230530
/react-error-overlay@6.0.11:
resolution: {integrity: sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==}
@@ -19929,7 +19929,7 @@ packages:
tiny-invariant: 1.3.1
tiny-warning: 1.0.3
- /react-router-dom@6.11.2(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530):
+ /react-router-dom@6.11.2(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-JNbKtAeh1VSJQnH6RvBDNhxNwemRj7KxCzc5jb7zvDSKRnPWIFj9pO+eXqjM69gQJ0r46hSz1x4l9y0651DKWw==}
engines: {node: '>=14'}
peerDependencies:
@@ -19937,12 +19937,12 @@ packages:
react-dom: '>=16.8'
dependencies:
'@remix-run/router': 1.6.2
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
- react-router: 6.11.2(react@18.3.0-canary-1cea38448-20230530)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
+ react-router: 6.11.2(react@0.0.0-experimental-1cea38448-20230530)
dev: false
- /react-router-dom@6.14.2(react-dom@18.2.0)(react@18.2.0):
+ /react-router-dom@6.14.2(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==}
engines: {node: '>=14'}
peerDependencies:
@@ -19950,11 +19950,12 @@ packages:
react-dom: '>=16.8'
dependencies:
'@remix-run/router': 1.7.2
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
- react-router: 6.14.2(react@18.2.0)
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 18.2.0(react@0.0.0-experimental-1cea38448-20230530)
+ react-router: 6.14.2(react@0.0.0-experimental-1cea38448-20230530)
+ dev: false
- /react-router-dom@6.14.2(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530):
+ /react-router-dom@6.14.2(react-dom@18.2.0)(react@18.2.0):
resolution: {integrity: sha512-5pWX0jdKR48XFZBuJqHosX3AAHjRAzygouMTyimnBPOLdY3WjzUSKhus2FVMihUFWzeLebDgr4r8UeQFAct7Bg==}
engines: {node: '>=14'}
peerDependencies:
@@ -19962,10 +19963,9 @@ packages:
react-dom: '>=16.8'
dependencies:
'@remix-run/router': 1.7.2
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.2.0(react@18.3.0-canary-1cea38448-20230530)
- react-router: 6.14.2(react@18.3.0-canary-1cea38448-20230530)
- dev: false
+ react: 18.2.0
+ react-dom: 18.2.0(react@18.2.0)
+ react-router: 6.14.2(react@18.2.0)
/react-router@5.3.4(react@17.0.2):
resolution: {integrity: sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA==}
@@ -19983,35 +19983,35 @@ packages:
tiny-invariant: 1.3.1
tiny-warning: 1.0.3
- /react-router@6.11.2(react@18.3.0-canary-1cea38448-20230530):
+ /react-router@6.11.2(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-74z9xUSaSX07t3LM+pS6Un0T55ibUE/79CzfZpy5wsPDZaea1F8QkrsiyRnA2YQ7LwE/umaydzXZV80iDCPkMg==}
engines: {node: '>=14'}
peerDependencies:
react: '>=16.8'
dependencies:
'@remix-run/router': 1.6.2
- react: 18.3.0-canary-1cea38448-20230530
+ react: 0.0.0-experimental-1cea38448-20230530
- /react-router@6.14.2(react@18.2.0):
+ /react-router@6.14.2(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==}
engines: {node: '>=14'}
peerDependencies:
react: '>=16.8'
dependencies:
'@remix-run/router': 1.7.2
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
+ dev: false
- /react-router@6.14.2(react@18.3.0-canary-1cea38448-20230530):
+ /react-router@6.14.2(react@18.2.0):
resolution: {integrity: sha512-09Zss2dE2z+T1D03IheqAFtK4UzQyX8nFPWx6jkwdYzGLXd5ie06A6ezS2fO6zJfEb/SpG6UocN2O1hfD+2urQ==}
engines: {node: '>=14'}
peerDependencies:
react: '>=16.8'
dependencies:
'@remix-run/router': 1.7.2
- react: 18.3.0-canary-1cea38448-20230530
- dev: false
+ react: 18.2.0
- /react-server-dom-webpack@18.3.0-canary-1cea38448-20230530(react-dom@18.2.0)(react@18.3.0-canary-1cea38448-20230530)(webpack@5.86.0):
+ /react-server-dom-webpack@18.3.0-canary-1cea38448-20230530(react-dom@0.0.0-experimental-1cea38448-20230530)(react@0.0.0-experimental-1cea38448-20230530)(webpack@5.86.0):
resolution: {integrity: sha512-Or28lwdk48LCGqkZ06G9p0LS9gJty5zuDKHs3vaE6dEWkJvXb5mGT7sN7ZbSQVfAQmUk8/ojt+SHdTKfd9BIAw==}
engines: {node: '>=0.10.0'}
peerDependencies:
@@ -20022,12 +20022,11 @@ packages:
acorn-loose: 8.3.0
loose-envify: 1.4.0
neo-async: 2.6.2
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.2.0(react@18.3.0-canary-1cea38448-20230530)
- webpack: 5.86.0(esbuild@0.17.16)
- dev: false
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 0.0.0-experimental-1cea38448-20230530(react@0.0.0-experimental-1cea38448-20230530)
+ webpack: 5.86.0
- /react-server-dom-webpack@18.3.0-canary-1cea38448-20230530(react-dom@18.3.0-canary-1cea38448-20230530)(react@18.3.0-canary-1cea38448-20230530)(webpack@5.86.0):
+ /react-server-dom-webpack@18.3.0-canary-1cea38448-20230530(react-dom@18.2.0)(react@0.0.0-experimental-1cea38448-20230530)(webpack@5.86.0):
resolution: {integrity: sha512-Or28lwdk48LCGqkZ06G9p0LS9gJty5zuDKHs3vaE6dEWkJvXb5mGT7sN7ZbSQVfAQmUk8/ojt+SHdTKfd9BIAw==}
engines: {node: '>=0.10.0'}
peerDependencies:
@@ -20038,9 +20037,10 @@ packages:
acorn-loose: 8.3.0
loose-envify: 1.4.0
neo-async: 2.6.2
- react: 18.3.0-canary-1cea38448-20230530
- react-dom: 18.3.0-canary-1cea38448-20230530(react@18.3.0-canary-1cea38448-20230530)
- webpack: 5.86.0
+ react: 0.0.0-experimental-1cea38448-20230530
+ react-dom: 18.2.0(react@0.0.0-experimental-1cea38448-20230530)
+ webpack: 5.86.0(esbuild@0.17.16)
+ dev: false
/react-textarea-autosize@8.4.0(@types/react@17.0.53)(react@17.0.2):
resolution: {integrity: sha512-YrTFaEHLgJsi8sJVYHBzYn+mkP3prGkmP2DKb/tm0t7CLJY5t1Rxix8070LAKb0wby7bl/lf2EeHkuMihMZMwQ==}
@@ -20070,6 +20070,12 @@ packages:
react-lifecycles-compat: 3.0.4
dev: false
+ /react@0.0.0-experimental-1cea38448-20230530:
+ resolution: {integrity: sha512-a5qJpTcO388t3yffm3lPxEj+RWzAhhgNxhiOOBN9ORKvgzj8ZxOUEiXJ6YsYEbdigQ0JsUmHcBxX2VTGrVRXBQ==}
+ engines: {node: '>=0.10.0'}
+ dependencies:
+ loose-envify: 1.4.0
+
/react@17.0.2:
resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
engines: {node: '>=0.10.0'}
@@ -20083,12 +20089,6 @@ packages:
dependencies:
loose-envify: 1.4.0
- /react@18.3.0-canary-1cea38448-20230530:
- resolution: {integrity: sha512-aFjqzTGk/s2UIhlKYTkjGj3DOCWdv2DyclV9eCc1K5fKRWBGHObjZ4A2Y3T3OglOVnQiySPQUEhZyovTCyWw1w==}
- engines: {node: '>=0.10.0'}
- dependencies:
- loose-envify: 1.4.0
-
/read-cache@1.0.0:
resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
dependencies:
@@ -20724,6 +20724,11 @@ packages:
xmlchars: 2.2.0
dev: true
+ /scheduler@0.0.0-experimental-1cea38448-20230530:
+ resolution: {integrity: sha512-YP/ZE4k2yS87aEqVWk49GbK0bRU9fyqqoQ08JItmsRf6JLsQsqQnLaaXaPo1oOK7E5kuBHfR+rJ1lgFlviQhuA==}
+ dependencies:
+ loose-envify: 1.4.0
+
/scheduler@0.20.2:
resolution: {integrity: sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==}
dependencies:
@@ -20741,11 +20746,6 @@ packages:
dependencies:
loose-envify: 1.4.0
- /scheduler@0.24.0-canary-1cea38448-20230530:
- resolution: {integrity: sha512-vWuG2FA6bawYVyeLHaiIzHtPUhBTuTczM72fLF1HOMwGvzKRniXC1trh14jrXpITtj51Q+9r8ZyhWHx15cUAzQ==}
- dependencies:
- loose-envify: 1.4.0
-
/schema-utils@2.7.0:
resolution: {integrity: sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==}
engines: {node: '>= 8.9.0'}
@@ -21258,20 +21258,20 @@ packages:
/stackframe@1.3.4:
resolution: {integrity: sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==}
- /staged-components@1.1.3(react@18.2.0):
+ /staged-components@1.1.3(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-9EIswzDqjwlEu+ymkV09TTlJfzSbKgEnNteUnZSTxkpMgr5Wx2CzzA9WcMFWBNCldqVPsHVnRGGrApduq2Se5A==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- react: 18.2.0
+ react: 0.0.0-experimental-1cea38448-20230530
dev: false
- /staged-components@1.1.3(react@18.3.0-canary-1cea38448-20230530):
+ /staged-components@1.1.3(react@18.2.0):
resolution: {integrity: sha512-9EIswzDqjwlEu+ymkV09TTlJfzSbKgEnNteUnZSTxkpMgr5Wx2CzzA9WcMFWBNCldqVPsHVnRGGrApduq2Se5A==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
/state-toggle@1.0.3:
@@ -22688,27 +22688,27 @@ packages:
use-isomorphic-layout-effect: 1.1.2(@types/react@17.0.53)(react@17.0.2)
dev: false
- /use-sync-external-store@1.2.0(react@17.0.2):
+ /use-sync-external-store@1.2.0(react@0.0.0-experimental-1cea38448-20230530):
resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- react: 17.0.2
+ react: 0.0.0-experimental-1cea38448-20230530
+ dev: false
- /use-sync-external-store@1.2.0(react@18.2.0):
+ /use-sync-external-store@1.2.0(react@17.0.2):
resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- react: 18.2.0
- dev: false
+ react: 17.0.2
- /use-sync-external-store@1.2.0(react@18.3.0-canary-1cea38448-20230530):
+ /use-sync-external-store@1.2.0(react@18.2.0):
resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0
dependencies:
- react: 18.3.0-canary-1cea38448-20230530
+ react: 18.2.0
dev: false
/util-deprecate@1.0.2:
From 12fbc8bd7d154b879f1fb3461f9466f998c0392a Mon Sep 17 00:00:00 2001
From: Coooder-X <1104143015@qq.com>
Date: Wed, 30 Aug 2023 17:55:51 +0800
Subject: [PATCH 7/8] refactor: remove console.log and clean code
---
examples/rsc-project/src/rscServerRouter.tsx | 158 ++++++++----------
packages/ice/src/esbuild/rscServerRegister.ts | 17 +-
packages/ice/src/service/webpackCompiler.ts | 5 -
.../src/reactFlightWebpackReference.ts | 4 +-
packages/runtime/src/rsc-router.tsx | 20 +--
packages/runtime/src/runClientApp.tsx | 7 -
packages/runtime/src/runServerApp.tsx | 24 +--
7 files changed, 80 insertions(+), 155 deletions(-)
diff --git a/examples/rsc-project/src/rscServerRouter.tsx b/examples/rsc-project/src/rscServerRouter.tsx
index 6c56c525b3..0fc9bdfcd4 100644
--- a/examples/rsc-project/src/rscServerRouter.tsx
+++ b/examples/rsc-project/src/rscServerRouter.tsx
@@ -1,110 +1,84 @@
'use server';
-// import { RouteErrorComponent, WrapRouteComponent, createRouteLoader } from '@ice/runtime';
-// // import { NestedRouteManifest } from "../../../packages/route-manifest/esm";
-// import { StaticRouterProvider, createStaticRouter } from 'react-router-dom/server.mjs';
-// // import { path } from 'ice';
-// // import { App } from '@ice/runtime';
-// import { createServerRoutes } from '@ice/runtime';
-// import { useAppContext } from '@ice/runtime';
-// import React from 'react';
-// import { AppErrorBoundary } from '@ice/runtime';
+import { RouteErrorComponent, WrapRouteComponent, createRouteLoader } from '@ice/runtime';
+import { createStaticRouter } from 'react-router-dom/server.mjs';
+import { createServerRoutes } from '@ice/runtime';
+import { useAppContext } from '@ice/runtime';
+import React from 'react';
+import { AppErrorBoundary } from '@ice/runtime';
import TestClient from './components/testClient';
-// async function generateRoutesDefinition(nestRouteManifest, /* : NestedRouteManifest[] */ renderMode) {
-// const routeDefinitionObj: any[] = [];
-// console.log('generateRoutesDefinition', nestRouteManifest);
+async function generateRoutesDefinition(nestRouteManifest, renderMode) {
+ const routeDefinitionObj: any[] = [];
+ console.log('generateRoutesDefinition', nestRouteManifest);
-// for (const route of nestRouteManifest) {
-// const { children, path: routePath, index, componentName, file, id, layout, exports } = route;
-// console.log('route', route);
-// console.log('id', id);
-// // console.log('file', file, path.extname(file));
-// // const componentPath = id.startsWith('__') ? file : `../../src/pages/${file}`.replace(new RegExp(`${path.extname(file)}$`), '');
-// const componentPath = '../../src/pages/layout';
-// const componentModule = await import('@/pages/layout');
-// console.log('componentModule', componentModule);
+ for (const route of nestRouteManifest) {
+ const { children, path: routePath, index, componentName, file, id, layout, exports } = route;
+ const componentModule = await import('@/pages/layout');
+ console.log('componentModule', componentModule);
-// const currentRouteDefinition = {
-// path: formatPath(routePath || ''),
-// async lazy() {
-// return {
-// ...componentModule,
-// Component: () => WrapRouteComponent({
-// routeId: id,
-// isLayout: layout,
-// routeExports: componentModule,
-// }),
-// loader: createRouteLoader({
-// routeId: id,
-// // requestContext,
-// renderMode,
-// module: componentModule,
-// }),
-// };
-// },
-// errorElement: ,
-// componentName,
-// index,
-// id,
-// exact: true,
-// exports: JSON.stringify(exports),
-// layout,
-// };
+ const currentRouteDefinition = {
+ path: routePath,
+ async lazy() {
+ return {
+ ...componentModule,
+ Component: () => WrapRouteComponent({
+ routeId: id,
+ isLayout: layout,
+ routeExports: componentModule,
+ }),
+ loader: createRouteLoader({
+ routeId: id,
+ renderMode,
+ module: componentModule,
+ }),
+ };
+ },
+ errorElement: ,
+ componentName,
+ index,
+ id,
+ exact: true,
+ exports: JSON.stringify(exports),
+ layout,
+ };
-// if (children) {
-// const res = generateRoutesDefinition(children, renderMode);
-// currentRouteDefinition['children'] = res;
-// }
-// routeDefinitionObj.push(currentRouteDefinition);
-// console.log('after push', routeDefinitionObj);
-// }
+ if (children) {
+ const res = generateRoutesDefinition(children, renderMode);
+ currentRouteDefinition['children'] = res;
+ }
+ routeDefinitionObj.push(currentRouteDefinition);
+ console.log('after push', routeDefinitionObj);
+ }
-// return routeDefinitionObj;
-// }
+ return routeDefinitionObj;
+}
-export default function RscServerRouter() {
- // // 这里的 routes 应该是一个可序列化的对象
- // const { routerContext, routes: routeManifest, requestContext, renderMode } = props;
- // const routes = await generateRoutesDefinition(routeManifest, renderMode);
- // console.log('执行了 client 组件', routerContext, routeManifest);
- // console.log('执行 client')
- // console.log('serverRouter rscRouter', routes);
- // // Server router only be called once.
- // const router = createStaticRouter(createServerRoutes(routes), routerContext);
+export default async function RscServerRouter(props) {
+ // the routes object here need to be a sierilazable object
+ const { routerContext, routes: routeManifest, requestContext, renderMode } = props;
+ const routes = await generateRoutesDefinition(routeManifest, renderMode);
+ // Server router only be called once.
+ const router = createStaticRouter(createServerRoutes(routes), routerContext);
return (
<>
Server component: rscServerRouter
- // <>
- // {/* */}
- // {/* */}
- //
);
}
-// export default RscServerRouter;
-
-// function formatPath(pathStr) {
-// return pathStr; // process.platform === 'win32' ? pathStr.split(path.sep).join('/') :
-// }
-
-// function App({ children }) {
-// const { appConfig } = useAppContext();
-// const { strict, errorBoundary } = appConfig.app;
-// const StrictMode = strict ? React.StrictMode : React.Fragment;
-// const ErrorBoundary = errorBoundary ? AppErrorBoundary : React.Fragment;
+function App({ children }) {
+ const { appConfig } = useAppContext();
+ const { strict, errorBoundary } = appConfig.app;
+ const StrictMode = strict ? React.StrictMode : React.Fragment;
+ const ErrorBoundary = errorBoundary ? AppErrorBoundary : React.Fragment;
-// return (
-//
-//
-// {children}
-//
-//
-// );
-// }
\ No newline at end of file
+ return (
+
+
+ {children}
+
+
+ );
+}
\ No newline at end of file
diff --git a/packages/ice/src/esbuild/rscServerRegister.ts b/packages/ice/src/esbuild/rscServerRegister.ts
index c5f886d440..5c3a0091f4 100644
--- a/packages/ice/src/esbuild/rscServerRegister.ts
+++ b/packages/ice/src/esbuild/rscServerRegister.ts
@@ -5,24 +5,21 @@ import { Parser } from 'acorn';
import jsx from 'acorn-jsx';
import recast from 'recast';
-// TODO：整理代码
const rscServerRegister = (): Plugin => {
return {
name: 'rsc-server-register',
setup: async (build: PluginBuild) => {
- build.onLoad({ filter: /\/src\/.*\.(js|ts|jsx|tsx)$/ }, async (args) => { // /src\/.*\
+ build.onLoad({ filter: /\/src\/.*\.(js|ts|jsx|tsx)$/ }, async (args) => {
const { path } = args;
const loader = path.endsWith('.tsx') || path.endsWith('.ts') ? 'tsx' : 'jsx';
const content = await fs.promises.readFile(path, 'utf-8');
if (path.indexOf('routes-config') > 0) {
- console.log('path.indexOf(\'routes-config\') > 0');
return { contents: content, loader };
}
if (path.indexOf('/src/') === -1) {
return { contents: content, loader };
}
- console.log('rsc 编译', path, content.indexOf('use client'), content.indexOf('use server'));
if (content.indexOf('use client') === -1 && content.indexOf('use server') === -1) {
return { contents: content, loader };
@@ -36,7 +33,6 @@ const rscServerRegister = (): Plugin => {
}) as any).body;
} catch (x) {
console.error('Error parsing %s %s %s', url, x.message, path);
- console.log(content);
return { contents: content, loader };
}
@@ -82,9 +78,9 @@ const rscServerRegister = (): Plugin => {
ecmaVersion: 2024,
sourceType: 'module',
}) as any).body;
- for (let i = 0; i < body.length; i++) { // TODO：编译后的的代码其实是不完整的，忽略了有一些全局定义的变量的情况
+ for (let i = 0; i < body.length; i++) {
const node = body[i];
- if (node.type === 'ImportDeclaration') { // TODO: 如果是 import 语句的情况
+ if (node.type === 'ImportDeclaration') {
const { start, end } = node;
source += content.substring(start, end);
} else if (node.type === 'ExportNamedDeclaration' || node.type === 'ExportDefaultDeclaration') {
@@ -103,15 +99,11 @@ const rscServerRegister = (): Plugin => {
export default comp;
`;
}
- } else { // TODO: 不是 function 类型的导出的情况
- //
}
}
}
- console.log('服务端组件编译结果', source);
}
- source += ';console.log(\'------------==============---------\');';
source = source.replace(/^(\'|\")use (client|server)(\';|\'|\";|\")/, '');
return { contents: source, loader };
});
@@ -127,7 +119,7 @@ const rscServerRegister = (): Plugin => {
};
};
-function transformContent(moduleId: string) { // TODO: 还没处理 import 语句的情况，待加入
+function transformContent(moduleId: string) {
let content = '';
if (moduleId.indexOf('/pages') !== -1) {
content = `\
@@ -138,7 +130,6 @@ function transformContent(moduleId: string) { // TODO: 还没处理 import 语
const comp = createClientModuleProxy('${moduleId}');
export default comp`;
}
- console.log('客户端组件编译结果', content);
return content;
}
diff --git a/packages/ice/src/service/webpackCompiler.ts b/packages/ice/src/service/webpackCompiler.ts
index c3698656a3..e12bd07cf3 100644
--- a/packages/ice/src/service/webpackCompiler.ts
+++ b/packages/ice/src/service/webpackCompiler.ts
@@ -68,8 +68,6 @@ async function webpackCompiler(options: {
if (useDevServer) {
const outputDir = webpackConfig.output.path;
- console.log('output dir', outputDir);
-
if (command === 'start' && serverRunner) {
// Add server runner plugin
webpackConfig.plugins.push(new ServerRunnerPlugin(
@@ -92,7 +90,6 @@ async function webpackCompiler(options: {
webpackConfig.plugins.push(serverCompilerPlugin);
if (userConfig.rsc) {
- console.log('rsc plugin');
webpackConfig.plugins.push(new ReactServerWebpackPlugin({
isServer: false,
clientReferences: [{
@@ -102,8 +99,6 @@ async function webpackCompiler(options: {
exclude: /types.ts|.d.ts/,
}],
clientManifestFilename: 'rsc-client-manifest.json',
- // clientManifestFilename: `${rootDir}/rsc-folder/rsc-client-manifest.json`,
- // ssrManifestFilename: `$react-ssr-manifest.json`,
}));
}
}
diff --git a/packages/runtime/src/reactFlightWebpackReference.ts b/packages/runtime/src/reactFlightWebpackReference.ts
index 691edbc033..c2a0218ce2 100644
--- a/packages/runtime/src/reactFlightWebpackReference.ts
+++ b/packages/runtime/src/reactFlightWebpackReference.ts
@@ -12,7 +12,6 @@ const SERVER_REFERENCE = Symbol.for('react.server.reference');
const PROMISE_PROTOTYPE = Promise.prototype;
const FunctionBind = Function.prototype.bind;
-// $FlowFixMe[method-unbinding]
const ArraySlice = Array.prototype.slice;
function bind(ctx) {
const newFn = FunctionBind.apply(ctx, arguments);
@@ -221,6 +220,5 @@ export function createClientModuleProxy(moduleId: string) {
},
);
const pxy = new Proxy(clientReference, proxyHandlers);
- console.log('proxy', pxy);
- return pxy; // new Proxy(clientReference, proxyHandlers)
+ return pxy;
}
diff --git a/packages/runtime/src/rsc-router.tsx b/packages/runtime/src/rsc-router.tsx
index 339ce0d304..4169519707 100644
--- a/packages/runtime/src/rsc-router.tsx
+++ b/packages/runtime/src/rsc-router.tsx
@@ -20,19 +20,18 @@ const initialCache = new Map();
export function RSCRouter(): React.ReactElement {
const [cache, setCache] = useState(initialCache);
- // const [location, setLocation] = useState({
- // param: 'param'
- // });
+ const [location, setLocation] = useState({
+ param: '',
+ });
const locationKey = JSON.stringify(location);
let content = cache.get(locationKey);
if (!content) {
console.log('createFromFetch');
content = createFromFetch(
- // fetch('/app?location=' + encodeURIComponent(locationKey))
fetch('/rsc'),
);
- // cache.set(locationKey, content);
+ cache.set(locationKey, content);
}
function refresh(response) {
@@ -51,17 +50,16 @@ export function RSCRouter(): React.ReactElement {
function navigate(nextLocation) {
startTransition(() => {
- // setLocation(loc => ({
- // ...loc,
- // ...nextLocation
- // }));
+ setLocation(loc => ({
+ ...loc,
+ ...nextLocation,
+ }));
});
}
const [finalContent, setFinalContent] = useState(null);
useEffect(() => {
content.then((res: any) => {
- console.log('content res', res);
setFinalContent(res);
}, (e): any => {
console.error(e);
@@ -74,7 +72,6 @@ export function RSCRouter(): React.ReactElement {
123
loading...}>
{finalContent}
- {/* {use(content)} */}
@@ -91,7 +88,6 @@ export function useMutation({ endpoint, method }) {
const [didError, setDidError] = useState(false);
const [error, setError] = useState(null);
if (didError) {
- // Let the nearest error boundary handle errors while saving.
throw error;
}
diff --git a/packages/runtime/src/runClientApp.tsx b/packages/runtime/src/runClientApp.tsx
index f591e44fe3..d1b4d5b0dd 100644
--- a/packages/runtime/src/runClientApp.tsx
+++ b/packages/runtime/src/runClientApp.tsx
@@ -48,8 +48,6 @@ export default async function runClientApp(options: RunClientAppOptions) {
dataLoaderDecorator,
} = options;
- console.log('rsc: ', rsc);
-
const windowContext: WindowContext = (window as any).__ICE_APP_CONTEXT__ || {};
const assetsManifest: AssetsManifest = (window as any).__ICE_ASSETS_MANIFEST__ || {};
let {
@@ -196,11 +194,6 @@ async function render({ history, runtime, needHydrate, useRsc }: RenderOptions)
root,
useRsc
?
- //
- //
- //
- //
- //
:
((resolve, reject) => {
if (renderOptions.useRsc) {
- console.log('render RSC and sendResponse');
pipe(res);
- // sendResponse(req, res, result);
resolve();
return;
}
@@ -311,22 +309,7 @@ async function doRender(serverContext: ServerContext, renderOptions: RenderOptio
const matches = matchRoutes(routes, location, finalBasename);
const routePath = getCurrentRoutePath(matches);
- console.log('server use RSC', useRsc);
if (useRsc && location.pathname === '/rsc') {
- // const routeModules = await loadRouteModules(matches.map(({ route: { id, lazy } }) => ({ id, lazy })));
- // const loaderData = {};
- // for (const routeId in routeModules) {
- // const { loader } = routeModules[routeId];
- // if (loader) {
- // const { data, pageConfig } = await loader();
- // loaderData[routeId] = {
- // data,
- // pageConfig,
- // };
- // }
- // }
- // const revalidate = renderMode === 'SSG' && needRevalidate(matches);
- // runtime.setAppContext({ ...appContext, revalidate, routeModules, loaderData, routePath, matches, appData });
return renderRsc(requestContext, routeManifest, {
runtime,
matches,
@@ -546,11 +529,8 @@ function renderDocument(options: RenderDocumentOptions): Response {
};
}
-// 函数位置可能要改
export function renderReactTree(ReactServerApp, props): Response { // props 是根 RSC 组件的 props
- // await waitForWebpack();
const { rscManifest } = props;
- console.log('rscManifest', rscManifest);
const App = React.createElement(ReactServerApp, null, null);
const { pipe, abort } = ReactServerDomWebpack.renderToPipeableStream(
App,
@@ -567,7 +547,7 @@ export function renderReactTree(ReactServerApp, props): Response { // props 是
/**
* Render and send the result to ServerResponse.
*/
-export async function renderRsc( // renderToRscFlow
+export async function renderRsc(
requestContext,
routeManifest,
{
@@ -578,7 +558,6 @@ export async function renderRsc( // renderToRscFlow
}: RenderServerEntry,
) {
const appContext = runtime.getAppContext();
- // console.log('appconfig', appContext.routes)
const { routes, routePath, loaderData, basename } = appContext;
const AppRuntimeProvider = runtime.composeAppProvider() || React.Fragment;
const AppRouter = runtime.getAppRouter();
@@ -602,7 +581,6 @@ export async function renderRsc( // renderToRscFlow
const ReactServerApp = () => {
return (
From b7fae49318fcf3866fda34680d16f9596513dbd5 Mon Sep 17 00:00:00 2001
From: Coooder-X <1104143015@qq.com>
Date: Wed, 30 Aug 2023 18:11:11 +0800
Subject: [PATCH 8/8] refactor: clean code
---
examples/rsc-project/src/app.tsx | 4 ---
examples/rsc-project/src/pages/about.tsx | 14 ----------
examples/rsc-project/src/pages/blog.tsx | 11 +-------
examples/rsc-project/src/pages/index.tsx | 27 +-------------------
examples/rsc-project/src/pages/layout.tsx | 10 --------
examples/rsc-project/src/rscServerRouter.tsx | 2 +-
6 files changed, 3 insertions(+), 65 deletions(-)
diff --git a/examples/rsc-project/src/app.tsx b/examples/rsc-project/src/app.tsx
index 0e9c5bd612..ad49ee1aba 100644
--- a/examples/rsc-project/src/app.tsx
+++ b/examples/rsc-project/src/app.tsx
@@ -1,10 +1,6 @@
import { defineAppConfig } from 'ice';
import { defineAuthConfig } from '@ice/plugin-auth/types';
-console.log('__LOG__');
-console.warn('__WARN__');
-// console.error('__ERROR__');
-
export const authConfig = defineAuthConfig(() => {
return {
initialAuth: {
diff --git a/examples/rsc-project/src/pages/about.tsx b/examples/rsc-project/src/pages/about.tsx
index d14c62fe78..86bbd01108 100644
--- a/examples/rsc-project/src/pages/about.tsx
+++ b/examples/rsc-project/src/pages/about.tsx
@@ -1,11 +1,6 @@
// @ts-expect-error
import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
import url from './ice.png';
-import Blog from './blog';
-
-// interface Data {
-// name: string;
-// }
export default function About() {
const data = useData();
@@ -44,12 +39,3 @@ export const pageConfig = definePageConfig(() => {
};
});
-// export const dataLoader = defineDataLoader(() => {
-// return new Promise((resolve) => {
-// setTimeout(() => {
-// resolve({
-// name: 'About',
-// });
-// }, 1 * 100);
-// });
-// });
diff --git a/examples/rsc-project/src/pages/blog.tsx b/examples/rsc-project/src/pages/blog.tsx
index 6f0c905925..c1bd0c5d76 100644
--- a/examples/rsc-project/src/pages/blog.tsx
+++ b/examples/rsc-project/src/pages/blog.tsx
@@ -1,16 +1,7 @@
-import { Link, useData, useConfig, definePageConfig } from 'ice';
+import { Link, definePageConfig } from 'ice';
-// interface Data {
-// name: string;
-// }
export default function Blog() {
- // const data = useData();
- // const data = useData();
- // const config = useConfig();
-
- // console.log('render Blog', 'data', data, 'config', config);
-
return (
<>
Blog Page
diff --git a/examples/rsc-project/src/pages/index.tsx b/examples/rsc-project/src/pages/index.tsx
index e7725417c6..09ed93c78b 100644
--- a/examples/rsc-project/src/pages/index.tsx
+++ b/examples/rsc-project/src/pages/index.tsx
@@ -2,29 +2,13 @@ import { Suspense } from 'react';
import { Link, useData, useConfig, definePageConfig, defineDataLoader } from 'ice';
// Not recommended but works.
import styles from './index.module.css';
-// import { Button } from 'antd-mobile';
-
-// const Bar = lazy(() => import('../components/bar'));
export default function Home() {
- // console.log('render Home', props);
-
- // const appContext = useAppContext();
- // console.log('get AppContext', appContext);
-
- const data = useData();
- const config = useConfig();
-
- console.log('render Home', 'data', data, 'config', config);
-
return (
<>
Home Page
about
- hello}>
- {/* */}
- {/* */}
-
+ hello} />
);
}
@@ -46,12 +30,3 @@ export const pageConfig = definePageConfig(() => {
};
});
-// export const dataLoader = defineDataLoader(() => {
-// return new Promise((resolve) => {
-// setTimeout(() => {
-// resolve({
-// name: 'Home',
-// });
-// }, 1 * 100);
-// });
-// });
diff --git a/examples/rsc-project/src/pages/layout.tsx b/examples/rsc-project/src/pages/layout.tsx
index 917d58bf8b..b8ef906be9 100644
--- a/examples/rsc-project/src/pages/layout.tsx
+++ b/examples/rsc-project/src/pages/layout.tsx
@@ -26,13 +26,3 @@ export const pageConfig = definePageConfig(() => {
auth: ['admin'],
};
});
-
-// export const dataLoader = defineDataLoader(() => {
-// return new Promise((resolve) => {
-// setTimeout(() => {
-// resolve({
-// layout: true,
-// });
-// }, 1 * 100);
-// });
-// });
diff --git a/examples/rsc-project/src/rscServerRouter.tsx b/examples/rsc-project/src/rscServerRouter.tsx
index 0fc9bdfcd4..9ba5b4ea7e 100644
--- a/examples/rsc-project/src/rscServerRouter.tsx
+++ b/examples/rsc-project/src/rscServerRouter.tsx
@@ -1,4 +1,4 @@
-'use server';
+'use client';
import { RouteErrorComponent, WrapRouteComponent, createRouteLoader } from '@ice/runtime';
import { createStaticRouter } from 'react-router-dom/server.mjs';
import { createServerRoutes } from '@ice/runtime';