From 5e78e55949faa5d9543ba20430a7bf749406645c Mon Sep 17 00:00:00 2001 From: chenwenjie Date: Mon, 6 Nov 2023 14:42:58 +0800 Subject: [PATCH 1/4] feat(devtools): merge mountpoint into client package --- .../src => client/exports}/.eslintrc.js | 4 + packages/devtools/client/exports/mount.mjs | 45 ++++++++ packages/devtools/client/modern.config.ts | 23 +++- packages/devtools/client/package.json | 6 + .../plugins}/radix-token-transformer.js | 0 .../components/Breadcrumbs.module.scss | 0 .../{ => client}/components/Breadcrumbs.tsx | 0 .../src/{ => client}/components/Link.tsx | 0 .../src/{ => client}/components/NavLink.tsx | 0 .../components/ObjectInspector.module.scss | 0 .../components/ObjectInspector.tsx | 0 .../{ => client}/components/SelectLink.tsx | 0 .../components/ServerRoute/Base.module.scss | 0 .../components/ServerRoute/Base.tsx | 0 .../components/ServerRoute/Context.tsx | 0 .../ClientRoute/LegacyRoute/Stats.tsx | 0 .../ClientRoute/RemixRoute/Context.ts | 0 .../ClientRoute/RemixRoute/Route.module.scss | 0 .../ClientRoute/RemixRoute/Route.tsx | 0 .../ClientRoute/RemixRoute/Stats.tsx | 0 .../EntryRoute/ClientRoute/Stats.tsx | 2 +- .../EntryRoute/ClientRoute/index.ts | 0 .../ServerRoute/EntryRoute/Route.tsx | 0 .../ServerRoute/EntryRoute/Stats.module.scss | 0 .../ServerRoute/EntryRoute/Stats.tsx | 2 +- .../ServerRoute/EntryRoute/index.ts | 0 .../components/ServerRoute/Route.tsx | 0 .../components/ServerRoute/Unknown.tsx | 0 .../src/{ => client}/components/Theme.tsx | 0 .../client/src/{ => client}/constants.tsx | 0 .../config/[toolkit].[type]/page.loader.ts | 0 .../routes/config/[toolkit].[type]/page.tsx | 4 +- .../routes/config/layout.config.tsx | 0 .../routes/config/layout.module.scss | 0 .../src/{ => client}/routes/config/layout.tsx | 0 .../{ => client}/routes/config/page.loader.ts | 0 .../src/{ => client}/routes/config/page.tsx | 0 .../routes/context/builder/page.tsx | 4 +- .../routes/context/framework/page.tsx | 4 +- .../routes/context/layout.config.tsx | 2 +- .../{ => client}/routes/context/layout.tsx | 0 .../routes/context/page.loader.ts | 0 .../src/{ => client}/routes/context/page.tsx | 0 .../src/{ => client}/routes/layout.config.tsx | 0 .../{ => client}/routes/layout.module.scss | 2 +- .../client/src/{ => client}/routes/layout.tsx | 16 ++- .../{ => client}/routes/overview/heading.svg | 0 .../routes/overview/layout.config.tsx | 0 .../routes/overview/page.module.scss | 0 .../src/{ => client}/routes/overview/page.tsx | 2 +- .../src/{ => client}/routes/page.loader.ts | 0 .../client/src/{ => client}/routes/page.tsx | 0 .../routes/pages/layout.config.ts | 0 .../routes/pages/layout.module.scss | 0 .../src/{ => client}/routes/pages/layout.tsx | 0 .../routes/pages/page.module.scss | 0 .../src/{ => client}/routes/pages/page.tsx | 6 +- .../client/src/{ => client}/rpc/index.ts | 2 +- .../client/src/{ => client}/stores/index.tsx | 8 +- .../src/{ => client}/styles/breakpoints.scss | 0 .../client/src/{ => client}/styles/theme.scss | 2 +- .../client/src/{ => client}/types/index.ts | 0 .../client/src/{ => client}/utils/context.tsx | 0 .../client/src/{ => client}/utils/hooks.ts | 0 .../client/src/{ => client}/utils/index.ts | 0 .../devtools/client/src/modern-app-env.d.ts | 2 + .../components/Devtools/Action.module.scss | 0 .../src/mount}/components/Devtools/Action.tsx | 12 +- .../components/Devtools/FrameBox.module.scss | 0 .../mount}/components/Devtools/FrameBox.tsx | 0 .../mount}/components/Devtools/heading.svg | 0 .../src/mount}/components/Devtools/xmark.svg | 0 .../src/mount}/components/LoadingIcon.tsx | 0 .../src/mount}/components/Portal.tsx | 0 .../src/mount}/components/Visible.tsx | 0 packages/devtools/client/src/mount/index.tsx | 7 ++ .../src => client/src/mount}/types.d.ts | 0 .../src/mount}/utils/draggable.ts | 0 .../devtools/client/src/routes/layout.css | 3 - packages/devtools/client/tsconfig.json | 2 +- packages/devtools/kit/src/mount-point.ts | 3 + packages/devtools/mount/.browserslistrc | 5 - packages/devtools/mount/.eslintrc.js | 4 - packages/devtools/mount/CHANGELOG.md | 67 ----------- packages/devtools/mount/README.md | 37 ------- packages/devtools/mount/modern.config.ts | 68 ------------ packages/devtools/mount/package.json | 50 --------- packages/devtools/mount/src/index.tsx | 1 - .../devtools/mount/src/modern-app-env.d.ts | 3 - packages/devtools/mount/src/mount.tsx | 37 ------- packages/devtools/mount/tsconfig.json | 13 --- packages/devtools/plugin/package.json | 1 - packages/devtools/plugin/src/cli.ts | 11 +- packages/devtools/plugin/src/runtime.ts | 12 -- pnpm-lock.yaml | 104 +----------------- 95 files changed, 132 insertions(+), 444 deletions(-) rename packages/devtools/{mount/src => client/exports}/.eslintrc.js (71%) create mode 100644 packages/devtools/client/exports/mount.mjs rename packages/devtools/{mount/plugin => client/plugins}/radix-token-transformer.js (100%) rename packages/devtools/client/src/{ => client}/components/Breadcrumbs.module.scss (100%) rename packages/devtools/client/src/{ => client}/components/Breadcrumbs.tsx (100%) rename packages/devtools/client/src/{ => client}/components/Link.tsx (100%) rename packages/devtools/client/src/{ => client}/components/NavLink.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ObjectInspector.module.scss (100%) rename packages/devtools/client/src/{ => client}/components/ObjectInspector.tsx (100%) rename packages/devtools/client/src/{ => client}/components/SelectLink.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/Base.module.scss (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/Base.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/Context.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/LegacyRoute/Stats.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Context.ts (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.module.scss (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Stats.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx (96%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/ClientRoute/index.ts (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/Route.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/Stats.module.scss (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/Stats.tsx (95%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/EntryRoute/index.ts (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/Route.tsx (100%) rename packages/devtools/client/src/{ => client}/components/ServerRoute/Unknown.tsx (100%) rename packages/devtools/client/src/{ => client}/components/Theme.tsx (100%) rename packages/devtools/client/src/{ => client}/constants.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/config/[toolkit].[type]/page.loader.ts (100%) rename packages/devtools/client/src/{ => client}/routes/config/[toolkit].[type]/page.tsx (80%) rename packages/devtools/client/src/{ => client}/routes/config/layout.config.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/config/layout.module.scss (100%) rename packages/devtools/client/src/{ => client}/routes/config/layout.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/config/page.loader.ts (100%) rename packages/devtools/client/src/{ => client}/routes/config/page.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/context/builder/page.tsx (70%) rename packages/devtools/client/src/{ => client}/routes/context/framework/page.tsx (70%) rename packages/devtools/client/src/{ => client}/routes/context/layout.config.tsx (82%) rename packages/devtools/client/src/{ => client}/routes/context/layout.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/context/page.loader.ts (100%) rename packages/devtools/client/src/{ => client}/routes/context/page.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/layout.config.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/layout.module.scss (97%) rename packages/devtools/client/src/{ => client}/routes/layout.tsx (86%) rename packages/devtools/client/src/{ => client}/routes/overview/heading.svg (100%) rename packages/devtools/client/src/{ => client}/routes/overview/layout.config.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/overview/page.module.scss (100%) rename packages/devtools/client/src/{ => client}/routes/overview/page.tsx (99%) rename packages/devtools/client/src/{ => client}/routes/page.loader.ts (100%) rename packages/devtools/client/src/{ => client}/routes/page.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/pages/layout.config.ts (100%) rename packages/devtools/client/src/{ => client}/routes/pages/layout.module.scss (100%) rename packages/devtools/client/src/{ => client}/routes/pages/layout.tsx (100%) rename packages/devtools/client/src/{ => client}/routes/pages/page.module.scss (100%) rename packages/devtools/client/src/{ => client}/routes/pages/page.tsx (92%) rename packages/devtools/client/src/{ => client}/rpc/index.ts (95%) rename packages/devtools/client/src/{ => client}/stores/index.tsx (95%) rename packages/devtools/client/src/{ => client}/styles/breakpoints.scss (100%) rename packages/devtools/client/src/{ => client}/styles/theme.scss (98%) rename packages/devtools/client/src/{ => client}/types/index.ts (100%) rename packages/devtools/client/src/{ => client}/utils/context.tsx (100%) rename packages/devtools/client/src/{ => client}/utils/hooks.ts (100%) rename packages/devtools/client/src/{ => client}/utils/index.ts (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/Action.module.scss (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/Action.tsx (88%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/FrameBox.module.scss (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/FrameBox.tsx (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/heading.svg (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Devtools/xmark.svg (100%) rename packages/devtools/{mount/src => client/src/mount}/components/LoadingIcon.tsx (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Portal.tsx (100%) rename packages/devtools/{mount/src => client/src/mount}/components/Visible.tsx (100%) create mode 100644 packages/devtools/client/src/mount/index.tsx rename packages/devtools/{mount/src => client/src/mount}/types.d.ts (100%) rename packages/devtools/{mount/src => client/src/mount}/utils/draggable.ts (100%) delete mode 100644 packages/devtools/client/src/routes/layout.css delete mode 100644 packages/devtools/mount/.browserslistrc delete mode 100644 packages/devtools/mount/.eslintrc.js delete mode 100644 packages/devtools/mount/CHANGELOG.md delete mode 100644 packages/devtools/mount/README.md delete mode 100644 packages/devtools/mount/modern.config.ts delete mode 100644 packages/devtools/mount/package.json delete mode 100644 packages/devtools/mount/src/index.tsx delete mode 100644 packages/devtools/mount/src/modern-app-env.d.ts delete mode 100644 packages/devtools/mount/src/mount.tsx delete mode 100644 packages/devtools/mount/tsconfig.json delete mode 100644 packages/devtools/plugin/src/runtime.ts diff --git a/packages/devtools/mount/src/.eslintrc.js b/packages/devtools/client/exports/.eslintrc.js similarity index 71% rename from packages/devtools/mount/src/.eslintrc.js rename to packages/devtools/client/exports/.eslintrc.js index fafc00323057..4a96c063fb6f 100644 --- a/packages/devtools/mount/src/.eslintrc.js +++ b/packages/devtools/client/exports/.eslintrc.js @@ -1,3 +1,4 @@ +/** @type {import('eslint').Linter.Config} */ // eslint-disable-next-line import/no-commonjs module.exports = { root: true, @@ -6,4 +7,7 @@ module.exports = { tsconfigRootDir: __dirname, project: ['../tsconfig.json'], }, + rules: { + curly: 'off', + }, }; diff --git a/packages/devtools/client/exports/mount.mjs b/packages/devtools/client/exports/mount.mjs new file mode 100644 index 000000000000..f32dc0ab1546 --- /dev/null +++ b/packages/devtools/client/exports/mount.mjs @@ -0,0 +1,45 @@ +import { parseQuery } from 'ufo'; +import routesManifest from '../dist/routes-manifest.json'; + +/** + * @param {import('@modern-js/devtools-kit').SetupClientOptions} options + */ +const mountDevTools = options => { + const container = document.createElement('div'); + container.className = '_modern_js_devtools_container'; + document.body.appendChild(container); + + const shadow = container.attachShadow({ mode: 'closed' }); + + for (const asset of routesManifest.routeAssets.mount.assets) { + if (asset.endsWith('.js')) { + const el = document.createElement('script'); + el.src = asset; + shadow.appendChild(el); + } else if (asset.endsWith('.css')) { + const el = document.createElement('link'); + el.href = asset; + el.rel = 'stylesheet'; + shadow.appendChild(el); + } + } + + const app = document.createElement('div'); + app.className = '_modern_js_devtools_mountpoint theme-register'; + const appGlobalExport = `_modern_js_devtools_app`; + window[appGlobalExport] = { + container: app, + options, + }; + shadow.appendChild(app); +}; + +try { + // eslint-disable-next-line no-undef + const opts = parseQuery(__resourceQuery); + mountDevTools(opts); +} catch (err) { + const e = new Error('Failed to execute mount point of DevTools.'); + e.cause = err; + console.error(e); +} diff --git a/packages/devtools/client/modern.config.ts b/packages/devtools/client/modern.config.ts index 93e0d16523bd..fad9187a6164 100644 --- a/packages/devtools/client/modern.config.ts +++ b/packages/devtools/client/modern.config.ts @@ -1,6 +1,6 @@ import { appTools, defineConfig } from '@modern-js/app-tools'; import { ROUTE_BASENAME } from '@modern-js/devtools-kit'; -import { version } from './package.json'; +import packageMeta from './package.json'; // https://modernjs.dev/en/configure/app/usage export default defineConfig<'rspack'>({ @@ -14,12 +14,21 @@ export default defineConfig<'rspack'>({ port: 8780, }, source: { + mainEntryName: 'client', + entries: { + mount: { + entry: './src/mount/index.tsx', + disableMount: true, + }, + }, preEntry: [ require.resolve('modern-normalize/modern-normalize.css'), - './src/styles/theme.scss', + require.resolve('@radix-ui/themes/styles.css'), ], globalVars: { - 'process.env.PKG_VERSION': version, + 'process.env.VERSION': packageMeta.version, + 'process.env.PKG_VERSION': packageMeta.version, + 'process.env.DEVTOOLS_MARK': 'friw89', }, }, output: { @@ -29,6 +38,14 @@ export default defineConfig<'rspack'>({ postcss: (config, { addPlugins }) => { addPlugins(require('postcss-custom-media')); }, + bundlerChain(chain) { + chain.module + .rule('RADIX_TOKEN') + .test(/\/@radix-ui\/themes\/styles\.css/) + .use('RADIX_TOKEN') + .loader('./plugins/radix-token-transformer.js') + .options({ root: '.theme-register' }); + }, }, plugins: [appTools({ bundler: 'experimental-rspack' })], }); diff --git a/packages/devtools/client/package.json b/packages/devtools/client/package.json index ab207855fb41..16bf48ba2a7e 100644 --- a/packages/devtools/client/package.json +++ b/packages/devtools/client/package.json @@ -17,6 +17,12 @@ "files": [ "dist" ], + "main": "./dist/html/client/index.html", + "exports": { + ".": "./dist/html/client/index.html", + "./mount": "./exports/mount.mjs", + "./package.json": "./package.json" + }, "dependencies": {}, "devDependencies": { "@modern-js-app/eslint-config": "workspace:*", diff --git a/packages/devtools/mount/plugin/radix-token-transformer.js b/packages/devtools/client/plugins/radix-token-transformer.js similarity index 100% rename from packages/devtools/mount/plugin/radix-token-transformer.js rename to packages/devtools/client/plugins/radix-token-transformer.js diff --git a/packages/devtools/client/src/components/Breadcrumbs.module.scss b/packages/devtools/client/src/client/components/Breadcrumbs.module.scss similarity index 100% rename from packages/devtools/client/src/components/Breadcrumbs.module.scss rename to packages/devtools/client/src/client/components/Breadcrumbs.module.scss diff --git a/packages/devtools/client/src/components/Breadcrumbs.tsx b/packages/devtools/client/src/client/components/Breadcrumbs.tsx similarity index 100% rename from packages/devtools/client/src/components/Breadcrumbs.tsx rename to packages/devtools/client/src/client/components/Breadcrumbs.tsx diff --git a/packages/devtools/client/src/components/Link.tsx b/packages/devtools/client/src/client/components/Link.tsx similarity index 100% rename from packages/devtools/client/src/components/Link.tsx rename to packages/devtools/client/src/client/components/Link.tsx diff --git a/packages/devtools/client/src/components/NavLink.tsx b/packages/devtools/client/src/client/components/NavLink.tsx similarity index 100% rename from packages/devtools/client/src/components/NavLink.tsx rename to packages/devtools/client/src/client/components/NavLink.tsx diff --git a/packages/devtools/client/src/components/ObjectInspector.module.scss b/packages/devtools/client/src/client/components/ObjectInspector.module.scss similarity index 100% rename from packages/devtools/client/src/components/ObjectInspector.module.scss rename to packages/devtools/client/src/client/components/ObjectInspector.module.scss diff --git a/packages/devtools/client/src/components/ObjectInspector.tsx b/packages/devtools/client/src/client/components/ObjectInspector.tsx similarity index 100% rename from packages/devtools/client/src/components/ObjectInspector.tsx rename to packages/devtools/client/src/client/components/ObjectInspector.tsx diff --git a/packages/devtools/client/src/components/SelectLink.tsx b/packages/devtools/client/src/client/components/SelectLink.tsx similarity index 100% rename from packages/devtools/client/src/components/SelectLink.tsx rename to packages/devtools/client/src/client/components/SelectLink.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/Base.module.scss b/packages/devtools/client/src/client/components/ServerRoute/Base.module.scss similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/Base.module.scss rename to packages/devtools/client/src/client/components/ServerRoute/Base.module.scss diff --git a/packages/devtools/client/src/components/ServerRoute/Base.tsx b/packages/devtools/client/src/client/components/ServerRoute/Base.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/Base.tsx rename to packages/devtools/client/src/client/components/ServerRoute/Base.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/Context.tsx b/packages/devtools/client/src/client/components/ServerRoute/Context.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/Context.tsx rename to packages/devtools/client/src/client/components/ServerRoute/Context.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/LegacyRoute/Stats.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/LegacyRoute/Stats.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/LegacyRoute/Stats.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/LegacyRoute/Stats.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Context.ts b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Context.ts similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Context.ts rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Context.ts diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.module.scss b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.module.scss similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.module.scss rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.module.scss diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Route.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Stats.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Stats.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Stats.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/RemixRoute/Stats.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx similarity index 96% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx index 6842fb5119d9..26a00d34c25b 100644 --- a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx +++ b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/Stats.tsx @@ -5,7 +5,7 @@ import React from 'react'; import { useSnapshot } from 'valtio'; import { LegacyRouteStats } from './LegacyRoute/Stats'; import { RemixRouteStats } from './RemixRoute/Stats'; -import { useStore } from '@/stores'; +import { useStore } from '@/client/stores'; export interface ClientRouteStatsProps { route: ServerRoute; diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/index.ts b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/index.ts similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/ClientRoute/index.ts rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/ClientRoute/index.ts diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/Route.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Route.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/Route.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Route.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/Stats.module.scss b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Stats.module.scss similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/Stats.module.scss rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Stats.module.scss diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/Stats.tsx b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Stats.tsx similarity index 95% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/Stats.tsx rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Stats.tsx index 5d5f13661e06..0cb611ddc967 100644 --- a/packages/devtools/client/src/components/ServerRoute/EntryRoute/Stats.tsx +++ b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/Stats.tsx @@ -4,7 +4,7 @@ import { useSnapshot } from 'valtio'; import type { ServerRoute } from '@modern-js/types'; import { Box, Flex, Strong, Text } from '@radix-ui/themes'; import styles from './Stats.module.scss'; -import { useStore } from '@/stores'; +import { useStore } from '@/client/stores'; export interface EntryStatsProps { route: ServerRoute; diff --git a/packages/devtools/client/src/components/ServerRoute/EntryRoute/index.ts b/packages/devtools/client/src/client/components/ServerRoute/EntryRoute/index.ts similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/EntryRoute/index.ts rename to packages/devtools/client/src/client/components/ServerRoute/EntryRoute/index.ts diff --git a/packages/devtools/client/src/components/ServerRoute/Route.tsx b/packages/devtools/client/src/client/components/ServerRoute/Route.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/Route.tsx rename to packages/devtools/client/src/client/components/ServerRoute/Route.tsx diff --git a/packages/devtools/client/src/components/ServerRoute/Unknown.tsx b/packages/devtools/client/src/client/components/ServerRoute/Unknown.tsx similarity index 100% rename from packages/devtools/client/src/components/ServerRoute/Unknown.tsx rename to packages/devtools/client/src/client/components/ServerRoute/Unknown.tsx diff --git a/packages/devtools/client/src/components/Theme.tsx b/packages/devtools/client/src/client/components/Theme.tsx similarity index 100% rename from packages/devtools/client/src/components/Theme.tsx rename to packages/devtools/client/src/client/components/Theme.tsx diff --git a/packages/devtools/client/src/constants.tsx b/packages/devtools/client/src/client/constants.tsx similarity index 100% rename from packages/devtools/client/src/constants.tsx rename to packages/devtools/client/src/client/constants.tsx diff --git a/packages/devtools/client/src/routes/config/[toolkit].[type]/page.loader.ts b/packages/devtools/client/src/client/routes/config/[toolkit].[type]/page.loader.ts similarity index 100% rename from packages/devtools/client/src/routes/config/[toolkit].[type]/page.loader.ts rename to packages/devtools/client/src/client/routes/config/[toolkit].[type]/page.loader.ts diff --git a/packages/devtools/client/src/routes/config/[toolkit].[type]/page.tsx b/packages/devtools/client/src/client/routes/config/[toolkit].[type]/page.tsx similarity index 80% rename from packages/devtools/client/src/routes/config/[toolkit].[type]/page.tsx rename to packages/devtools/client/src/client/routes/config/[toolkit].[type]/page.tsx index c9634a1b4d05..7df3a3b5f595 100644 --- a/packages/devtools/client/src/routes/config/[toolkit].[type]/page.tsx +++ b/packages/devtools/client/src/client/routes/config/[toolkit].[type]/page.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { useSnapshot } from 'valtio'; import { useParams } from '@modern-js/runtime/router'; -import { useStore } from '@/stores'; -import { ObjectInspector } from '@/components/ObjectInspector'; +import { useStore } from '@/client/stores'; +import { ObjectInspector } from '@/client/components/ObjectInspector'; const Page: React.FC = () => { const $store = useStore(); diff --git a/packages/devtools/client/src/routes/config/layout.config.tsx b/packages/devtools/client/src/client/routes/config/layout.config.tsx similarity index 100% rename from packages/devtools/client/src/routes/config/layout.config.tsx rename to packages/devtools/client/src/client/routes/config/layout.config.tsx diff --git a/packages/devtools/client/src/routes/config/layout.module.scss b/packages/devtools/client/src/client/routes/config/layout.module.scss similarity index 100% rename from packages/devtools/client/src/routes/config/layout.module.scss rename to packages/devtools/client/src/client/routes/config/layout.module.scss diff --git a/packages/devtools/client/src/routes/config/layout.tsx b/packages/devtools/client/src/client/routes/config/layout.tsx similarity index 100% rename from packages/devtools/client/src/routes/config/layout.tsx rename to packages/devtools/client/src/client/routes/config/layout.tsx diff --git a/packages/devtools/client/src/routes/config/page.loader.ts b/packages/devtools/client/src/client/routes/config/page.loader.ts similarity index 100% rename from packages/devtools/client/src/routes/config/page.loader.ts rename to packages/devtools/client/src/client/routes/config/page.loader.ts diff --git a/packages/devtools/client/src/routes/config/page.tsx b/packages/devtools/client/src/client/routes/config/page.tsx similarity index 100% rename from packages/devtools/client/src/routes/config/page.tsx rename to packages/devtools/client/src/client/routes/config/page.tsx diff --git a/packages/devtools/client/src/routes/context/builder/page.tsx b/packages/devtools/client/src/client/routes/context/builder/page.tsx similarity index 70% rename from packages/devtools/client/src/routes/context/builder/page.tsx rename to packages/devtools/client/src/client/routes/context/builder/page.tsx index 72f1a1056575..001d6751837d 100644 --- a/packages/devtools/client/src/routes/context/builder/page.tsx +++ b/packages/devtools/client/src/client/routes/context/builder/page.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useSnapshot } from 'valtio'; -import { useStore } from '@/stores'; -import { ObjectInspector } from '@/components/ObjectInspector'; +import { useStore } from '@/client/stores'; +import { ObjectInspector } from '@/client/components/ObjectInspector'; const Page: React.FC = () => { const $store = useStore(); diff --git a/packages/devtools/client/src/routes/context/framework/page.tsx b/packages/devtools/client/src/client/routes/context/framework/page.tsx similarity index 70% rename from packages/devtools/client/src/routes/context/framework/page.tsx rename to packages/devtools/client/src/client/routes/context/framework/page.tsx index f344f4f5d058..50ebb8c74c69 100644 --- a/packages/devtools/client/src/routes/context/framework/page.tsx +++ b/packages/devtools/client/src/client/routes/context/framework/page.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { useSnapshot } from 'valtio'; -import { useStore } from '@/stores'; -import { ObjectInspector } from '@/components/ObjectInspector'; +import { useStore } from '@/client/stores'; +import { ObjectInspector } from '@/client/components/ObjectInspector'; const Page: React.FC = () => { const $store = useStore(); diff --git a/packages/devtools/client/src/routes/context/layout.config.tsx b/packages/devtools/client/src/client/routes/context/layout.config.tsx similarity index 82% rename from packages/devtools/client/src/routes/context/layout.config.tsx rename to packages/devtools/client/src/client/routes/context/layout.config.tsx index 5738b2434b16..a88ee22370cb 100644 --- a/packages/devtools/client/src/routes/context/layout.config.tsx +++ b/packages/devtools/client/src/client/routes/context/layout.config.tsx @@ -1,4 +1,4 @@ -import { SelectLink } from '@/components/SelectLink'; +import { SelectLink } from '@/client/components/SelectLink'; export const handle = { breadcrumb: [ diff --git a/packages/devtools/client/src/routes/context/layout.tsx b/packages/devtools/client/src/client/routes/context/layout.tsx similarity index 100% rename from packages/devtools/client/src/routes/context/layout.tsx rename to packages/devtools/client/src/client/routes/context/layout.tsx diff --git a/packages/devtools/client/src/routes/context/page.loader.ts b/packages/devtools/client/src/client/routes/context/page.loader.ts similarity index 100% rename from packages/devtools/client/src/routes/context/page.loader.ts rename to packages/devtools/client/src/client/routes/context/page.loader.ts diff --git a/packages/devtools/client/src/routes/context/page.tsx b/packages/devtools/client/src/client/routes/context/page.tsx similarity index 100% rename from packages/devtools/client/src/routes/context/page.tsx rename to packages/devtools/client/src/client/routes/context/page.tsx diff --git a/packages/devtools/client/src/routes/layout.config.tsx b/packages/devtools/client/src/client/routes/layout.config.tsx similarity index 100% rename from packages/devtools/client/src/routes/layout.config.tsx rename to packages/devtools/client/src/client/routes/layout.config.tsx diff --git a/packages/devtools/client/src/routes/layout.module.scss b/packages/devtools/client/src/client/routes/layout.module.scss similarity index 97% rename from packages/devtools/client/src/routes/layout.module.scss rename to packages/devtools/client/src/client/routes/layout.module.scss index 4d99a8b90543..0d46a1e4da2f 100644 --- a/packages/devtools/client/src/routes/layout.module.scss +++ b/packages/devtools/client/src/client/routes/layout.module.scss @@ -1,4 +1,4 @@ -@import '@/styles/theme.scss'; +@import '@/client/styles/theme.scss'; .wrapper { --navigator-width: var(--space-8); diff --git a/packages/devtools/client/src/routes/layout.tsx b/packages/devtools/client/src/client/routes/layout.tsx similarity index 86% rename from packages/devtools/client/src/routes/layout.tsx rename to packages/devtools/client/src/client/routes/layout.tsx index 9d0b88d2e28a..c03db42a8b85 100644 --- a/packages/devtools/client/src/routes/layout.tsx +++ b/packages/devtools/client/src/client/routes/layout.tsx @@ -1,5 +1,5 @@ -import './layout.css'; -import React from 'react'; +import '@/client/styles/theme.scss'; +import React, { useEffect } from 'react'; import { NavLink, Outlet } from '@modern-js/runtime/router'; import { Box, @@ -11,10 +11,10 @@ import { } from '@radix-ui/themes'; import { HiOutlineMoon, HiOutlineSun } from 'react-icons/hi2'; import styles from './layout.module.scss'; -import { StoreContextProvider, useStoreSnapshot } from '@/stores'; -import { Theme } from '@/components/Theme'; -import { InternalTab } from '@/types'; -import { Breadcrumbs } from '@/components/Breadcrumbs'; +import { StoreContextProvider, useStoreSnapshot } from '@/client/stores'; +import { Theme } from '@/client/components/Theme'; +import { InternalTab } from '@/client/types'; +import { Breadcrumbs } from '@/client/components/Breadcrumbs'; const NavigateButton: React.FC<{ tab: InternalTab }> = ({ tab }) => { let to = ''; @@ -26,6 +26,10 @@ const NavigateButton: React.FC<{ tab: InternalTab }> = ({ tab }) => { throw new Error(`Invalid tab view of "${tab.name}".`); } + useEffect(() => { + document.documentElement.classList.add('theme-register'); + }, []); + return ( diff --git a/packages/devtools/client/src/routes/overview/heading.svg b/packages/devtools/client/src/client/routes/overview/heading.svg similarity index 100% rename from packages/devtools/client/src/routes/overview/heading.svg rename to packages/devtools/client/src/client/routes/overview/heading.svg diff --git a/packages/devtools/client/src/routes/overview/layout.config.tsx b/packages/devtools/client/src/client/routes/overview/layout.config.tsx similarity index 100% rename from packages/devtools/client/src/routes/overview/layout.config.tsx rename to packages/devtools/client/src/client/routes/overview/layout.config.tsx diff --git a/packages/devtools/client/src/routes/overview/page.module.scss b/packages/devtools/client/src/client/routes/overview/page.module.scss similarity index 100% rename from packages/devtools/client/src/routes/overview/page.module.scss rename to packages/devtools/client/src/client/routes/overview/page.module.scss diff --git a/packages/devtools/client/src/routes/overview/page.tsx b/packages/devtools/client/src/client/routes/overview/page.tsx similarity index 99% rename from packages/devtools/client/src/routes/overview/page.tsx rename to packages/devtools/client/src/client/routes/overview/page.tsx index 7c15092ceb5a..139a65a3d375 100644 --- a/packages/devtools/client/src/routes/overview/page.tsx +++ b/packages/devtools/client/src/client/routes/overview/page.tsx @@ -12,7 +12,7 @@ import { parseURL } from 'ufo'; import { useSnapshot } from 'valtio'; import srcHeading from './heading.svg'; import styles from './page.module.scss'; -import { useStore } from '@/stores'; +import { useStore } from '@/client/stores'; const BUNDLER_PACKAGE_NAMES = { webpack: 'webpack', diff --git a/packages/devtools/client/src/routes/page.loader.ts b/packages/devtools/client/src/client/routes/page.loader.ts similarity index 100% rename from packages/devtools/client/src/routes/page.loader.ts rename to packages/devtools/client/src/client/routes/page.loader.ts diff --git a/packages/devtools/client/src/routes/page.tsx b/packages/devtools/client/src/client/routes/page.tsx similarity index 100% rename from packages/devtools/client/src/routes/page.tsx rename to packages/devtools/client/src/client/routes/page.tsx diff --git a/packages/devtools/client/src/routes/pages/layout.config.ts b/packages/devtools/client/src/client/routes/pages/layout.config.ts similarity index 100% rename from packages/devtools/client/src/routes/pages/layout.config.ts rename to packages/devtools/client/src/client/routes/pages/layout.config.ts diff --git a/packages/devtools/client/src/routes/pages/layout.module.scss b/packages/devtools/client/src/client/routes/pages/layout.module.scss similarity index 100% rename from packages/devtools/client/src/routes/pages/layout.module.scss rename to packages/devtools/client/src/client/routes/pages/layout.module.scss diff --git a/packages/devtools/client/src/routes/pages/layout.tsx b/packages/devtools/client/src/client/routes/pages/layout.tsx similarity index 100% rename from packages/devtools/client/src/routes/pages/layout.tsx rename to packages/devtools/client/src/client/routes/pages/layout.tsx diff --git a/packages/devtools/client/src/routes/pages/page.module.scss b/packages/devtools/client/src/client/routes/pages/page.module.scss similarity index 100% rename from packages/devtools/client/src/routes/pages/page.module.scss rename to packages/devtools/client/src/client/routes/pages/page.module.scss diff --git a/packages/devtools/client/src/routes/pages/page.tsx b/packages/devtools/client/src/client/routes/pages/page.tsx similarity index 92% rename from packages/devtools/client/src/routes/pages/page.tsx rename to packages/devtools/client/src/client/routes/pages/page.tsx index 4fe28392083d..a5520116f7dc 100644 --- a/packages/devtools/client/src/routes/pages/page.tsx +++ b/packages/devtools/client/src/client/routes/pages/page.tsx @@ -4,12 +4,12 @@ import { useSnapshot } from 'valtio'; import { parseURL, withTrailingSlash } from 'ufo'; import { HiOutlineArrowsRightLeft } from 'react-icons/hi2'; import styles from './page.module.scss'; -import { useStore } from '@/stores'; +import { useStore } from '@/client/stores'; import { MatchServerRouteValue, MatchUrlContext, -} from '@/components/ServerRoute/Context'; -import { ServerRoute } from '@/components/ServerRoute/Route'; +} from '@/client/components/ServerRoute/Context'; +import { ServerRoute } from '@/client/components/ServerRoute/Route'; const Page: React.FC = () => { const $store = useStore(); diff --git a/packages/devtools/client/src/rpc/index.ts b/packages/devtools/client/src/client/rpc/index.ts similarity index 95% rename from packages/devtools/client/src/rpc/index.ts rename to packages/devtools/client/src/client/rpc/index.ts index d9f1f7e6f77a..b19472a5c5d7 100644 --- a/packages/devtools/client/src/rpc/index.ts +++ b/packages/devtools/client/src/client/rpc/index.ts @@ -1,6 +1,6 @@ import { ClientFunctions, ServerFunctions } from '@modern-js/devtools-kit'; import { createBirpc } from 'birpc'; -import { StoreContextValue } from '@/types'; +import { StoreContextValue } from '@/client/types'; export interface SetupOptions { url: string; diff --git a/packages/devtools/client/src/stores/index.tsx b/packages/devtools/client/src/client/stores/index.tsx similarity index 95% rename from packages/devtools/client/src/stores/index.tsx rename to packages/devtools/client/src/client/stores/index.tsx index d7461ad46912..9b2e40493a24 100644 --- a/packages/devtools/client/src/stores/index.tsx +++ b/packages/devtools/client/src/client/stores/index.tsx @@ -14,10 +14,10 @@ import { ClientDefinition, } from '@modern-js/devtools-kit'; import { ref, useSnapshot } from 'valtio'; -import { setupServerConnection } from '@/rpc'; -import { useProxyFrom } from '@/utils/hooks'; -import { StoreContextValue } from '@/types'; -import { getDefaultTabs } from '@/constants'; +import { setupServerConnection } from '@/client/rpc'; +import { useProxyFrom } from '@/client/utils/hooks'; +import { StoreContextValue } from '@/client/types'; +import { getDefaultTabs } from '@/client/constants'; const StoreContext = createContext(null); diff --git a/packages/devtools/client/src/styles/breakpoints.scss b/packages/devtools/client/src/client/styles/breakpoints.scss similarity index 100% rename from packages/devtools/client/src/styles/breakpoints.scss rename to packages/devtools/client/src/client/styles/breakpoints.scss diff --git a/packages/devtools/client/src/styles/theme.scss b/packages/devtools/client/src/client/styles/theme.scss similarity index 98% rename from packages/devtools/client/src/styles/theme.scss rename to packages/devtools/client/src/client/styles/theme.scss index 27713af91bd1..4afd2cbab297 100644 --- a/packages/devtools/client/src/styles/theme.scss +++ b/packages/devtools/client/src/client/styles/theme.scss @@ -3,4 +3,4 @@ button { cursor: pointer; -} \ No newline at end of file +} diff --git a/packages/devtools/client/src/types/index.ts b/packages/devtools/client/src/client/types/index.ts similarity index 100% rename from packages/devtools/client/src/types/index.ts rename to packages/devtools/client/src/client/types/index.ts diff --git a/packages/devtools/client/src/utils/context.tsx b/packages/devtools/client/src/client/utils/context.tsx similarity index 100% rename from packages/devtools/client/src/utils/context.tsx rename to packages/devtools/client/src/client/utils/context.tsx diff --git a/packages/devtools/client/src/utils/hooks.ts b/packages/devtools/client/src/client/utils/hooks.ts similarity index 100% rename from packages/devtools/client/src/utils/hooks.ts rename to packages/devtools/client/src/client/utils/hooks.ts diff --git a/packages/devtools/client/src/utils/index.ts b/packages/devtools/client/src/client/utils/index.ts similarity index 100% rename from packages/devtools/client/src/utils/index.ts rename to packages/devtools/client/src/client/utils/index.ts diff --git a/packages/devtools/client/src/modern-app-env.d.ts b/packages/devtools/client/src/modern-app-env.d.ts index 3f453508cee1..81f14de367e8 100644 --- a/packages/devtools/client/src/modern-app-env.d.ts +++ b/packages/devtools/client/src/modern-app-env.d.ts @@ -1,3 +1,5 @@ /// /// /// + +declare let __resourceQuery: string; diff --git a/packages/devtools/mount/src/components/Devtools/Action.module.scss b/packages/devtools/client/src/mount/components/Devtools/Action.module.scss similarity index 100% rename from packages/devtools/mount/src/components/Devtools/Action.module.scss rename to packages/devtools/client/src/mount/components/Devtools/Action.module.scss diff --git a/packages/devtools/mount/src/components/Devtools/Action.tsx b/packages/devtools/client/src/mount/components/Devtools/Action.tsx similarity index 88% rename from packages/devtools/mount/src/components/Devtools/Action.tsx rename to packages/devtools/client/src/mount/components/Devtools/Action.tsx index 2e94a43e45ba..f3fa45e06877 100644 --- a/packages/devtools/mount/src/components/Devtools/Action.tsx +++ b/packages/devtools/client/src/mount/components/Devtools/Action.tsx @@ -1,13 +1,18 @@ -import { ROUTE_BASENAME, SetupClientOptions } from '@modern-js/devtools-kit'; +import { + ClientDefinition, + ROUTE_BASENAME, + SetupClientOptions, +} from '@modern-js/devtools-kit'; import React, { useState } from 'react'; import { useEvent, useToggle } from 'react-use'; import { Flex, Theme } from '@radix-ui/themes'; import { parseURL, stringifyParsedURL, withQuery } from 'ufo'; +import _ from 'lodash'; import Visible from '../Visible'; import styles from './Action.module.scss'; import { FrameBox } from './FrameBox'; import { ReactComponent as DevToolsIcon } from './heading.svg'; -import { useStickyDraggable } from '@/utils/draggable'; +import { useStickyDraggable } from '@/mount/utils/draggable'; const parseDataSource = (url: string) => { const newSrc = parseURL(url); @@ -20,12 +25,13 @@ const parseDataSource = (url: string) => { }; const DevtoolsAction: React.FC = props => { - const logoSrc = process.env._MODERN_DEVTOOLS_LOGO_SRC!; const opts: Required = { endpoint: 'https://modernjs.dev/devtools', ...props, + def: _(new ClientDefinition()).toPlainObject().merge(props.def).value(), dataSource: parseDataSource(props.dataSource ?? ''), }; + const logoSrc = opts.def.assets.logo; const [showDevtools, toggleDevtools] = useToggle(false); let src = opts.endpoint; diff --git a/packages/devtools/mount/src/components/Devtools/FrameBox.module.scss b/packages/devtools/client/src/mount/components/Devtools/FrameBox.module.scss similarity index 100% rename from packages/devtools/mount/src/components/Devtools/FrameBox.module.scss rename to packages/devtools/client/src/mount/components/Devtools/FrameBox.module.scss diff --git a/packages/devtools/mount/src/components/Devtools/FrameBox.tsx b/packages/devtools/client/src/mount/components/Devtools/FrameBox.tsx similarity index 100% rename from packages/devtools/mount/src/components/Devtools/FrameBox.tsx rename to packages/devtools/client/src/mount/components/Devtools/FrameBox.tsx diff --git a/packages/devtools/mount/src/components/Devtools/heading.svg b/packages/devtools/client/src/mount/components/Devtools/heading.svg similarity index 100% rename from packages/devtools/mount/src/components/Devtools/heading.svg rename to packages/devtools/client/src/mount/components/Devtools/heading.svg diff --git a/packages/devtools/mount/src/components/Devtools/xmark.svg b/packages/devtools/client/src/mount/components/Devtools/xmark.svg similarity index 100% rename from packages/devtools/mount/src/components/Devtools/xmark.svg rename to packages/devtools/client/src/mount/components/Devtools/xmark.svg diff --git a/packages/devtools/mount/src/components/LoadingIcon.tsx b/packages/devtools/client/src/mount/components/LoadingIcon.tsx similarity index 100% rename from packages/devtools/mount/src/components/LoadingIcon.tsx rename to packages/devtools/client/src/mount/components/LoadingIcon.tsx diff --git a/packages/devtools/mount/src/components/Portal.tsx b/packages/devtools/client/src/mount/components/Portal.tsx similarity index 100% rename from packages/devtools/mount/src/components/Portal.tsx rename to packages/devtools/client/src/mount/components/Portal.tsx diff --git a/packages/devtools/mount/src/components/Visible.tsx b/packages/devtools/client/src/mount/components/Visible.tsx similarity index 100% rename from packages/devtools/mount/src/components/Visible.tsx rename to packages/devtools/client/src/mount/components/Visible.tsx diff --git a/packages/devtools/client/src/mount/index.tsx b/packages/devtools/client/src/mount/index.tsx new file mode 100644 index 000000000000..e47e3620c17c --- /dev/null +++ b/packages/devtools/client/src/mount/index.tsx @@ -0,0 +1,7 @@ +import { createRoot } from 'react-dom/client'; +import DevtoolsAction from './components/Devtools/Action'; + +// @ts-expect-error +const { container, options } = window._modern_js_devtools_app; +const root = createRoot(container); +root.render(); diff --git a/packages/devtools/mount/src/types.d.ts b/packages/devtools/client/src/mount/types.d.ts similarity index 100% rename from packages/devtools/mount/src/types.d.ts rename to packages/devtools/client/src/mount/types.d.ts diff --git a/packages/devtools/mount/src/utils/draggable.ts b/packages/devtools/client/src/mount/utils/draggable.ts similarity index 100% rename from packages/devtools/mount/src/utils/draggable.ts rename to packages/devtools/client/src/mount/utils/draggable.ts diff --git a/packages/devtools/client/src/routes/layout.css b/packages/devtools/client/src/routes/layout.css deleted file mode 100644 index 609253955e26..000000000000 --- a/packages/devtools/client/src/routes/layout.css +++ /dev/null @@ -1,3 +0,0 @@ -body { - margin: 0; -} \ No newline at end of file diff --git a/packages/devtools/client/tsconfig.json b/packages/devtools/client/tsconfig.json index 4264c19d6557..000425217999 100644 --- a/packages/devtools/client/tsconfig.json +++ b/packages/devtools/client/tsconfig.json @@ -9,5 +9,5 @@ "@shared/*": ["./shared/*"] } }, - "include": ["src", "shared", "config", "modern.config.ts"] + "include": ["src", "exports", "shared", "config", "modern.config.ts"] } diff --git a/packages/devtools/kit/src/mount-point.ts b/packages/devtools/kit/src/mount-point.ts index 1fe636bcd31c..91b4d61be6f3 100644 --- a/packages/devtools/kit/src/mount-point.ts +++ b/packages/devtools/kit/src/mount-point.ts @@ -1,3 +1,5 @@ +import type { ClientDefinition } from './client'; + export interface MountPointFunctions { getLocation: () => string; } @@ -5,4 +7,5 @@ export interface MountPointFunctions { export interface SetupClientOptions extends Record { endpoint?: string; dataSource?: string; + def?: ClientDefinition; } diff --git a/packages/devtools/mount/.browserslistrc b/packages/devtools/mount/.browserslistrc deleted file mode 100644 index f5ceef6bb8ec..000000000000 --- a/packages/devtools/mount/.browserslistrc +++ /dev/null @@ -1,5 +0,0 @@ -chrome >= 51 -edge >= 15 -firefox >= 54 -safari >= 10 -ios_saf >= 10 diff --git a/packages/devtools/mount/.eslintrc.js b/packages/devtools/mount/.eslintrc.js deleted file mode 100644 index a84ee271a188..000000000000 --- a/packages/devtools/mount/.eslintrc.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - root: true, - extends: ['@modern-js'], -}; diff --git a/packages/devtools/mount/CHANGELOG.md b/packages/devtools/mount/CHANGELOG.md deleted file mode 100644 index 1b16159bc930..000000000000 --- a/packages/devtools/mount/CHANGELOG.md +++ /dev/null @@ -1,67 +0,0 @@ -# @modern-js/devtools-mount - -## 2.39.1 - -## 2.39.0 - -## 2.38.0 - -## 2.37.2 - -## 2.37.1 - -## 2.37.0 - -## 2.36.0 - -## 2.35.1 - -## 2.35.0 - -## 2.34.0 - -### Patch Changes - -- Updated dependencies [dcdeea5] -- Updated dependencies [eca24a2] - - @modern-js/runtime@2.34.0 - -## 2.33.1 - -### Patch Changes - -- @modern-js/runtime@2.33.1 - -## 2.33.0 - -### Patch Changes - -- Updated dependencies [6ea89ab] -- Updated dependencies [ae35c65] -- Updated dependencies [2bcff4f] -- Updated dependencies [44da57b] - - @modern-js/runtime@2.33.0 - -## 2.32.1 - -### Patch Changes - -- Updated dependencies [90e053a] - - @modern-js/runtime@2.32.1 - -## 2.32.0 - -### Patch Changes - -- Updated dependencies [e5a3fb4] -- Updated dependencies [6076166] -- Updated dependencies [a030aff] -- Updated dependencies [92591c6] -- Updated dependencies [5255eba] - - @modern-js/runtime@2.32.0 - -## 2.31.2 - -### Patch Changes - -- @modern-js/runtime@2.31.2 diff --git a/packages/devtools/mount/README.md b/packages/devtools/mount/README.md deleted file mode 100644 index 8fa00f661e63..000000000000 --- a/packages/devtools/mount/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# Modern.js App - -## Setup - -Install the dependencies: - -```bash -pnpm install -``` - -## Get Started - -Start the dev server: - -``` -pnpm dev -``` - -Enable optional features or add a new entry: - -``` -pnpm new -``` - -Build the app for production: - -``` -pnpm build -``` - -Preview the production build locally: - -``` -pnpm serve -``` - -For more information, see the [Modern.js documentation](https://modernjs.dev/en). diff --git a/packages/devtools/mount/modern.config.ts b/packages/devtools/mount/modern.config.ts deleted file mode 100644 index 5fee5db647cd..000000000000 --- a/packages/devtools/mount/modern.config.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { nanoid } from 'nanoid'; -import { appTools, defineConfig } from '@modern-js/app-tools'; -import packageMeta from './package.json'; - -const DEVTOOLS_MARK = nanoid(); - -// https://modernjs.dev/en/configure/app/usage -export default defineConfig<'rspack'>({ - source: { - entries: { - main: { - entry: './src/index.tsx', - disableMount: true, - }, - }, - preEntry: [ - require.resolve('modern-normalize/modern-normalize.css'), - require.resolve('@radix-ui/themes/styles.css'), - ], - globalVars: { - 'process.env.VERSION': packageMeta.version, - 'process.env.DEVTOOLS_MARK': DEVTOOLS_MARK, - }, - }, - output: { - copy: [{ from: './src/types.d.ts', to: './' }], - legalComments: 'linked', - disableCssExtract: true, - disableFilenameHash: true, - distPath: { - js: './', - }, - }, - dev: { - port: 8781, - }, - tools: { - htmlPlugin: process.env.NODE_ENV === 'production' ? false : {}, - styleLoader: { - insert: function insert(element) { - const key = `__DEVTOOLS_STYLE_${process.env.DEVTOOLS_MARK}`; - // @ts-expect-error - window[key] = window[key] || []; - // @ts-expect-error - window[key].push(element); - }, - }, - bundlerChain(chain) { - chain.output.libraryTarget('commonjs'); - chain.module - .rule('RADIX_TOKEN') - .test(/\/@radix-ui\/themes\/styles.css/) - .use('RADIX_TOKEN') - .loader('./plugin/radix-token-transformer.js') - .options({ root: '._modern_js_devtools_mountpoint' }); - }, - }, - performance: { - chunkSplit: { - strategy: 'all-in-one', - }, - }, - plugins: [ - appTools({ - bundler: 'experimental-rspack', - }), - ], -}); diff --git a/packages/devtools/mount/package.json b/packages/devtools/mount/package.json deleted file mode 100644 index dd199c10bd4f..000000000000 --- a/packages/devtools/mount/package.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "name": "@modern-js/devtools-mount", - "version": "2.39.1", - "main": "dist/main.js", - "types": "dist/types.d.ts", - "scripts": { - "reset": "npx rimraf ./**/node_modules", - "dev": "modern dev", - "build": "modern build", - "start": "modern start", - "serve": "modern serve", - "new": "modern new", - "lint": "modern lint", - "upgrade": "modern upgrade" - }, - "engines": { - "node": ">=14.0.0" - }, - "files": [ - "dist" - ], - "dependencies": {}, - "devDependencies": { - "modern-normalize": "^2.0.0", - "@modern-js-app/eslint-config": "workspace:*", - "@modern-js/app-tools": "workspace:*", - "@modern-js/builder-rspack-provider": "workspace:*", - "@modern-js/devtools-kit": "workspace:*", - "@modern-js/eslint-config": "workspace:*", - "@modern-js/runtime": "workspace:*", - "@modern-js/tsconfig": "workspace:*", - "@radix-ui/themes": "^2.0.0", - "@stitches/react": "^1.2.8", - "@types/jest": "~29.2.4", - "@types/lodash-es": "^4.17.9", - "@types/node": "~16.11.7", - "@types/react": "~18.0.26", - "@types/react-dom": "~18.0.10", - "lodash-es": "^4.17.21", - "nanoid": "3.3.4", - "react": "~18.2.0", - "react-dom": "~18.2.0", - "react-use": "^17.4.0", - "rimraf": "~3.0.2", - "type-fest": "^4.1.0", - "typescript": "~5.0.4", - "ufo": "^1.2.0", - "webpack": "^5.88.1" - } -} diff --git a/packages/devtools/mount/src/index.tsx b/packages/devtools/mount/src/index.tsx deleted file mode 100644 index 6140487dac1f..000000000000 --- a/packages/devtools/mount/src/index.tsx +++ /dev/null @@ -1 +0,0 @@ -export { mountDevTools } from './mount'; diff --git a/packages/devtools/mount/src/modern-app-env.d.ts b/packages/devtools/mount/src/modern-app-env.d.ts deleted file mode 100644 index 3f453508cee1..000000000000 --- a/packages/devtools/mount/src/modern-app-env.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -/// -/// -/// diff --git a/packages/devtools/mount/src/mount.tsx b/packages/devtools/mount/src/mount.tsx deleted file mode 100644 index 214b0ee2ba26..000000000000 --- a/packages/devtools/mount/src/mount.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { createRoot } from 'react-dom/client'; -import DevtoolsAction from './components/Devtools/Action'; -import type { MountDevTools } from '@/types'; - -export const mountDevTools: MountDevTools = (options = {}) => { - const container = document.createElement('div'); - container.className = '_modern_js_devtools_container'; - container.id = process.env.DEVTOOLS_MARK!; - document.body.appendChild(container); - - const shadow = container.attachShadow({ mode: 'closed' }); - - const styleTagsField = `__DEVTOOLS_STYLE_${process.env.DEVTOOLS_MARK}`; - if (styleTagsField in window) { - // @ts-expect-error - const styleTags = window[styleTagsField]; - if (!Array.isArray(styleTags)) { - throw new TypeError( - `Expect window.${styleTagsField} should be array but got ${typeof styleTags}.`, - ); - } - for (const tag of styleTags) { - if (tag instanceof HTMLElement) { - shadow.appendChild(tag); - } - } - } - - const app = document.createElement('div'); - app.className = '_modern_js_devtools_mountpoint'; - app.id = process.env.DEVTOOLS_MARK!; - shadow.appendChild(app); - - const root = createRoot(app); - - root.render(); -}; diff --git a/packages/devtools/mount/tsconfig.json b/packages/devtools/mount/tsconfig.json deleted file mode 100644 index 4264c19d6557..000000000000 --- a/packages/devtools/mount/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "@modern-js/tsconfig/base", - "compilerOptions": { - "declaration": false, - "jsx": "preserve", - "baseUrl": "./", - "paths": { - "@/*": ["./src/*"], - "@shared/*": ["./shared/*"] - } - }, - "include": ["src", "shared", "config", "modern.config.ts"] -} diff --git a/packages/devtools/plugin/package.json b/packages/devtools/plugin/package.json index dc69f5b60c58..c717525167ce 100644 --- a/packages/devtools/plugin/package.json +++ b/packages/devtools/plugin/package.json @@ -49,7 +49,6 @@ "dependencies": { "birpc": "0.2.13", "@modern-js/devtools-kit": "workspace:*", - "@modern-js/devtools-mount": "workspace:*", "@modern-js/devtools-client": "workspace:*", "@modern-js/utils": "workspace:*", "serve-static": "^1.14.1", diff --git a/packages/devtools/plugin/src/cli.ts b/packages/devtools/plugin/src/cli.ts index ca4a9aac3430..409683952c75 100644 --- a/packages/devtools/plugin/src/cli.ts +++ b/packages/devtools/plugin/src/cli.ts @@ -46,7 +46,7 @@ export const devtoolsPlugin = ( res.end(); }; const useMainRoute = () => { - req.url = '/html/main/index.html'; + req.url = '/html/client/index.html'; serveMiddleware(req, res, usePageNotFound); }; serveMiddleware(req, res, useMainRoute); @@ -80,21 +80,16 @@ export const devtoolsPlugin = ( const mountOpts = { dataSource: `${ROUTE_BASENAME}/rpc`, endpoint: ROUTE_BASENAME, + def: new ClientDefinition(), __keep: true, } as SetupClientOptions; - let runtimeEntry = require.resolve( - '@modern-js/plugin-devtools/runtime', - ); + let runtimeEntry = require.resolve('@modern-js/devtools-client/mount'); runtimeEntry = withQuery(runtimeEntry, mountOpts); return { builderPlugins: [rpc.builderPlugin], source: { preEntry: [runtimeEntry], - globalVars: { - 'process.env._MODERN_DEVTOOLS_LOGO_SRC': new ClientDefinition() - .assets.logo, - }, }, tools: { devServer: { diff --git a/packages/devtools/plugin/src/runtime.ts b/packages/devtools/plugin/src/runtime.ts deleted file mode 100644 index 985e27e5c9ce..000000000000 --- a/packages/devtools/plugin/src/runtime.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { SetupClientOptions } from '@modern-js/devtools-kit'; -import { mountDevTools } from '@modern-js/devtools-mount'; -import { parseQuery } from 'ufo'; - -try { - const opts = parseQuery(__resourceQuery); - mountDevTools(opts as SetupClientOptions); -} catch (err: unknown) { - const e = new Error('Failed to execute mount point of DevTools.'); - e.cause = err; - console.error(e); -} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 244ede40c6d2..a6e0ea0846f8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1447,84 +1447,6 @@ importers: specifier: ^5 version: 5.0.4 - packages/devtools/mount: - devDependencies: - '@modern-js-app/eslint-config': - specifier: workspace:* - version: link:../../review/eslint-config-app - '@modern-js/app-tools': - specifier: workspace:* - version: link:../../solutions/app-tools - '@modern-js/builder-rspack-provider': - specifier: workspace:* - version: link:../../builder/builder-rspack-provider - '@modern-js/devtools-kit': - specifier: workspace:* - version: link:../kit - '@modern-js/eslint-config': - specifier: workspace:* - version: link:../../review/eslint-config - '@modern-js/runtime': - specifier: workspace:* - version: link:../../runtime/plugin-runtime - '@modern-js/tsconfig': - specifier: workspace:* - version: link:../../review/tsconfig - '@radix-ui/themes': - specifier: ^2.0.0 - version: 2.0.0(@types/react-dom@18.0.6)(@types/react@18.0.21)(react-dom@18.2.0)(react@18.2.0) - '@stitches/react': - specifier: ^1.2.8 - version: 1.2.8(react@18.2.0) - '@types/jest': - specifier: ~29.2.4 - version: 29.2.6 - '@types/lodash-es': - specifier: ^4.17.9 - version: 4.17.9 - '@types/node': - specifier: ~16.11.7 - version: 16.11.68 - '@types/react': - specifier: ^18 - version: 18.0.21 - '@types/react-dom': - specifier: ^18 - version: 18.0.6 - lodash-es: - specifier: ^4.17.21 - version: 4.17.21 - modern-normalize: - specifier: ^2.0.0 - version: 2.0.0 - nanoid: - specifier: 3.3.4 - version: 3.3.4 - react: - specifier: ~18.2.0 - version: 18.2.0 - react-dom: - specifier: ~18.2.0 - version: 18.2.0(react@18.2.0) - react-use: - specifier: ^17.4.0 - version: 17.4.0(react-dom@18.2.0)(react@18.2.0) - rimraf: - specifier: ~3.0.2 - version: 3.0.2 - type-fest: - specifier: ^4.1.0 - version: 4.1.0 - typescript: - specifier: ~5.0.4 - version: 5.0.4 - ufo: - specifier: ^1.2.0 - version: 1.3.0 - webpack: - specifier: ^5.88.1 - version: 5.88.1(esbuild@0.17.19) - packages/devtools/plugin: dependencies: '@modern-js/devtools-client': @@ -1533,9 +1455,6 @@ importers: '@modern-js/devtools-kit': specifier: workspace:* version: link:../kit - '@modern-js/devtools-mount': - specifier: workspace:* - version: link:../mount '@modern-js/utils': specifier: workspace:* version: link:../../toolkit/utils @@ -16026,14 +15945,6 @@ packages: resolution: {integrity: sha512-Gfkvwk9o9kE9r9XNBmJRfV8zONvXThnm1tcuojL04Uy5uRyqg93DC83lDebl0rocZCfKSjUv+fWYtMQmEDJldg==} dev: false - /@stitches/react@1.2.8(react@18.2.0): - resolution: {integrity: sha512-9g9dWI4gsSVe8bNLlb+lMkBYsnIKCZTmvqvDG+Avnn69XfmHZKiaMrx7cgTaddq7aTPPmXiTsbFcUy0xgI4+wA==} - peerDependencies: - react: '>= 16.3.0' - dependencies: - react: 18.2.0 - dev: true - /@storybook/addon-actions@7.5.1(@types/react-dom@18.0.6)(@types/react@18.0.21)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GieD3ru6EslKvwol1cE4lvszQCLB/AkQdnLofnqy1nnYso+hRxmPAw9/O+pWfpUBFdjXsQ7GX09+wEUpOJzepw==} peerDependencies: @@ -17560,12 +17471,6 @@ packages: '@types/webpack': 4.41.32 dev: true - /@types/lodash-es@4.17.9: - resolution: {integrity: sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==} - dependencies: - '@types/lodash': 4.14.199 - dev: true - /@types/lodash@4.14.181: resolution: {integrity: sha512-n3tyKthHJbkiWhDZs3DkhkCzt2MexYHXlX0td5iMplyfwketaOeKboEVBqzceH7juqvEg3q5oUoBFxSLu7zFag==} dev: true @@ -19172,8 +19077,8 @@ packages: peerDependencies: postcss: ^8.1.0 dependencies: - browserslist: 4.22.1 - caniuse-lite: 1.0.30001559 + browserslist: 4.21.10 + caniuse-lite: 1.0.30001520 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -27259,11 +27164,6 @@ packages: engines: {node: '>=6'} dev: false - /modern-normalize@2.0.0: - resolution: {integrity: sha512-CxBoEVKh5U4DH3XuNbc5ONLF6dQBc8dSc7pdZ1957FGbIO5JBqGqqchhET9dTexri8/pk9xBL6+5ceOtCIp1QA==} - engines: {node: '>=6'} - dev: true - /moment@2.29.3: resolution: {integrity: sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==} From b72d1eed841635d9ded0e30c028b6f33f1f8bc5c Mon Sep 17 00:00:00 2001 From: chenwenjie Date: Mon, 6 Nov 2023 15:46:17 +0800 Subject: [PATCH 2/4] chore: update lock file --- pnpm-lock.yaml | 1007 ++++++++++++++---------------------------------- 1 file changed, 282 insertions(+), 725 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a6e0ea0846f8..270fc162e431 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -171,14 +171,14 @@ importers: specifier: workspace:* version: link:../../toolkit/utils '@rspack/core': - specifier: 0.3.8 - version: 0.3.8 + specifier: 0.3.10 + version: 0.3.10 '@rspack/dev-client': - specifier: 0.3.8 - version: 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) + specifier: 0.3.10 + version: 0.3.10(react-refresh@0.14.0)(webpack@5.88.1) '@rspack/plugin-html': - specifier: 0.3.8 - version: 0.3.8(@rspack/core@0.3.8) + specifier: 0.3.10 + version: 0.3.10(@rspack/core@0.3.10) '@swc/helpers': specifier: 0.5.1 version: 0.5.1 @@ -1529,8 +1529,8 @@ importers: specifier: workspace:* version: link:../../review/tsconfig '@rspress/shared': - specifier: 1.4.0 - version: 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) '@types/node': specifier: ^14 version: 14.18.35 @@ -1541,8 +1541,8 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) rspress: - specifier: 1.4.0 - version: 1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) packages/document/main-doc: dependencies: @@ -1557,8 +1557,8 @@ importers: specifier: workspace:* version: link:../../cli/doc-plugin-auto-sidebar '@rspress/shared': - specifier: 1.4.0 - version: 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) '@types/fs-extra': specifier: ^9 version: 9.0.13 @@ -1581,8 +1581,8 @@ importers: specifier: ^18 version: 18.2.0(react@18.2.0) rspress: - specifier: 1.4.0 - version: 1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) ts-node: specifier: ^10.9.1 version: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) @@ -1596,8 +1596,8 @@ importers: specifier: workspace:* version: link:../../cli/doc-plugin-auto-sidebar '@rspress/shared': - specifier: 1.4.0 - version: 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) react: specifier: ^18.2.0 version: 18.2.0 @@ -1605,8 +1605,8 @@ importers: specifier: ^18.2.0 version: 18.2.0(react@18.2.0) rspress: - specifier: 1.4.0 - version: 1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + specifier: 1.5.0 + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) packages/generator/generator-cases: dependencies: @@ -5374,12 +5374,6 @@ importers: address: specifier: 1.1.2 version: 1.1.2 - ajv: - specifier: 8.11.0 - version: 8.11.0 - ajv-keywords: - specifier: 5.1.0 - version: 5.1.0(ajv@8.11.0) ansi-escapes: specifier: 4.3.2 version: 4.3.2 @@ -5395,9 +5389,6 @@ importers: babel-plugin-transform-react-remove-prop-types: specifier: 0.4.24 version: 0.4.24 - better-ajv-errors: - specifier: 1.2.0 - version: 1.2.0(ajv@8.11.0) browserslist: specifier: 4.20.2 version: 4.20.2 @@ -8550,11 +8541,6 @@ packages: resolution: {integrity: sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==} engines: {node: '>=6.9.0'} - /@babel/compat-data@7.23.2: - resolution: {integrity: sha512-0S9TQMmDHlqAZ2ITT95irXKfxN9bncq8ZCoJhun3nHL/lLUxd2NKBJYoNGWH7S0hz6fRQwWlAWn/ILM0C70KZQ==} - engines: {node: '>=6.9.0'} - dev: true - /@babel/core@7.12.9: resolution: {integrity: sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==} engines: {node: '>=6.9.0'} @@ -8739,21 +8725,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/helper-define-polyfill-provider@0.4.3(@babel/core@7.23.2): - resolution: {integrity: sha512-WBrLmuPP47n7PNwsZ57pqam6G/RGo1vw/87b0Blc53tZNGZ4x7YvZ6HgQe2vo1W/FR20OgjeZuGXzudPiXHFug==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-compilation-targets': 7.22.15 - '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.4(supports-color@9.3.1) - lodash.debounce: 4.0.8 - resolve: 1.22.4 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/helper-environment-visitor@7.22.20: resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==} engines: {node: '>=6.9.0'} @@ -8838,18 +8809,6 @@ packages: resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==} engines: {node: '>=6.9.0'} - /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.2): - resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-wrap-function': 7.22.20 - dev: true - /@babel/helper-remap-async-to-generator@7.22.9(@babel/core@7.23.2): resolution: {integrity: sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==} engines: {node: '>=6.9.0'} @@ -8910,15 +8869,6 @@ packages: '@babel/template': 7.22.15 '@babel/types': 7.23.0 - /@babel/helper-wrap-function@7.22.20: - resolution: {integrity: sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==} - engines: {node: '>=6.9.0'} - dependencies: - '@babel/helper-function-name': 7.23.0 - '@babel/template': 7.22.15 - '@babel/types': 7.23.0 - dev: true - /@babel/helpers@7.23.1: resolution: {integrity: sha512-chNpneuK18yW5Oxsr+t553UZzzAs3aZnFm4bxhebsNTeshrC95yA7l5yl7GBAG+JG1rF0F7zzD2EixK9mWSDoA==} engines: {node: '>=6.9.0'} @@ -8999,7 +8949,6 @@ packages: '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.2) '@babel/helper-split-export-declaration': 7.22.6 '@babel/plugin-syntax-decorators': 7.22.10(@babel/core@7.23.2) - dev: false /@babel/plugin-proposal-decorators@7.23.2(@babel/core@7.23.2): resolution: {integrity: sha512-eR0gJQc830fJVGz37oKLvt9W9uUIQSAovUl0e9sJ3YeO09dlcoBVYD3CLrjCj4qHdXmfiyTyFt8yeQYSN5fxLg==} @@ -9372,19 +9321,6 @@ packages: '@babel/helper-remap-async-to-generator': 7.22.9(@babel/core@7.23.2) '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.2) - /@babel/plugin-transform-async-generator-functions@7.23.2(@babel/core@7.23.2): - resolution: {integrity: sha512-BBYVGxbDVHfoeXbOwcagAkOQAm9NxoTdMGfTqghu1GrvadSaw6iW3Je6IcL5PNOw8VwjxqBECXy50/iCQSY/lQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.2) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.2) - dev: true - /@babel/plugin-transform-async-to-generator@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==} engines: {node: '>=6.9.0'} @@ -9414,16 +9350,6 @@ packages: '@babel/core': 7.23.2 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-transform-block-scoping@7.23.0(@babel/core@7.23.2): - resolution: {integrity: sha512-cOsrbmIOXmf+5YbL99/S49Y3j46k/T16b9ml8bm9lP6N9US5iQ2yBK7gpui1pg0V/WMcXdkfKbTb7HXq9u+v4g==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-transform-class-properties@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==} engines: {node: '>=6.9.0'} @@ -9481,16 +9407,6 @@ packages: '@babel/core': 7.23.2 '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-transform-destructuring@7.23.0(@babel/core@7.23.2): - resolution: {integrity: sha512-vaMdgNXFkYrB+8lbgniSYWHsgqK5gjaMNcc84bMIOMRLH0L9AqYq3hwMdvnyqj1OPqea8UtjPEuS/DCenah1wg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-transform-dotall-regex@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==} engines: {node: '>=6.9.0'} @@ -9619,17 +9535,6 @@ packages: '@babel/helper-module-transforms': 7.23.0(@babel/core@7.23.2) '@babel/helper-plugin-utils': 7.22.5 - /@babel/plugin-transform-modules-amd@7.23.0(@babel/core@7.23.2): - resolution: {integrity: sha512-xWT5gefv2HGSm4QHtgc1sYPbseOyf+FFDo2JbpE25GWl5BqTGO9IMwTYJRoIdjsF85GE+VegHxSCUt5EvoYTAw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-module-transforms': 7.23.0(@babel/core@7.23.2) - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.23.2): resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==} engines: {node: '>=6.9.0'} @@ -9653,19 +9558,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-identifier': 7.22.20 - /@babel/plugin-transform-modules-systemjs@7.23.0(@babel/core@7.23.2): - resolution: {integrity: sha512-qBej6ctXZD2f+DhlOC9yO47yEYgUh5CZNz/aBoH4j/3NOlRfJXJbY7xDQCqQVf9KbrqGzIWER1f23doHGrIHFg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-hoist-variables': 7.22.5 - '@babel/helper-module-transforms': 7.23.0(@babel/core@7.23.2) - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-identifier': 7.22.20 - dev: true - /@babel/plugin-transform-modules-umd@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==} engines: {node: '>=6.9.0'} @@ -9759,18 +9651,6 @@ packages: '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.2) - /@babel/plugin-transform-optional-chaining@7.23.0(@babel/core@7.23.2): - resolution: {integrity: sha512-sBBGXbLJjxTzLBF5rFWaikMnOGOk/BmK6vVByIdEggZ7Vn6CvWXZyRkkLFK6WE0IF8jSliyOkUN6SScFgzCM0g==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.2) - dev: true - /@babel/plugin-transform-parameters@7.22.15(@babel/core@7.12.9): resolution: {integrity: sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==} engines: {node: '>=6.9.0'} @@ -9905,24 +9785,6 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color - dev: false - - /@babel/plugin-transform-runtime@7.23.2(@babel/core@7.23.2): - resolution: {integrity: sha512-XOntj6icgzMS58jPVtQpiuF6ZFWxQiJavISGx5KGjRj+3gqZr8+N6Kx+N9BApWzgS+DOjIZfXXj0ZesenOWDyA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-module-imports': 7.22.15 - '@babel/helper-plugin-utils': 7.22.5 - babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.23.2) - babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.23.2) - babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.23.2) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - dev: true /@babel/plugin-transform-shorthand-properties@7.22.5(@babel/core@7.23.2): resolution: {integrity: sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==} @@ -10200,98 +10062,6 @@ packages: semver: 6.3.1 transitivePeerDependencies: - supports-color - dev: false - - /@babel/preset-env@7.23.2(@babel/core@7.23.2): - resolution: {integrity: sha512-BW3gsuDD+rvHL2VO2SjAUNTBe5YrjsTiDyqamPDWY723na3/yPQ65X5oQkFVJZ0o50/2d+svm1rkPoJeR1KxVQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/compat-data': 7.23.2 - '@babel/core': 7.23.2 - '@babel/helper-compilation-targets': 7.22.15 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-option': 7.22.15 - '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.2) - '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.2) - '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.2) - '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.2) - '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-import-assertions': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-syntax-import-attributes': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.2) - '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.2) - '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.2) - '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.2) - '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.2) - '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.2) - '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.2) - '@babel/plugin-transform-arrow-functions': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-async-generator-functions': 7.23.2(@babel/core@7.23.2) - '@babel/plugin-transform-async-to-generator': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-block-scoped-functions': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-block-scoping': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-class-properties': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-class-static-block': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-classes': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-transform-computed-properties': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-destructuring': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-dotall-regex': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-duplicate-keys': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-dynamic-import': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-exponentiation-operator': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-export-namespace-from': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-for-of': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-transform-function-name': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-json-strings': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-literals': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-logical-assignment-operators': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-member-expression-literals': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-modules-amd': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-modules-systemjs': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-modules-umd': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-new-target': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-nullish-coalescing-operator': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-numeric-separator': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-object-rest-spread': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-transform-object-super': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-optional-catch-binding': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-optional-chaining': 7.23.0(@babel/core@7.23.2) - '@babel/plugin-transform-parameters': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-transform-private-methods': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-private-property-in-object': 7.22.11(@babel/core@7.23.2) - '@babel/plugin-transform-property-literals': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-regenerator': 7.22.10(@babel/core@7.23.2) - '@babel/plugin-transform-reserved-words': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-shorthand-properties': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-spread': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-sticky-regex': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-template-literals': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-typeof-symbol': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-unicode-escapes': 7.22.10(@babel/core@7.23.2) - '@babel/plugin-transform-unicode-property-regex': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-unicode-regex': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-transform-unicode-sets-regex': 7.22.5(@babel/core@7.23.2) - '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.2) - '@babel/types': 7.23.0 - babel-plugin-polyfill-corejs2: 0.4.6(@babel/core@7.23.2) - babel-plugin-polyfill-corejs3: 0.8.6(@babel/core@7.23.2) - babel-plugin-polyfill-regenerator: 0.5.3(@babel/core@7.23.2) - core-js-compat: 3.33.2 - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - dev: true /@babel/preset-flow@7.18.6(@babel/core@7.23.2): resolution: {integrity: sha512-E7BDhL64W6OUqpuyHnSroLnqyRTcG6ZdOBl1OKI/QK/HJfplqK/S3sq1Cckx7oTodJ5yOXyfw7rEADJ6UjoQDQ==} @@ -11918,11 +11688,6 @@ packages: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} - /@humanwhocodes/momoa@2.0.4: - resolution: {integrity: sha512-RE815I4arJFtt+FVeU1Tgp9/Xvecacji8w/V6XtXsWWH/wz/eNkNbhb+ny/+PlVZjV0rxQpRSQKNKE3lcktHEA==} - engines: {node: '>=10.10.0'} - dev: true - /@humanwhocodes/object-schema@1.2.1: resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==} @@ -12486,18 +12251,18 @@ packages: redux: 4.2.0 dev: false - /@modern-js/babel-compiler@2.39.0: - resolution: {integrity: sha512-SBFUC0q5ygiwcHJrJcRmfkN5ScZhnzN0U5YPR+4VfgOh8HmaD8B5lGduf8SNs3y8rWO6TKaWtcMk1IjR3f1urQ==} + /@modern-js/babel-compiler@2.39.2: + resolution: {integrity: sha512-vgJhPIsO6jKILEsC0wQGGg+h0OcrIRvFnE2iuPebFZliC0oSpUpEPa7sPwjXqtXlDOmwLEvx0nbEN2znVknxSA==} dependencies: '@babel/core': 7.23.2 - '@modern-js/utils': 2.39.0 + '@modern-js/utils': 2.39.2 '@swc/helpers': 0.5.1 transitivePeerDependencies: - supports-color dev: true - /@modern-js/babel-plugin-module-resolver@2.39.0: - resolution: {integrity: sha512-LUeTnQeOZeIdWoKbOKtgruxs5RrSUP0PJMvrO2cWQvRz4HtViIW2qIzIK+IId/TAzSpPXqZoqO0axsxsWzJjKg==} + /@modern-js/babel-plugin-module-resolver@2.39.2: + resolution: {integrity: sha512-iZdfjlE0memi2xl6cN2CsALFzyvazTylnvBu1j+Q8OWD/FJiqpjoYiz5KoFzTao18u/Tj79O/D/TNCX/k8sdOw==} dependencies: '@swc/helpers': 0.5.1 glob: 8.1.0 @@ -12732,10 +12497,10 @@ packages: '@swc/helpers': 0.5.1 dev: true - /@modern-js/plugin@2.39.0: - resolution: {integrity: sha512-J52HymCL0SubEZZSewPzV3wYRrbD7JKA2QiTO3xHqPxxAm+wzGd37wow1v/U91mL/Sb0dxzQNWpNgDQCr7aSJg==} + /@modern-js/plugin@2.39.2: + resolution: {integrity: sha512-fNTy/28+0vYV4d75yqH0keMH0EP0ZHuotJ/CMZgurKdtPR3CVLBjwLG41i/nbcIajQzF4QIfcALs2pwySMjKDQ==} dependencies: - '@modern-js/utils': 2.39.0 + '@modern-js/utils': 2.39.2 '@swc/helpers': 0.5.1 dev: true @@ -12790,13 +12555,13 @@ packages: - supports-color dev: false - /@modern-js/prod-server@2.39.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-jfqKe2K9iAgMT5C0mLxeeVc96cUWBmw5K5WPl8p/kjw7F8bLJw3fMr63Ch6JgGy72/xAmuxe4QiWlRQoJUH5bw==} + /@modern-js/prod-server@2.39.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-KzuKwt7PJt37gPMHmQvxLALuFhmUt4/K2P107uJhnNk7HI/ya9fwoVPIVfGUXfEgJyEER3i0ZSD3ReoaBmiyIQ==} dependencies: - '@modern-js/plugin': 2.39.0 - '@modern-js/runtime-utils': 2.39.0(react-dom@18.2.0)(react@18.2.0) - '@modern-js/server-core': 2.39.0 - '@modern-js/utils': 2.39.0 + '@modern-js/plugin': 2.39.2 + '@modern-js/runtime-utils': 2.39.2(react-dom@18.2.0)(react@18.2.0) + '@modern-js/server-core': 2.39.2 + '@modern-js/utils': 2.39.2 '@swc/helpers': 0.5.1 cookie: 0.4.2 etag: 1.8.1 @@ -12816,8 +12581,8 @@ packages: - supports-color dev: true - /@modern-js/runtime-utils@2.39.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-RXW6LCS14NSsjsC3hkMCYC24suF8mDDsXeK7gJaK0juYd2g9IB3Br5PISATEdQkVL7STt2BBDbf2lwTFYBOeKA==} + /@modern-js/runtime-utils@2.39.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-t9hPPWLYEZlCeumKE64QkjTKsh3pmyzvXfwVush/BE5hcqNUdow6ToWNw0zLsWk0XxVeHfOsdtI8vaCAbwmqFA==} peerDependencies: react: '>=17.0.0' react-dom: '>=17.0.0' @@ -12827,62 +12592,44 @@ packages: react-dom: optional: true dependencies: - '@modern-js/utils': 2.39.0 - '@remix-run/router': 1.8.0 + '@modern-js/utils': 2.39.2 + '@remix-run/router': 1.10.0 '@swc/helpers': 0.5.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router-dom: 6.15.0(react-dom@18.2.0)(react@18.2.0) + react-router-dom: 6.17.0(react-dom@18.2.0)(react@18.2.0) serialize-javascript: 6.0.1 dev: true - /@modern-js/server-core@2.39.0: - resolution: {integrity: sha512-esBXaOM9/hsH5SmVHnlRrEZSaSSnyi7IIRaLqJDq0awSmNcfgO1ndCy4rBLE7g8Q1ZvR7FT12oX5yXrzDH/B0g==} + /@modern-js/server-core@2.39.2: + resolution: {integrity: sha512-iYXRBM2OlkxEw49RigYuwFij1MRMTPbNQjsPRn/qJXt+TR7F9HGJ6R9BxVLFlSA8Oi8tzZtMGENNa/Ro1rIy0w==} dependencies: - '@modern-js/plugin': 2.39.0 - '@modern-js/utils': 2.39.0 + '@modern-js/plugin': 2.39.2 + '@modern-js/utils': 2.39.2 '@swc/helpers': 0.5.1 dev: true - /@modern-js/server-utils@2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-s3c15lhv6MOpgd4st6o1eiL0hp7o4Qsi6Qz3jp2WkUm9TgqHPzyxlnruAhWR5+EGHrHi6HK8ywHqjBHrinsFCA==} + /@modern-js/server-utils@2.39.2: + resolution: {integrity: sha512-xM/O6d1+LCd0U2gNL6ATwYQxMH5lDuOtBOTl+WZFiXpTRHarGBL6JqUw3MDuaE0O9N4uB7Bhfg/GqdWqrhxAxg==} dependencies: '@babel/core': 7.23.2 '@babel/plugin-proposal-decorators': 7.23.2(@babel/core@7.23.2) '@babel/preset-env': 7.22.15(@babel/core@7.23.2) '@babel/preset-react': 7.22.15(@babel/core@7.23.2) '@babel/preset-typescript': 7.23.2(@babel/core@7.23.2) - '@modern-js/babel-compiler': 2.39.0 - '@modern-js/babel-plugin-module-resolver': 2.39.0 - '@modern-js/utils': 2.39.0 - '@rsbuild/babel-preset': 0.0.9(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@modern-js/babel-compiler': 2.39.2 + '@modern-js/babel-plugin-module-resolver': 2.39.2 + '@modern-js/utils': 2.39.2 + '@rsbuild/babel-preset': 0.0.7 '@swc/helpers': 0.5.1 babel-plugin-transform-typescript-metadata: 0.3.2(@babel/core@7.23.2) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - - '@swc/core' - - '@swc/css' - - '@types/express' - - bufferutil - - clean-css - - csso - - debug - - devcert - - esbuild - - lightningcss - - react - - react-dom - supports-color - - ts-node - - tsconfig-paths - - uglify-js - - utf-8-validate - - webpack-cli dev: true - /@modern-js/server@2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-Q4c8qLTB1nZ88z4/+O5gdMd9FBQP5+Mrw5wLqb7F0iLQnYB+FfE/lEwEiCiCDCPJ6hemZrcYRc6hSU2q1ae3fw==} + /@modern-js/server@2.39.2(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-bVl+Ipr5FzPS/k79HmN7t0bWyrNfK7cx/wsoo876WxwDlnHPG9vNwMpSK5S3XqMUwM+sMMAVpLYdC/5BMU68Iw==} peerDependencies: devcert: ^1.0.0 ts-node: ^10.1.0 @@ -12897,37 +12644,28 @@ packages: dependencies: '@babel/core': 7.23.2 '@babel/register': 7.22.15(@babel/core@7.23.2) - '@modern-js/prod-server': 2.39.0(react-dom@18.2.0)(react@18.2.0) - '@modern-js/runtime-utils': 2.39.0(react-dom@18.2.0)(react@18.2.0) - '@modern-js/server-utils': 2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@modern-js/types': 2.39.0 - '@modern-js/utils': 2.39.0 + '@modern-js/prod-server': 2.39.2(react-dom@18.2.0)(react@18.2.0) + '@modern-js/runtime-utils': 2.39.2(react-dom@18.2.0)(react@18.2.0) + '@modern-js/server-utils': 2.39.2 + '@modern-js/types': 2.39.2 + '@modern-js/utils': 2.39.2 '@swc/helpers': 0.5.1 axios: 1.2.1 connect-history-api-fallback: 2.0.0 http-compression: 1.0.6 minimatch: 3.1.2 path-to-regexp: 6.2.1 - ts-node: 10.9.1(@types/node@18.11.17)(typescript@5.2.2) + ts-node: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) ws: 8.13.0 transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - - '@swc/core' - - '@swc/css' - '@types/express' - bufferutil - - clean-css - - csso - debug - - esbuild - - lightningcss - react - react-dom - supports-color - - uglify-js - utf-8-validate - - webpack-cli dev: true /@modern-js/swc-plugins-darwin-arm64@0.6.4: @@ -13020,8 +12758,8 @@ packages: '@modern-js/swc-plugins-win32-x64-msvc': 0.6.4 dev: false - /@modern-js/types@2.39.0: - resolution: {integrity: sha512-AuuJXJJIn7+zUDP8LbQ4aCky02jo0iiPY6KZ4VYobJJptG8y750/lrTx3qFVSJOp7MSFfneek/Suwlkz6RpBDQ==} + /@modern-js/types@2.39.2: + resolution: {integrity: sha512-fT+HHDLFykIkvGUMfae/avg9RTy7byQLEAYd6VX8z3YEiHSF+EnQ2/9tL9PBEaR5TNdrMJ7Km7BSEX0slYcC2Q==} dev: true /@modern-js/utils@2.37.2: @@ -13032,8 +12770,8 @@ packages: lodash: 4.17.21 rslog: 1.1.0 - /@modern-js/utils@2.39.0: - resolution: {integrity: sha512-k8J4eYgguKRHbJd4gON9DDzxX8Cmb7BS2lOGf6Uqsd4T8/KkfTl1C0qTO9Jso63K7RJJpw6dKGUQEp46qWelBA==} + /@modern-js/utils@2.39.2: + resolution: {integrity: sha512-51Uv2oueWru4BvoE7VHai03wT0VZ1VFNPrDXR3Rd3DanRdM5BDBs28mB6+pz68SFQPjK7/f2ZgqRr0FjGWhUvg==} dependencies: '@swc/helpers': 0.5.1 caniuse-lite: 1.0.30001559 @@ -14889,11 +14627,6 @@ packages: engines: {node: '>=14'} dev: false - /@remix-run/router@1.8.0: - resolution: {integrity: sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==} - engines: {node: '>=14.0.0'} - dev: true - /@remix-run/server-runtime@1.13.0: resolution: {integrity: sha512-gjIW3XCeIlOt3rrOZMD6HixQydRgs1SwYjP99ZAVruG2+gNq/tL2OusMFYTLvtWrybt215tPROyF/6iTLsaO3g==} engines: {node: '>=14'} @@ -14996,97 +14729,43 @@ packages: core-js: 3.32.2 transitivePeerDependencies: - supports-color - dev: false - /@rsbuild/babel-preset@0.0.9(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-ysxT8XcKYNeIkBhPmmWE7ib9HsBT+Us6bjhTkGG9wRGiX5sWtSHH4kAacI0EjY9V0BZKaiJPNkibVypNaSk4eA==} - dependencies: - '@babel/core': 7.23.2 - '@babel/plugin-proposal-decorators': 7.23.2(@babel/core@7.23.2) - '@babel/plugin-proposal-export-default-from': 7.22.17(@babel/core@7.23.2) - '@babel/plugin-proposal-partial-application': 7.22.5(@babel/core@7.23.2) - '@babel/plugin-proposal-pipeline-operator': 7.22.15(@babel/core@7.23.2) - '@babel/plugin-transform-runtime': 7.23.2(@babel/core@7.23.2) - '@babel/preset-env': 7.23.2(@babel/core@7.23.2) - '@babel/preset-typescript': 7.23.2(@babel/core@7.23.2) - '@babel/runtime': 7.23.2 - '@babel/types': 7.23.0 - '@rsbuild/shared': 0.0.9(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@types/babel__core': 7.20.3 - babel-plugin-dynamic-import-node: 2.3.3 - core-js: 3.32.2 - transitivePeerDependencies: - - '@parcel/css' - - '@swc/core' - - '@swc/css' - - '@types/express' - - bufferutil - - clean-css - - csso - - debug - - devcert - - esbuild - - lightningcss - - react - - react-dom - - supports-color - - ts-node - - tsconfig-paths - - uglify-js - - utf-8-validate - - webpack-cli - dev: true - - /@rsbuild/core@0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-6QGts4Cp2/YjLV9OOehbPNt3URG4iFKgvdvtrfayTvS4FZglqiHLuYF9EeznwbjckHsRWYwMFfmQQeEVXVxMMQ==} + /@rsbuild/core@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-bDvJm2605Y+hmWph83X5Mm7btUpnl8TJgV7w2IADQ2E1Wx+99PGEahW3Hz7Puy9FMkziCAUA0VIvjEoHZRQcBw==} engines: {node: '>=14.0.0'} hasBin: true dependencies: - '@modern-js/server': 2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rsbuild/shared': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rspack/core': 0.3.8 - '@rspack/dev-client': 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) - '@rspack/plugin-html': 0.3.8(@rspack/core@0.3.8) + '@modern-js/server': 2.39.2(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rsbuild/shared': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rspack/core': 0.3.10 commander: 10.0.1 filesize: 8.0.7 gzip-size: 6.0.0 + html-webpack-plugin: 5.5.3(webpack@5.89.0) jiti: 1.20.0 lodash: 4.17.21 open: 8.4.0 pkg-up: 3.1.0 postcss: 8.4.31 - rspack-manifest-plugin: 5.0.0-alpha0(webpack@5.88.1) + rspack-manifest-plugin: 5.0.0-alpha0(webpack@5.89.0) semver: 7.5.4 - strip-ansi: 6.0.1 - webpack: 5.88.1(esbuild@0.17.19) + webpack: 5.89.0(esbuild@0.17.19) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true /@rsbuild/monorepo-utils@0.0.7: @@ -15100,31 +14779,23 @@ packages: p-map: 4.0.0 dev: false - /@rsbuild/plugin-react@0.0.10(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): - resolution: {integrity: sha512-KEXKy7+QzAYn9tHu3CeAoWJSdWubSRE7jkuHGIJCHA+ypkpmtw875zbgQ4PX7lJtRoq/LdeRwNKAVFm5jEksvQ==} + /@rsbuild/plugin-react@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + resolution: {integrity: sha512-G8rXlh0XYLrHrFzyr8vi6ePSrGSFqlYd7M6hMRbpBTRNUpoH4ftgmtSOVuuLAwrCDzZbjRRW9lHrrmoKwvScXg==} dependencies: - '@babel/preset-react': 7.22.15(@babel/core@7.23.2) - '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack@5.88.1) - '@rsbuild/shared': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rspack/plugin-react-refresh': 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) - babel-plugin-transform-react-remove-prop-types: 0.4.24 + '@rsbuild/shared': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rspack/plugin-react-refresh': 0.3.10(react-refresh@0.14.0)(webpack@5.88.1) + react-refresh: 0.14.0 transitivePeerDependencies: - - '@babel/core' - - '@parcel/css' + - '@babel/traverse' - '@swc/core' - - '@swc/css' - '@types/express' - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - - react-refresh - sockjs-client - supports-color - ts-node @@ -15139,25 +14810,21 @@ packages: - webpack-plugin-serve dev: true - /@rsbuild/plugin-svgr@0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): - resolution: {integrity: sha512-rfeXjxnfmIhQTyGTLl9b3KieUUHLHf6Qd/ZF6UIc7/Ddkif8uMCqdSJ8v7uUO9U+g7/AEjv1AESAe1+7t8ULAg==} + /@rsbuild/plugin-svgr@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + resolution: {integrity: sha512-P09Fx3Ep05ir35LkLXnpHVZRPdjavqS8qA0ngQpkYC+eX+c5PGy4SWpyXMoWRqY2+fOiYCiHp+WV0Mc/HxFxJg==} dependencies: - '@rsbuild/shared': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rsbuild/shared': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) '@svgr/webpack': 8.0.1 url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.88.1) transitivePeerDependencies: - - '@parcel/css' + - '@babel/traverse' - '@swc/core' - - '@swc/css' - '@types/express' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - file-loader - - lightningcss - react - react-dom - supports-color @@ -15169,48 +14836,35 @@ packages: - webpack-cli dev: true - /@rsbuild/shared@0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-NIAwhUPk7UVnJj/2g0WaxrEX70csjBBawakr+oo1xBMAv6G+8RXc0aKv8AXdQPl0og6hjU4wBVWaDAKA2ExWlA==} + /@rsbuild/shared@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-pWueZC91EQYZokeAY8DNi1ikoyRkwWvcxvSIfA2QMzpC8LETrwvUeOfXskPAQMcxSrgJKhZoxecZIl1jwMVdWw==} dependencies: - '@modern-js/prod-server': 2.39.0(react-dom@18.2.0)(react@18.2.0) - '@modern-js/server': 2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@types/babel__core': 7.20.3 - '@types/fs-extra': 11.0.2 + '@modern-js/prod-server': 2.39.2(react-dom@18.2.0)(react@18.2.0) + '@modern-js/server': 2.39.2(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) acorn: 8.10.0 browserslist: 4.22.1 - caniuse-lite: 1.0.30001559 chalk: 4.1.2 - css-minimizer-webpack-plugin: 5.0.1(esbuild@0.17.19)(webpack@5.88.1) cssnano: 6.0.1(postcss@8.4.31) deepmerge: 4.3.1 fs-extra: 11.1.1 - htmlparser2: 9.0.0 line-diff: 2.1.1 lodash: 4.17.21 pkg-up: 3.1.0 postcss: 8.4.31 rslog: 1.1.0 semver: 7.5.4 - source-map: 0.7.4 - upath: 2.0.1 url-join: 4.0.1 - webpack: 5.88.1(esbuild@0.17.19) + webpack: 5.89.0(esbuild@0.17.19) webpack-chain: /webpack-5-chain@8.0.1 webpack-sources: 3.2.3 - zod: 3.22.3 - zod-validation-error: 1.2.0(zod@3.22.3) transitivePeerDependencies: - - '@parcel/css' + - '@babel/traverse' - '@swc/core' - - '@swc/css' - '@types/express' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - supports-color @@ -15228,146 +14882,95 @@ packages: chalk: 4.1.2 deepmerge: 4.3.1 fs-extra: 11.1.1 - dev: false - /@rsbuild/shared@0.0.9(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-/Wj0k/3GLSrbGVrexQFr3MhQDxolewZ+v5D0SfICtu2c4QWsKYrkBXZg+3aSQZuTE5ElUMKImyq3C3x5bSJPJA==} - dependencies: - '@modern-js/prod-server': 2.39.0(react-dom@18.2.0)(react@18.2.0) - '@modern-js/server': 2.39.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@types/babel__core': 7.20.3 - '@types/fs-extra': 11.0.2 - acorn: 8.10.0 - browserslist: 4.22.1 - caniuse-lite: 1.0.30001559 - chalk: 4.1.2 - css-minimizer-webpack-plugin: 5.0.1(esbuild@0.17.19)(webpack@5.88.1) - cssnano: 6.0.1(postcss@8.4.31) - deepmerge: 4.3.1 - fs-extra: 11.1.1 - htmlparser2: 9.0.0 - line-diff: 2.1.1 - lodash: 4.17.21 - pkg-up: 3.1.0 - postcss: 8.4.31 - rslog: 1.1.0 - semver: 7.5.4 - source-map: 0.7.4 - upath: 2.0.1 - url-join: 4.0.1 - webpack: 5.88.1(esbuild@0.17.19) - webpack-chain: /webpack-5-chain@8.0.1 - webpack-sources: 3.2.3 - zod: 3.22.3 - zod-validation-error: 1.2.0(zod@3.22.3) - transitivePeerDependencies: - - '@parcel/css' - - '@swc/core' - - '@swc/css' - - '@types/express' - - bufferutil - - clean-css - - csso - - debug - - devcert - - esbuild - - lightningcss - - react - - react-dom - - supports-color - - ts-node - - tsconfig-paths - - uglify-js - - utf-8-validate - - webpack-cli - dev: true - - /@rspack/binding-darwin-arm64@0.3.8: - resolution: {integrity: sha512-qvxzkUaqAbVmwJuVW3p7o1XVT5z2MbwpC9VZQr1fAd7/vEdDfiMm8Vz1AcY/WKxrUjX6rwNs3Ix1SdSBveThKQ==} + /@rspack/binding-darwin-arm64@0.3.10: + resolution: {integrity: sha512-PFBjZ624tkB90wkfh3zwyKt6bVfdVS6HWvLOmWV1Le8NtRuvH60FSutMJQK0nX3a5QIxqt3ScSoRTbpXqGV4hw==} cpu: [arm64] os: [darwin] requiresBuild: true optional: true - /@rspack/binding-darwin-x64@0.3.8: - resolution: {integrity: sha512-Ae3cJiTcXuBTZdLv+vDtbjGcx5D0rizg7nuRmtFmDvtPjYgFE9y0F+VzajQVySqvtAO8kowryC8BYjqnJ7A2Rg==} + /@rspack/binding-darwin-x64@0.3.10: + resolution: {integrity: sha512-ZpbdR3PnRlGQ9JYInEG8uBD3RY9Mh8/W//sc+9Zn+gmLZK3k/ehTKNRzxjoxJpf6mdueC/xFIjafLGQj7A3z/g==} cpu: [x64] os: [darwin] requiresBuild: true optional: true - /@rspack/binding-linux-arm64-gnu@0.3.8: - resolution: {integrity: sha512-aZ/cbLq8j85t4TLA94Oj+urPMDlBb+FHce4YGatX6+0juzxNUY23rSRB6pvtQz6DkFxFHDayiOcLkk8loiNiUQ==} + /@rspack/binding-linux-arm64-gnu@0.3.10: + resolution: {integrity: sha512-LXV3131ZQ0KXacQ2oZG1GnzlxcrKGcEgQ9yTmBllQdDQ/x5mal9lYx1065tWro6Cw6FHUSG0dlRuAnPcl3rtgw==} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@rspack/binding-linux-arm64-musl@0.3.8: - resolution: {integrity: sha512-fcwnXl6BqnZ21LizWdcuFz1CNHHuMRoll1z5nfnWn5yzNo5eprXNqFgw0aC5R15Gri/GaiT7bZA7FXAU7eGR8g==} + /@rspack/binding-linux-arm64-musl@0.3.10: + resolution: {integrity: sha512-iFML4S5QeMNFbX50DZpbKbmTRWnGndbsXsGLgAfaCbZFMfo2iWPwQc/HSAb1WLETfZg6GQF0Pyg20bn3o9z9Ig==} cpu: [arm64] os: [linux] requiresBuild: true optional: true - /@rspack/binding-linux-x64-gnu@0.3.8: - resolution: {integrity: sha512-W7Kqf13GE/mT/HiQfnLMCkrNxekaJuk53sOYVehxBJ6J5NKvL/uzBvPa3m2EtbhUUkBnR0t87Yp04YS9JrnkeA==} + /@rspack/binding-linux-x64-gnu@0.3.10: + resolution: {integrity: sha512-9m+3kwqU15LARiAiqa9wLgP5e+UkgdWPKfBtpLJCvmXDpbyPio1RDRaF+21Mre2pkaXhMGkHPXda/yBulJsY2Q==} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@rspack/binding-linux-x64-musl@0.3.8: - resolution: {integrity: sha512-KIRAj7WQ3JLaCENctA1aiREw9PPuLAFMxkXPGm2YeszfLhv+o3Suehc0OvsPcGeXg/laGKQzl0RV6dHyKfocQg==} + /@rspack/binding-linux-x64-musl@0.3.10: + resolution: {integrity: sha512-7p8annA+W1iq4bEnRDlGTra3VFBYqKmMJaYBudIe7LTbtiayZPcqo1MmxyO4EJ+L711DX6Z6imid1FNn31cijA==} cpu: [x64] os: [linux] requiresBuild: true optional: true - /@rspack/binding-win32-arm64-msvc@0.3.8: - resolution: {integrity: sha512-PHlMQu0uiUBiJCpxR1ql6HJBeFpsombiPRquoN2d/a5WfkETDX04BnfN7XW8Fe9j164iCe5yU0Xwk0gaaJp3Uw==} + /@rspack/binding-win32-arm64-msvc@0.3.10: + resolution: {integrity: sha512-IfRa6wbrsHDY8h1uEEU5dytIL0Uf3URYqk+RJG0dS6gLQFDlpo/VRKaA4fDCcbt/8MwxVM2XAMVGNWD/iSsNMQ==} cpu: [arm64] os: [win32] requiresBuild: true optional: true - /@rspack/binding-win32-ia32-msvc@0.3.8: - resolution: {integrity: sha512-ln3js9wOQLJi9E1MVNtLui56a3pXmSnEags9YJhZs5ZMT5SJGsofoa0zXNxeTMuRQ0Gx5w0tVSXZXgyVUm1OdA==} + /@rspack/binding-win32-ia32-msvc@0.3.10: + resolution: {integrity: sha512-nm6s1yBhS0Pd6LrojDfxC63G9g1HZ/MDP4faViqXWGcyVJ7m0ZemCydiuo2OyDetycTzNY0vXaESipcvptysdw==} cpu: [ia32] os: [win32] requiresBuild: true optional: true - /@rspack/binding-win32-x64-msvc@0.3.8: - resolution: {integrity: sha512-UK70L1vsp5St0qPATB1UdrFh9Ax/G1VpWx3Fp4W5iNzfcLBDKbCpEyCetxZhjHCcFVfbSE74X34NzgDiLDFrHA==} + /@rspack/binding-win32-x64-msvc@0.3.10: + resolution: {integrity: sha512-OjZkoDfNW0dKr3mhEDHLDRstgbOJPZPm+adXssVQWGm1XZK6OlbOGnbOtkcTL7+8fnUA/c2mvkO553Ze7R01ZQ==} cpu: [x64] os: [win32] requiresBuild: true optional: true - /@rspack/binding@0.3.8: - resolution: {integrity: sha512-urM1+I6BL1jv6hUZ44Nv2kYYWVIQxRIJoZFrlubo1XhTJqTFUPNF/7E/ritNC9J6gxxZMQLc0NLJz4jdUTaUbg==} + /@rspack/binding@0.3.10: + resolution: {integrity: sha512-ID7jN3wUPubGFVgEU1zH5/zSBQwJOPGGQ8YcuKlxNT9Qvz+/g26vZk73CJh/y1gO/Be+awCPZG5wq13mLt6txQ==} optionalDependencies: - '@rspack/binding-darwin-arm64': 0.3.8 - '@rspack/binding-darwin-x64': 0.3.8 - '@rspack/binding-linux-arm64-gnu': 0.3.8 - '@rspack/binding-linux-arm64-musl': 0.3.8 - '@rspack/binding-linux-x64-gnu': 0.3.8 - '@rspack/binding-linux-x64-musl': 0.3.8 - '@rspack/binding-win32-arm64-msvc': 0.3.8 - '@rspack/binding-win32-ia32-msvc': 0.3.8 - '@rspack/binding-win32-x64-msvc': 0.3.8 - - /@rspack/core@0.3.8: - resolution: {integrity: sha512-KUYYqm+PKVJBnnLuB+t0RCu0LhWm8mM3K3/VIGSATUi66Xgn7mxbSoab0IrCXWGekPUpUrmoA7hLg06wMtVJlQ==} - dependencies: - '@rspack/binding': 0.3.8 + '@rspack/binding-darwin-arm64': 0.3.10 + '@rspack/binding-darwin-x64': 0.3.10 + '@rspack/binding-linux-arm64-gnu': 0.3.10 + '@rspack/binding-linux-arm64-musl': 0.3.10 + '@rspack/binding-linux-x64-gnu': 0.3.10 + '@rspack/binding-linux-x64-musl': 0.3.10 + '@rspack/binding-win32-arm64-msvc': 0.3.10 + '@rspack/binding-win32-ia32-msvc': 0.3.10 + '@rspack/binding-win32-x64-msvc': 0.3.10 + + /@rspack/core@0.3.10: + resolution: {integrity: sha512-1mwLC9zyF15kpOQzxsrG5zjPxOSQHnKW/MUXvx4ak0JuZCK3uJgLsK8Jn8tSqvEeh2rWvm7k0S6GJIFl2F2jvA==} + dependencies: + '@rspack/binding': 0.3.10 '@swc/helpers': 0.5.1 - browserslist: 4.21.10 + browserslist: 4.22.1 compare-versions: 6.0.0-rc.1 enhanced-resolve: 5.12.0 graceful-fs: 4.2.10 + json-parse-even-better-errors: 3.0.0 neo-async: 2.6.2 + querystring: 0.2.1 react-refresh: 0.14.0 schema-utils: 4.2.0 tapable: 2.2.1 @@ -15378,15 +14981,15 @@ packages: zod: 3.22.3 zod-validation-error: 1.2.0(zod@3.22.3) - /@rspack/dev-client@0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1): - resolution: {integrity: sha512-t/4b6rzMh13pi0JARj85xaU02FNihUmGGpsHsG3UdqM1pVzS3z6Kl6h0FrmMG8NNJAvoTT0p6drltdijIxb6Qw==} + /@rspack/dev-client@0.3.10(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-7jD5IsQkUL8S54LmyIKMlPmBAW2eQ+KBMDzK9JG9I2rgAAPb4tGHgHMj4GF+/dQyAOzmx521cFmDkz+bJymU7Q==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: react-refresh: optional: true dependencies: - '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1) + '@rspack/plugin-react-refresh': 0.3.10(react-refresh@0.14.0)(webpack@5.88.1) react-refresh: 0.14.0 transitivePeerDependencies: - '@types/webpack' @@ -15398,15 +15001,15 @@ packages: - webpack-plugin-serve dev: false - /@rspack/dev-client@0.3.8(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-L+5ZdHj6DXKg9yaIjoDhnqPAXEXxuyvUJBNb8NVzshKqLhKYsAPQCSOtGLb984b0kVdh53lckZb3vwRbfei3lw==} + /@rspack/dev-client@0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1): + resolution: {integrity: sha512-t/4b6rzMh13pi0JARj85xaU02FNihUmGGpsHsG3UdqM1pVzS3z6Kl6h0FrmMG8NNJAvoTT0p6drltdijIxb6Qw==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: react-refresh: optional: true dependencies: - '@rspack/plugin-react-refresh': 0.3.8(react-refresh@0.14.0)(webpack@5.88.1) + '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1) react-refresh: 0.14.0 transitivePeerDependencies: - '@types/webpack' @@ -15416,24 +15019,26 @@ packages: - webpack-dev-server - webpack-hot-middleware - webpack-plugin-serve + dev: false - /@rspack/plugin-html@0.3.8(@rspack/core@0.3.8): - resolution: {integrity: sha512-eHZo+Ah2vrsS9pxT5Xue7SjSMN8joSNHDLui95Pnni1oj1ESuCojhxPCRxUhbort7xwsGYpnhfhsJZoHL8qN4w==} + /@rspack/plugin-html@0.3.10(@rspack/core@0.3.10): + resolution: {integrity: sha512-zTbcoigqKG8UChq4nBcr47dUZiIBiWwKhqXX++6k7AocyUbBwcVL6tGOtBeSXTMH8IHDazgCACLfbzX+FyKMaw==} peerDependencies: - '@rspack/core': 0.3.8 + '@rspack/core': 0.3.10 peerDependenciesMeta: '@rspack/core': optional: true dependencies: - '@rspack/core': 0.3.8 + '@rspack/core': 0.3.10 '@types/html-minifier-terser': 7.0.0 html-minifier-terser: 7.0.0 lodash.template: 4.5.0 parse5: 7.1.1 tapable: 2.2.1 + dev: false - /@rspack/plugin-react-refresh@0.3.8(react-refresh@0.14.0)(webpack@5.88.1): - resolution: {integrity: sha512-HF6liXhYJqXRYlQNRNTu1YpR4QykOAjh9/8bt6kYKsWZPj5D1zcPH+evpvF7QxcRpfSRXRujyHOXMIKBLTBqIQ==} + /@rspack/plugin-react-refresh@0.3.10(react-refresh@0.14.0)(webpack@5.88.1): + resolution: {integrity: sha512-oeCsfEXRguZox5rNyV3ifbyk3G578YZ+5l0ZNCk/tDF5xQnMeJ9vRJ7iFYcHVcuZhZQhuxCwLzeXJ5RNWleqig==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' peerDependenciesMeta: @@ -15452,8 +15057,8 @@ packages: - webpack-hot-middleware - webpack-plugin-serve - /@rspress/core@1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1)(webpack@5.88.1): - resolution: {integrity: sha512-B9N1oDYd29ZzwIxAdTC30sV36XDSZsYw8DEXVmKQKGxPcHdDmEtML8lXzTEcyvUWHs882wts1trgMax1vV+ijA==} + /@rspress/core@1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.88.1): + resolution: {integrity: sha512-HiH0T6Zrm0csvUifpuwNJZj64T6LRMKD9aSge6GK2So/GAAiB/Itq4o3tTMDT6i7mejxvyh13A/9w8jjEboUcw==} engines: {node: '>=14.17.6'} dependencies: '@loadable/component': 5.15.2(react@18.2.0) @@ -15461,17 +15066,17 @@ packages: '@mdx-js/mdx': 2.2.1 '@mdx-js/react': 2.2.1(react@18.2.0) '@modern-js/utils': link:packages/toolkit/utils - '@rsbuild/core': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) - '@rsbuild/plugin-react': 0.0.10(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) - '@rsbuild/plugin-svgr': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + '@rsbuild/core': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rsbuild/plugin-react': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + '@rsbuild/plugin-svgr': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) '@rspress/mdx-rs': 0.4.1 - '@rspress/plugin-auto-nav-sidebar': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) - '@rspress/plugin-container-syntax': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) - '@rspress/plugin-last-updated': 1.4.0 - '@rspress/plugin-medium-zoom': 1.4.0(@rspress/runtime@1.4.0) - '@rspress/runtime': 1.4.0(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1) - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) - '@rspress/theme-default': 1.4.0(esbuild@0.17.19)(postcss@8.4.21)(react-refresh@0.14.0)(ts-node@10.9.1)(webpack@5.88.1) + '@rspress/plugin-auto-nav-sidebar': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/plugin-container-syntax': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/plugin-last-updated': 1.5.0 + '@rspress/plugin-medium-zoom': 1.5.0(@rspress/runtime@1.5.0) + '@rspress/runtime': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/theme-default': 1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.88.1) '@types/compression': 1.7.2 '@types/polka': 0.5.4 autoprefixer: 10.4.13(postcss@8.4.21) @@ -15519,23 +15124,16 @@ packages: unist-util-visit-children: 2.0.1 yaml-front-matter: 4.1.1 transitivePeerDependencies: - - '@babel/core' - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - '@types/webpack' - bufferutil - canvas - - clean-css - - csso - debug - devcert - esbuild - file-loader - - lightningcss - - react-refresh - sockjs-client - supports-color - ts-node @@ -15646,175 +15244,127 @@ packages: '@rspress/mdx-rs-win32-x64-msvc': 0.4.1 dev: true - /@rspress/plugin-auto-nav-sidebar@1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-tRnBk89eGK2hRBVlCeRgISJzyX7H9SgGD8yGB7ycFW4Hg0tRU9tpKcg04hVkOQAWi58tFPYUYRDXJXrL6l7LHw==} + /@rspress/plugin-auto-nav-sidebar@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-HJtO4ScQHSWR2cTStt8bQiPbed0oRG9SuEEntLEyA1tNXYu1i8bRqx1HaOjSWQVUVozvJxX1BOEdzkdwlfgKNw==} engines: {node: '>=14.17.6'} dependencies: '@modern-js/utils': link:packages/toolkit/utils - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true - /@rspress/plugin-container-syntax@1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-28ztdem36mYfdeBglkLCfzCzOssmyV/eDJaJjRP6ox2FH5GZVvfCV51ewHdKjrFGDtkRNHmK1ZRtq31JHV5zhw==} + /@rspress/plugin-container-syntax@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-APetWi3GHq1KttT912oozNEVyb5M2rEnpE+Miz/58ThWf3l3nQzyGS3Nl2uKJOTYm11x2Y80ioWLXLNTZnPzyg==} engines: {node: '>=14.17.6'} dependencies: - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true - /@rspress/plugin-last-updated@1.4.0: - resolution: {integrity: sha512-bp/7gTJayI1iid7OPec6mrGfd2JoATJmW4X5AlBV+Zr3wyimov6oc1BzYdjw9LSfL/mSshwiwK3WMD8dP2FhVA==} + /@rspress/plugin-last-updated@1.5.0: + resolution: {integrity: sha512-4wbXytLqLm3huomIhVgXOOapXazd4UFoZShuZVvlgxYSWtiJLCM8twf3zkC+ew0Qs7vAvElczVb+lsaWeDMVdw==} engines: {node: '>=14.17.6'} dependencies: '@modern-js/utils': link:packages/toolkit/utils dev: true - /@rspress/plugin-medium-zoom@1.4.0(@rspress/runtime@1.4.0): - resolution: {integrity: sha512-KlY7XT5EJ7zWCy1MjfgB8N3k7M5kuhXZmlzw3I6DqeXL+c995d4H1fVWThZlDaVVcAFbI9pJDpUemDtFItW+8w==} + /@rspress/plugin-medium-zoom@1.5.0(@rspress/runtime@1.5.0): + resolution: {integrity: sha512-ygBFJcIl4Yk34c/tZzqidAI0FV+SPEat+r5yzdA2nYBUY0kKTd3KXucLg+37kqM5q8+acLropERQ3reezCJ+xQ==} engines: {node: '>=14.17.6'} peerDependencies: '@rspress/runtime': ^1.0.2 dependencies: - '@rspress/runtime': 1.4.0(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1) + '@rspress/runtime': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1) medium-zoom: 1.0.8 dev: true - /@rspress/runtime@1.4.0(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1): - resolution: {integrity: sha512-aCLqqpGxyWzTxZcN+SLXJr4zm6rd8j5TP/iIpFo/xivUqmgQSkmN33d8mUlxFRKmON20KV+Bm96/aO8AvQAE2g==} + /@rspress/runtime@1.5.0(esbuild@0.17.19)(ts-node@10.9.1): + resolution: {integrity: sha512-B/TaLz+q7K3O5ef/i295q2lQxsj6BeNBial4uo5KtBkxxxizDct8DK73B/slvQ78wZvQtWvsM3xL2wBPaHSxKQ==} engines: {node: '>=14.17.6'} dependencies: - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-helmet-async: 1.3.0(react-dom@18.2.0)(react@18.2.0) react-router-dom: 6.17.0(react-dom@18.2.0)(react@18.2.0) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true - /@rspress/shared@1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1): - resolution: {integrity: sha512-X9fYuIEBjWrf9nvt/SifCQEO9dbqqGOSu50UtW58ddDGWf3XQDmxgR+elZuoTRTyTxyy3YwKlkieRMJXTUGMUg==} + /@rspress/shared@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1): + resolution: {integrity: sha512-k2Hf551kyKGULNBP66qBkM29SV7/iBrEg/UGCf36WWQjtnjopyz3gF4G4a1XphouhfG0mLMoodJ3uCZqxhd4lg==} dependencies: - '@rsbuild/core': 0.0.10(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rsbuild/core': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) chalk: 4.1.2 rslog: 1.1.0 unified: 10.1.2 transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - react - react-dom - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true - /@rspress/theme-default@1.4.0(esbuild@0.17.19)(postcss@8.4.21)(react-refresh@0.14.0)(ts-node@10.9.1)(webpack@5.88.1): - resolution: {integrity: sha512-/CPpvgYzMKDQhh/jPsIMJfv44TmbiqkR0Et29npxLj967ciPG4zwEfcUfQrFavpF34geMt+Gz2dV6VIQehD1uA==} + /@rspress/theme-default@1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.88.1): + resolution: {integrity: sha512-lXfZqjok6pBOahoILIMr8iT8PjT+W+65vBDQDIbugUWHTCKl+LUwyrbaNILFyrYCnjA6+Uv+XwOymrwUrE455Q==} engines: {node: '>=14.17.6'} dependencies: '@mdx-js/react': 2.2.1(react@18.2.0) - '@rspress/runtime': 1.4.0(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1) - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/runtime': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) body-scroll-lock: 4.0.0-beta.0 copy-to-clipboard: 3.3.3 flexsearch: 0.6.32 @@ -15836,33 +15386,21 @@ packages: tailwindcss: 3.2.7(postcss@8.4.21)(ts-node@10.9.1) transitivePeerDependencies: - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - - '@types/webpack' - bufferutil - canvas - - clean-css - - csso - debug - devcert - esbuild - - lightningcss - postcss - - react-refresh - - sockjs-client - supports-color - ts-node - tsconfig-paths - - type-fest - uglify-js - utf-8-validate - webpack - webpack-cli - - webpack-dev-server - - webpack-hot-middleware - - webpack-plugin-serve dev: true /@rushstack/node-core-library@3.48.0: @@ -17335,6 +16873,7 @@ packages: /@types/html-minifier-terser@7.0.0: resolution: {integrity: sha512-hw3bhStrg5e3FQT8qZKCJTrzt/UbEaunU1xRWJ+aNOTmeBMvE3S4Ml2HiiNnZgL8izu0LFVkHUoPFXL1s5QNpQ==} + dev: false /@types/http-assert@1.5.3: resolution: {integrity: sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==} @@ -19271,19 +18810,6 @@ packages: transitivePeerDependencies: - supports-color - /babel-plugin-polyfill-corejs2@0.4.6(@babel/core@7.23.2): - resolution: {integrity: sha512-jhHiWVZIlnPbEUKSSNb9YoWcQGdlTLq7z1GHL4AjFxaoOUMuuEVJ+Y4pAaQUGOGk93YsVCKPbqbfw3m0SM6H8Q==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - dependencies: - '@babel/compat-data': 7.23.2 - '@babel/core': 7.23.2 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.2) - semver: 6.3.1 - transitivePeerDependencies: - - supports-color - dev: true - /babel-plugin-polyfill-corejs3@0.5.2(@babel/core@7.23.0): resolution: {integrity: sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==} peerDependencies: @@ -19307,18 +18833,6 @@ packages: transitivePeerDependencies: - supports-color - /babel-plugin-polyfill-corejs3@0.8.6(@babel/core@7.23.2): - resolution: {integrity: sha512-leDIc4l4tUgU7str5BWLS2h8q2N4Nf6lGZP6UrNDxdtfF2g69eJ5L0H7S8A5Ln/arfFAfHor5InAdZuIOwZdgQ==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.2) - core-js-compat: 3.33.2 - transitivePeerDependencies: - - supports-color - dev: true - /babel-plugin-polyfill-regenerator@0.5.2(@babel/core@7.23.2): resolution: {integrity: sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==} peerDependencies: @@ -19329,17 +18843,6 @@ packages: transitivePeerDependencies: - supports-color - /babel-plugin-polyfill-regenerator@0.5.3(@babel/core@7.23.2): - resolution: {integrity: sha512-8sHeDOmXC8csczMrYEOf0UTNa4yE2SxV5JGeT/LP1n0OYVDUUFPxG9vdk2AlDlIit4t+Kf0xCtpgXPBwnn/9pw==} - peerDependencies: - '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0 - dependencies: - '@babel/core': 7.23.2 - '@babel/helper-define-polyfill-provider': 0.4.3(@babel/core@7.23.2) - transitivePeerDependencies: - - supports-color - dev: true - /babel-plugin-styled-components@1.13.3(styled-components@5.3.5): resolution: {integrity: sha512-meGStRGv+VuKA/q0/jXxrPNWEm4LPfYIqxooDTdmh8kFsP/Ph7jJG5rUPwUPX3QHUvggwdbgdGpo88P/rRYsVw==} peerDependencies: @@ -19427,20 +18930,6 @@ packages: resolution: {integrity: sha512-qzxS7/bW/LSiKZzdZw3isPjiVmzXbJLM3ImZZ62WMR3oJQAyqy094Nnb0TA2ZZm65xB7nu0acfTQ99z7wwCDCw==} dev: false - /better-ajv-errors@1.2.0(ajv@8.11.0): - resolution: {integrity: sha512-UW+IsFycygIo7bclP9h5ugkNH8EjCSgqyFB/yQ4Hqqa1OEYDtb0uFIkYE0b6+CjkgJYVM5UKI/pJPxjYe9EZlA==} - engines: {node: '>= 12.13.0'} - peerDependencies: - ajv: 4.11.8 - 8 - dependencies: - '@babel/code-frame': 7.22.13 - '@humanwhocodes/momoa': 2.0.4 - ajv: 8.11.0 - chalk: 4.1.2 - jsonpointer: 5.0.0 - leven: 3.1.0 - dev: true - /better-opn@3.0.2: resolution: {integrity: sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==} engines: {node: '>=12.0.0'} @@ -19975,6 +19464,7 @@ packages: engines: {node: '>= 10.0'} dependencies: source-map: 0.6.1 + dev: false /clean-css@5.2.2: resolution: {integrity: sha512-/eR8ru5zyxKzpBLv9YZvMXgTSSQn7AdkMItMYynsFgGwTveCRVam9IUPFloE85B4vAIj05IuKmmEoV7/AQjT0w==} @@ -20248,6 +19738,7 @@ packages: /commander@9.4.0: resolution: {integrity: sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==} engines: {node: ^12.20.0 || >=14} + dev: false /comment-json@4.2.3: resolution: {integrity: sha512-SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==} @@ -20672,12 +20163,6 @@ packages: dependencies: browserslist: 4.21.10 - /core-js-compat@3.33.2: - resolution: {integrity: sha512-axfo+wxFVxnqf8RvxTzoAlzW4gRoacrHeoFlc9n0x50+7BEyZL/Rt3hicaED1/CEd7I6tPCPVUYcJwCMO5XUYw==} - dependencies: - browserslist: 4.22.1 - dev: true - /core-js-pure@3.26.0: resolution: {integrity: sha512-LiN6fylpVBVwT8twhhluD9TzXmZQQsr2I2eIKtWNbZI1XMfBT7CV18itaN6RA7EtQd/SDdRx/wzvAShX2HvhQA==} requiresBuild: true @@ -20919,6 +20404,7 @@ packages: schema-utils: 4.2.0 serialize-javascript: 6.0.1 webpack: 5.88.1(esbuild@0.17.19) + dev: false /css-select@4.3.0: resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==} @@ -24050,6 +23536,7 @@ packages: param-case: 3.0.4 relateurl: 0.2.7 terser: 5.19.2 + dev: false /html-tags@2.0.0: resolution: {integrity: sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==} @@ -24097,6 +23584,20 @@ packages: tapable: 2.2.1 webpack: 5.88.1(esbuild@0.17.19) + /html-webpack-plugin@5.5.3(webpack@5.89.0): + resolution: {integrity: sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==} + engines: {node: '>=10.13.0'} + peerDependencies: + webpack: ^5.20.0 + dependencies: + '@types/html-minifier-terser': 6.1.0 + html-minifier-terser: 6.1.0 + lodash: 4.17.21 + pretty-error: 4.0.0 + tapable: 2.2.1 + webpack: 5.89.0(esbuild@0.17.19) + dev: true + /html5shiv@3.7.3: resolution: {integrity: sha512-SZwGvLGNtgp8GbgFX7oXEp8OR1aBt5LliX6dG0kdD1kl3KhMonN0QcSa/A3TsTgFewaGCbIryQunjayWDXzxmw==} dev: false @@ -24125,6 +23626,7 @@ packages: domhandler: 5.0.3 domutils: 3.1.0 entities: 4.5.0 + dev: false /htmr@1.0.2(react@18.2.0): resolution: {integrity: sha512-7T9babEHZwECQ2/ouxNPow1uGcKbj/BcbslPGPRxBKIOLNiIrFKq6ELzor7mc4HiexZzdb3izQQLl16bhPR9jw==} @@ -25667,6 +25169,10 @@ packages: /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + /json-parse-even-better-errors@3.0.0: + resolution: {integrity: sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} + /json-schema-traverse@0.4.1: resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==} @@ -25728,11 +25234,6 @@ packages: engines: {'0': node >= 0.2.0} dev: true - /jsonpointer@5.0.0: - resolution: {integrity: sha512-PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg==} - engines: {node: '>=0.10.0'} - dev: true - /jstransformer@1.0.0: resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==} dependencies: @@ -26072,6 +25573,7 @@ packages: /lodash._reinterpolate@3.0.0: resolution: {integrity: sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==} + dev: false /lodash.camelcase@4.3.0: resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==} @@ -26147,11 +25649,13 @@ packages: dependencies: lodash._reinterpolate: 3.0.0 lodash.templatesettings: 4.2.0 + dev: false /lodash.templatesettings@4.2.0: resolution: {integrity: sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==} dependencies: lodash._reinterpolate: 3.0.0 + dev: false /lodash.topath@4.5.2: resolution: {integrity: sha512-1/W4dM+35DwvE/iEd1M9ekewOSTlpFekhw9mhAtrwjVqUr83/ilQiyAvmg4tVX7Unkcfl1KC+i9WdaT4B6aQcg==} @@ -27944,6 +27448,7 @@ packages: resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==} dependencies: entities: 4.5.0 + dev: false /parse5@7.1.2: resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} @@ -28407,7 +27912,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.21 - ts-node: 10.9.1(@types/node@18.11.17)(typescript@5.2.2) + ts-node: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) yaml: 1.10.2 dev: true @@ -29247,6 +28752,11 @@ packages: deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. dev: false + /querystring@0.2.1: + resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==} + engines: {node: '>=0.4.x'} + deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. + /querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -30443,19 +29953,6 @@ packages: tiny-warning: 1.0.3 dev: false - /react-router-dom@6.15.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - react: '>=16.8' - react-dom: '>=16.8' - dependencies: - '@remix-run/router': 1.8.0 - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - react-router: 6.15.0(react@18.2.0) - dev: true - /react-router-dom@6.17.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-qWHkkbXQX+6li0COUUPKAUkxjNNqPJuiBd27dVwQGDNsuFBdMbrS6UZ0CLYc4CsbdLYTckn4oB4tGDuPZpPhaQ==} engines: {node: '>=14.0.0'} @@ -30485,16 +29982,6 @@ packages: tiny-warning: 1.0.3 dev: false - /react-router@6.15.0(react@18.2.0): - resolution: {integrity: sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==} - engines: {node: '>=14.0.0'} - peerDependencies: - react: '>=16.8' - dependencies: - '@remix-run/router': 1.8.0 - react: 18.2.0 - dev: true - /react-router@6.17.0(react@18.2.0): resolution: {integrity: sha512-YJR3OTJzi3zhqeJYADHANCGPUu9J+6fT5GLv82UWRGSxu6oJYCKVmxUcaBQuGm9udpWmPsvpme/CdHumqgsoaA==} engines: {node: '>=14.0.0'} @@ -31220,6 +30707,18 @@ packages: tapable: 2.2.1 webpack: 5.88.1(esbuild@0.17.19) webpack-sources: 2.3.1 + dev: false + + /rspack-manifest-plugin@5.0.0-alpha0(webpack@5.89.0): + resolution: {integrity: sha512-a84H6P/lK0x3kb0I8Qdiwxrnjt1oNW0j+7kwPMWcODJu8eYFBrTXa1t+14n18Jvg9RKIR6llCH16mYxf2d0s8A==} + engines: {node: '>=14'} + peerDependencies: + webpack: ^5.75.0 + dependencies: + tapable: 2.2.1 + webpack: 5.89.0(esbuild@0.17.19) + webpack-sources: 2.3.1 + dev: true /rspack-plugin-virtual-module@0.1.12: resolution: {integrity: sha512-qyBM9XsP7oxBQSms2cr715XOeoDi6p5hUYXtlNDfst0jha8vfWVPNeC7j5+j5dG+yt//1OCmLaOY2rWqPSVXDg==} @@ -31227,36 +30726,29 @@ packages: fs-extra: 11.1.1 dev: true - /rspress@1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): - resolution: {integrity: sha512-e+jBxXcVWNsVXRukxXrlDVLpQbPQBB3TDV+3Ljb+JDEdeW+L2jbfWqiwAlQTXxynLiI7HjWXQiRhS9JVA3aWQw==} + /rspress@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + resolution: {integrity: sha512-aAjyzDXYOn8eu2v5w8EeELAAXcmM10UpIReq/h0Ff713vPI1epfDVQyCaEaHDKoWQ4BPxQbVlxVbsmG+tXYJZg==} hasBin: true dependencies: '@modern-js/node-bundle-require': link:packages/toolkit/node-bundle-require - '@rspress/core': 1.4.0(@babel/core@7.23.2)(esbuild@0.17.19)(react-refresh@0.14.0)(ts-node@10.9.1)(webpack@5.88.1) - '@rspress/shared': 1.4.0(esbuild@0.17.19)(react-dom@18.2.0)(react-refresh@0.14.0)(react@18.2.0)(ts-node@10.9.1) + '@rspress/core': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.88.1) + '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) cac: 6.7.14 chalk: 5.3.0 chokidar: 3.5.3 transitivePeerDependencies: - - '@babel/core' - '@babel/traverse' - - '@parcel/css' - '@swc/core' - - '@swc/css' - '@types/express' - '@types/webpack' - bufferutil - canvas - - clean-css - - csso - debug - devcert - esbuild - file-loader - - lightningcss - react - react-dom - - react-refresh - sockjs-client - supports-color - ts-node @@ -32610,6 +32102,31 @@ packages: terser: 5.19.2 webpack: 5.88.1(esbuild@0.17.19) + /terser-webpack-plugin@5.3.9(esbuild@0.17.19)(webpack@5.89.0): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.19 + esbuild: 0.17.19 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.19.2 + webpack: 5.89.0(esbuild@0.17.19) + dev: true + /terser-webpack-plugin@5.3.9(esbuild@0.18.20)(webpack@5.88.1): resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} engines: {node: '>= 10.13.0'} @@ -34391,6 +33908,46 @@ packages: - esbuild - uglify-js + /webpack@5.89.0(esbuild@0.17.19): + resolution: {integrity: sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.3 + '@types/estree': 1.0.0 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) + browserslist: 4.20.2 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.2.1 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.10 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(esbuild@0.17.19)(webpack@5.89.0) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + dev: true + /websocket@1.0.34: resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==} engines: {node: '>=4.0.0'} From 754b39c5d4e0cb7f490d2eba3001034d5dd548a6 Mon Sep 17 00:00:00 2001 From: chenwenjie Date: Mon, 6 Nov 2023 16:17:19 +0800 Subject: [PATCH 3/4] feat: use nanoid to generate build id --- packages/devtools/client/modern.config.ts | 3 +- packages/devtools/client/package.json | 1 + pnpm-lock.yaml | 210 ++++++++++++++++++---- 3 files changed, 182 insertions(+), 32 deletions(-) diff --git a/packages/devtools/client/modern.config.ts b/packages/devtools/client/modern.config.ts index fad9187a6164..f3b9030be60e 100644 --- a/packages/devtools/client/modern.config.ts +++ b/packages/devtools/client/modern.config.ts @@ -1,4 +1,5 @@ import { appTools, defineConfig } from '@modern-js/app-tools'; +import { nanoid } from '@modern-js/utils'; import { ROUTE_BASENAME } from '@modern-js/devtools-kit'; import packageMeta from './package.json'; @@ -28,7 +29,7 @@ export default defineConfig<'rspack'>({ globalVars: { 'process.env.VERSION': packageMeta.version, 'process.env.PKG_VERSION': packageMeta.version, - 'process.env.DEVTOOLS_MARK': 'friw89', + 'process.env.DEVTOOLS_MARK': nanoid(), }, }, output: { diff --git a/packages/devtools/client/package.json b/packages/devtools/client/package.json index 16bf48ba2a7e..9232d9f839b2 100644 --- a/packages/devtools/client/package.json +++ b/packages/devtools/client/package.json @@ -32,6 +32,7 @@ "@modern-js/devtools-kit": "workspace:*", "@modern-js/eslint-config": "workspace:*", "@modern-js/plugin-proxy": "workspace:*", + "@modern-js/utils": "workspace:*", "@modern-js/runtime": "workspace:*", "@modern-js/tsconfig": "workspace:*", "@modern-js/types": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 270fc162e431..af61b306c54e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1307,6 +1307,9 @@ importers: '@modern-js/types': specifier: workspace:* version: link:../../toolkit/types + '@modern-js/utils': + specifier: workspace:* + version: link:../../toolkit/utils '@radix-ui/react-collapsible': specifier: ^1.0.3 version: 1.0.3(@types/react-dom@18.0.6)(@types/react@18.0.21)(react-dom@18.2.0)(react@18.2.0) @@ -1542,7 +1545,7 @@ importers: version: 18.2.0(react@18.2.0) rspress: specifier: 1.5.0 - version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0) packages/document/main-doc: dependencies: @@ -1582,7 +1585,7 @@ importers: version: 18.2.0(react@18.2.0) rspress: specifier: 1.5.0 - version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0) ts-node: specifier: ^10.9.1 version: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) @@ -1606,7 +1609,7 @@ importers: version: 18.2.0(react@18.2.0) rspress: specifier: 1.5.0 - version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + version: 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0) packages/generator/generator-cases: dependencies: @@ -4758,7 +4761,7 @@ importers: version: link:../../toolkit/utils '@rspack/dev-client': specifier: 0.3.2 - version: 0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1) + version: 0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.89.0) '@storybook/components': specifier: ^7.5.1 version: 7.5.1(@types/react-dom@18.0.6)(@types/react@18.0.21)(react-dom@18.2.0)(react@18.2.0) @@ -4785,7 +4788,7 @@ importers: version: 7.5.1 '@storybook/react-docgen-typescript-plugin': specifier: 1.0.6--canary.9.0c3f3b7.0 - version: 1.0.6--canary.9.0c3f3b7.0(typescript@5.2.2)(webpack@5.88.1) + version: 1.0.6--canary.9.0c3f3b7.0(typescript@5.2.2)(webpack@5.89.0) '@storybook/router': specifier: ^7.5.1 version: 7.5.1(react-dom@18.2.0)(react@18.2.0) @@ -12092,14 +12095,14 @@ packages: read-yaml-file: 1.1.0 dev: false - /@mdx-js/loader@2.2.1(webpack@5.88.1): + /@mdx-js/loader@2.2.1(webpack@5.89.0): resolution: {integrity: sha512-J4E8A5H+xtk4otZiEZ5AXl61Tj04Avm5MqLQazITdI3+puVXVnTTuZUKM1oNHTtfDIfOl0uMt+o/Ij+x6Fvf+g==} peerDependencies: webpack: '>=4' dependencies: '@mdx-js/mdx': 2.2.1 source-map: 0.7.4 - webpack: 5.88.1(esbuild@0.17.19) + webpack: 5.89.0(esbuild@0.17.19) transitivePeerDependencies: - supports-color dev: true @@ -12655,7 +12658,7 @@ packages: http-compression: 1.0.6 minimatch: 3.1.2 path-to-regexp: 6.2.1 - ts-node: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) + ts-node: 10.9.1(@types/node@18.11.17)(typescript@5.2.2) ws: 8.13.0 transitivePeerDependencies: - '@babel/traverse' @@ -13075,7 +13078,7 @@ packages: optionalDependencies: fsevents: 2.3.2 - /@pmmmwh/react-refresh-webpack-plugin@0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1): + /@pmmmwh/react-refresh-webpack-plugin@0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.89.0): resolution: {integrity: sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==} engines: {node: '>= 10.13'} peerDependencies: @@ -13111,7 +13114,7 @@ packages: react-refresh: 0.14.0 schema-utils: 3.3.0 source-map: 0.7.4 - webpack: 5.88.1(esbuild@0.18.20) + webpack: 5.89.0(esbuild@0.18.20) webpack-hot-middleware: 2.25.4 dev: false @@ -13152,6 +13155,46 @@ packages: schema-utils: 3.3.0 source-map: 0.7.4 webpack: 5.88.1(esbuild@0.17.19) + dev: false + + /@pmmmwh/react-refresh-webpack-plugin@0.5.10(react-refresh@0.14.0)(webpack@5.89.0): + resolution: {integrity: sha512-j0Ya0hCFZPd4x40qLzbhGsh9TMtdb+CJQiso+WxLOPNasohq9cc5SNUcwsZaRH6++Xh91Xkm/xHCkuIiIu0LUA==} + engines: {node: '>= 10.13'} + peerDependencies: + '@types/webpack': 4.x || 5.x + react-refresh: '>=0.10.0 <1.0.0' + sockjs-client: ^1.4.0 + type-fest: '>=0.17.0 <4.0.0' + webpack: '>=4.43.0 <6.0.0' + webpack-dev-server: 3.x || 4.x + webpack-hot-middleware: 2.x + webpack-plugin-serve: 0.x || 1.x + peerDependenciesMeta: + '@types/webpack': + optional: true + sockjs-client: + optional: true + type-fest: + optional: true + webpack-dev-server: + optional: true + webpack-hot-middleware: + optional: true + webpack-plugin-serve: + optional: true + dependencies: + ansi-html-community: 0.0.8 + common-path-prefix: 3.0.0 + core-js-pure: 3.26.0 + error-stack-parser: 2.1.4 + find-up: 5.0.0 + html-entities: 2.3.3 + loader-utils: 2.0.4 + react-refresh: 0.14.0 + schema-utils: 3.3.0 + source-map: 0.7.4 + webpack: 5.89.0(esbuild@0.17.19) + dev: true /@polka/url@0.5.0: resolution: {integrity: sha512-oZLYFEAzUKyi3SKnXvj32ZCEGH6RDnao7COuCVhDydMS9NrCSVXhM79VaKyP5+Zc33m0QXEd2DN3UkU7OsHcfw==} @@ -14779,11 +14822,11 @@ packages: p-map: 4.0.0 dev: false - /@rsbuild/plugin-react@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + /@rsbuild/plugin-react@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0): resolution: {integrity: sha512-G8rXlh0XYLrHrFzyr8vi6ePSrGSFqlYd7M6hMRbpBTRNUpoH4ftgmtSOVuuLAwrCDzZbjRRW9lHrrmoKwvScXg==} dependencies: '@rsbuild/shared': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rspack/plugin-react-refresh': 0.3.10(react-refresh@0.14.0)(webpack@5.88.1) + '@rspack/plugin-react-refresh': 0.3.10(react-refresh@0.14.0)(webpack@5.89.0) react-refresh: 0.14.0 transitivePeerDependencies: - '@babel/traverse' @@ -14810,12 +14853,12 @@ packages: - webpack-plugin-serve dev: true - /@rsbuild/plugin-svgr@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + /@rsbuild/plugin-svgr@0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0): resolution: {integrity: sha512-P09Fx3Ep05ir35LkLXnpHVZRPdjavqS8qA0ngQpkYC+eX+c5PGy4SWpyXMoWRqY2+fOiYCiHp+WV0Mc/HxFxJg==} dependencies: '@rsbuild/shared': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) '@svgr/webpack': 8.0.1 - url-loader: 4.1.1(file-loader@6.2.0)(webpack@5.88.1) + url-loader: 4.1.1(webpack@5.89.0) transitivePeerDependencies: - '@babel/traverse' - '@swc/core' @@ -15001,7 +15044,7 @@ packages: - webpack-plugin-serve dev: false - /@rspack/dev-client@0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1): + /@rspack/dev-client@0.3.2(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.89.0): resolution: {integrity: sha512-t/4b6rzMh13pi0JARj85xaU02FNihUmGGpsHsG3UdqM1pVzS3z6Kl6h0FrmMG8NNJAvoTT0p6drltdijIxb6Qw==} peerDependencies: react-refresh: '>=0.10.0 <1.0.0' @@ -15009,7 +15052,7 @@ packages: react-refresh: optional: true dependencies: - '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.88.1) + '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack-hot-middleware@2.25.4)(webpack@5.89.0) react-refresh: 0.14.0 transitivePeerDependencies: - '@types/webpack' @@ -15056,19 +15099,41 @@ packages: - webpack-dev-server - webpack-hot-middleware - webpack-plugin-serve + dev: false - /@rspress/core@1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.88.1): + /@rspack/plugin-react-refresh@0.3.10(react-refresh@0.14.0)(webpack@5.89.0): + resolution: {integrity: sha512-oeCsfEXRguZox5rNyV3ifbyk3G578YZ+5l0ZNCk/tDF5xQnMeJ9vRJ7iFYcHVcuZhZQhuxCwLzeXJ5RNWleqig==} + peerDependencies: + react-refresh: '>=0.10.0 <1.0.0' + peerDependenciesMeta: + react-refresh: + optional: true + dependencies: + '@pmmmwh/react-refresh-webpack-plugin': 0.5.10(react-refresh@0.14.0)(webpack@5.89.0) + react-refresh: 0.14.0 + schema-utils: 4.2.0 + transitivePeerDependencies: + - '@types/webpack' + - sockjs-client + - type-fest + - webpack + - webpack-dev-server + - webpack-hot-middleware + - webpack-plugin-serve + dev: true + + /@rspress/core@1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.89.0): resolution: {integrity: sha512-HiH0T6Zrm0csvUifpuwNJZj64T6LRMKD9aSge6GK2So/GAAiB/Itq4o3tTMDT6i7mejxvyh13A/9w8jjEboUcw==} engines: {node: '>=14.17.6'} dependencies: '@loadable/component': 5.15.2(react@18.2.0) - '@mdx-js/loader': 2.2.1(webpack@5.88.1) + '@mdx-js/loader': 2.2.1(webpack@5.89.0) '@mdx-js/mdx': 2.2.1 '@mdx-js/react': 2.2.1(react@18.2.0) '@modern-js/utils': link:packages/toolkit/utils '@rsbuild/core': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rsbuild/plugin-react': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) - '@rsbuild/plugin-svgr': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1) + '@rsbuild/plugin-react': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0) + '@rsbuild/plugin-svgr': 0.0.13(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0) '@rspress/mdx-rs': 0.4.1 '@rspress/plugin-auto-nav-sidebar': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) '@rspress/plugin-container-syntax': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) @@ -15076,7 +15141,7 @@ packages: '@rspress/plugin-medium-zoom': 1.5.0(@rspress/runtime@1.5.0) '@rspress/runtime': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1) '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) - '@rspress/theme-default': 1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.88.1) + '@rspress/theme-default': 1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.89.0) '@types/compression': 1.7.2 '@types/polka': 0.5.4 autoprefixer: 10.4.13(postcss@8.4.21) @@ -15117,7 +15182,7 @@ packages: rspack-plugin-virtual-module: 0.1.12 sirv: 2.0.3 source-map: 0.7.4 - string-replace-loader: 3.1.0(webpack@5.88.1) + string-replace-loader: 3.1.0(webpack@5.89.0) tailwindcss: 3.2.7(postcss@8.4.21)(ts-node@10.9.1) unified: 10.1.2 unist-util-visit: 4.1.1 @@ -15358,7 +15423,7 @@ packages: - webpack-cli dev: true - /@rspress/theme-default@1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.88.1): + /@rspress/theme-default@1.5.0(esbuild@0.17.19)(postcss@8.4.21)(ts-node@10.9.1)(webpack@5.89.0): resolution: {integrity: sha512-lXfZqjok6pBOahoILIMr8iT8PjT+W+65vBDQDIbugUWHTCKl+LUwyrbaNILFyrYCnjA6+Uv+XwOymrwUrE455Q==} engines: {node: '>=14.17.6'} dependencies: @@ -15382,7 +15447,7 @@ packages: react-helmet-async: 1.3.0(react-dom@18.2.0)(react@18.2.0) react-syntax-highlighter: 15.5.0(react@18.2.0) rspack-plugin-virtual-module: 0.1.12 - string-replace-loader: 3.1.0(webpack@5.88.1) + string-replace-loader: 3.1.0(webpack@5.89.0) tailwindcss: 3.2.7(postcss@8.4.21)(ts-node@10.9.1) transitivePeerDependencies: - '@babel/traverse' @@ -16134,7 +16199,7 @@ packages: resolution: {integrity: sha512-nfZC103z9Cy27FrJKUr2IjDuVt8Mvn1Z5gZ0TtJihoK7sfLTv29nd/XU9zzrb/epM3o8UEzc63xZZsMaToDbAw==} dev: false - /@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0(typescript@5.2.2)(webpack@5.88.1): + /@storybook/react-docgen-typescript-plugin@1.0.6--canary.9.0c3f3b7.0(typescript@5.2.2)(webpack@5.89.0): resolution: {integrity: sha512-KUqXC3oa9JuQ0kZJLBhVdS4lOneKTOopnNBK4tUAgoxWQ3u/IjzdueZjFr7gyBrXMoU6duutk3RQR9u8ZpYJ4Q==} peerDependencies: typescript: '>= 4.x' @@ -16148,7 +16213,7 @@ packages: react-docgen-typescript: 2.2.2(typescript@5.2.2) tslib: 2.4.0 typescript: 5.2.2 - webpack: 5.88.1(esbuild@0.18.20) + webpack: 5.89.0(esbuild@0.18.20) transitivePeerDependencies: - supports-color dev: false @@ -27912,7 +27977,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.21 - ts-node: 10.9.1(@types/node@16.11.68)(typescript@5.0.4) + ts-node: 10.9.1(@types/node@18.11.17)(typescript@5.2.2) yaml: 1.10.2 dev: true @@ -30726,12 +30791,12 @@ packages: fs-extra: 11.1.1 dev: true - /rspress@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.88.1): + /rspress@1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1)(webpack@5.89.0): resolution: {integrity: sha512-aAjyzDXYOn8eu2v5w8EeELAAXcmM10UpIReq/h0Ff713vPI1epfDVQyCaEaHDKoWQ4BPxQbVlxVbsmG+tXYJZg==} hasBin: true dependencies: '@modern-js/node-bundle-require': link:packages/toolkit/node-bundle-require - '@rspress/core': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.88.1) + '@rspress/core': 1.5.0(esbuild@0.17.19)(ts-node@10.9.1)(webpack@5.89.0) '@rspress/shared': 1.5.0(esbuild@0.17.19)(react-dom@18.2.0)(react@18.2.0)(ts-node@10.9.1) cac: 6.7.14 chalk: 5.3.0 @@ -31476,14 +31541,14 @@ packages: char-regex: 1.0.2 strip-ansi: 6.0.1 - /string-replace-loader@3.1.0(webpack@5.88.1): + /string-replace-loader@3.1.0(webpack@5.89.0): resolution: {integrity: sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==} peerDependencies: webpack: ^5 dependencies: loader-utils: 2.0.4 schema-utils: 3.3.0 - webpack: 5.88.1(esbuild@0.17.19) + webpack: 5.89.0(esbuild@0.17.19) dev: true /string-similarity@4.0.4: @@ -32150,6 +32215,32 @@ packages: serialize-javascript: 6.0.1 terser: 5.19.2 webpack: 5.88.1(esbuild@0.18.20) + dev: true + + /terser-webpack-plugin@5.3.9(esbuild@0.18.20)(webpack@5.89.0): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.19 + esbuild: 0.18.20 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.19.2 + webpack: 5.89.0(esbuild@0.18.20) + dev: false /terser@5.19.2: resolution: {integrity: sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==} @@ -33085,6 +33176,22 @@ packages: webpack: 5.88.1(esbuild@0.17.19) dev: true + /url-loader@4.1.1(webpack@5.89.0): + resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + file-loader: '*' + webpack: ^4.0.0 || ^5.0.0 + peerDependenciesMeta: + file-loader: + optional: true + dependencies: + loader-utils: 2.0.4 + mime-types: 2.1.35 + schema-utils: 3.3.0 + webpack: 5.89.0(esbuild@0.17.19) + dev: true + /url-parse@1.5.10: resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==} dependencies: @@ -33907,6 +34014,7 @@ packages: - '@swc/core' - esbuild - uglify-js + dev: true /webpack@5.89.0(esbuild@0.17.19): resolution: {integrity: sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==} @@ -33948,6 +34056,46 @@ packages: - uglify-js dev: true + /webpack@5.89.0(esbuild@0.18.20): + resolution: {integrity: sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.3 + '@types/estree': 1.0.0 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.10.0 + acorn-import-assertions: 1.9.0(acorn@8.10.0) + browserslist: 4.20.2 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.2.1 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.10 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(esbuild@0.18.20)(webpack@5.89.0) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + dev: false + /websocket@1.0.34: resolution: {integrity: sha512-PRDso2sGwF6kM75QykIesBijKSVceR6jL2G8NGYyq2XrItNC2P5/qL5XeR056GhA+Ly7JMFvJb9I312mJfmqnQ==} engines: {node: '>=4.0.0'} From 68737eb3d1349f47159e3ac8032f592e75549b23 Mon Sep 17 00:00:00 2001 From: chenwenjie Date: Mon, 6 Nov 2023 17:23:36 +0800 Subject: [PATCH 4/4] feat(devtools): rewrite `client/exports/mount.mjs` in ES5 --- packages/devtools/client/exports/mount.mjs | 80 ++++++++++++---------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/packages/devtools/client/exports/mount.mjs b/packages/devtools/client/exports/mount.mjs index f32dc0ab1546..daf3253269fa 100644 --- a/packages/devtools/client/exports/mount.mjs +++ b/packages/devtools/client/exports/mount.mjs @@ -1,45 +1,49 @@ -import { parseQuery } from 'ufo'; +/* WARNING: NO ES6 SYNTAX HERE!!! */ +/* eslint-disable no-inner-declarations */ +/* eslint-disable no-var */ import routesManifest from '../dist/routes-manifest.json'; -/** - * @param {import('@modern-js/devtools-kit').SetupClientOptions} options - */ -const mountDevTools = options => { - const container = document.createElement('div'); - container.className = '_modern_js_devtools_container'; - document.body.appendChild(container); +(function () { + /** + * @param {import('@modern-js/devtools-kit').SetupClientOptions} options + */ + function mountDevTools(options) { + var container = document.createElement('div'); + container.className = '_modern_js_devtools_container'; + document.body.appendChild(container); - const shadow = container.attachShadow({ mode: 'closed' }); + var shadow = container.attachShadow({ mode: 'closed' }); - for (const asset of routesManifest.routeAssets.mount.assets) { - if (asset.endsWith('.js')) { - const el = document.createElement('script'); - el.src = asset; + routesManifest.routeAssets.mount.assets.forEach(function (asset) { + var el; + if (asset.endsWith('.js')) { + el = document.createElement('script'); + el.src = asset; + } else if (asset.endsWith('.css')) { + el = document.createElement('link'); + el.href = asset; + el.rel = 'stylesheet'; + } shadow.appendChild(el); - } else if (asset.endsWith('.css')) { - const el = document.createElement('link'); - el.href = asset; - el.rel = 'stylesheet'; - shadow.appendChild(el); - } - } + }); - const app = document.createElement('div'); - app.className = '_modern_js_devtools_mountpoint theme-register'; - const appGlobalExport = `_modern_js_devtools_app`; - window[appGlobalExport] = { - container: app, - options, - }; - shadow.appendChild(app); -}; + var app = document.createElement('div'); + app.className = '_modern_js_devtools_mountpoint theme-register'; + var appGlobalExport = `_modern_js_devtools_app`; + window[appGlobalExport] = { + container: app, + options, + }; + shadow.appendChild(app); + } -try { - // eslint-disable-next-line no-undef - const opts = parseQuery(__resourceQuery); - mountDevTools(opts); -} catch (err) { - const e = new Error('Failed to execute mount point of DevTools.'); - e.cause = err; - console.error(e); -} + try { + // eslint-disable-next-line no-undef + var opts = decodeURIComponent(__resourceQuery); + mountDevTools(opts); + } catch (err) { + var e = new Error('Failed to execute mount point of DevTools.'); + e.cause = err; + console.error(e); + } +})();