chore: update the packages scopes (#31)

talisk · web-flow · commit 05b6a92de6e6 · 2025-04-08T19:06:08.000+08:00
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "dev:build": "rsbuild build",
     "dev:serve": "rsbuild dev",
     "dev": "pnpm run build:all && concurrently \"pnpm run dev:serve\" \"wait-on dist/index.js && electron .\"",
-    "build:all": "pnpm --filter @lynx-dev/* run build && pnpm run build && mkdir -p dist/lynx-devtool-web && cp -r packages/lynx-devtool-web/dist/* dist/lynx-devtool-web/",
+    "build:all": "pnpm --filter @lynx-js/* run build && pnpm run build && mkdir -p dist/lynx-devtool-web && cp -r packages/lynx-devtool-web/dist/* dist/lynx-devtool-web/",
     "clean": "rm -rf dist && pnpm -r exec rm -rf dist && rm -rf packages/devtools-frontend-lynx/out packages/devtools-frontend-lynx/output",
     "rebuild": "pnpm run clean && pnpm run build",
     "build:devtools-frontend-lynx": "pnpm run fetch:depot_tools && export PATH=$(pwd)/packages/devtools-frontend-lynx/buildtools/depot_tools:$PATH && pnpm run sync:devtools-gn && pnpm run build:devtools && pnpm run sync:devtools-dist",
@@ -25,8 +25,8 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@electron/remote": "^2.1.2",
-    "@lynx-dev/lynx-devtool-cli": "workspace:*",
-    "@lynx-dev/lynx-devtool-utils": "workspace:*",
+    "@lynx-js/lynx-devtool-cli": "workspace:*",
+    "@lynx-js/lynx-devtool-utils": "workspace:*",
     "@lynx-js/remote-debug-driver": "0.0.2",
     "@monaco-editor/react": "4.5.0",
     "@paciolan/remote-module-loader": "3.0.3",
diff --git a/packages/lynx-devtool-cli/README.md b/packages/lynx-devtool-cli/README.md
@@ -1 +1 @@
-# @lynx-dev/lynx-devtool-cli
+# @lynx-js/lynx-devtool-cli
diff --git a/packages/lynx-devtool-cli/package.json b/packages/lynx-devtool-cli/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lynx-dev/lynx-devtool-cli",
+  "name": "@lynx-js/lynx-devtool-cli",
   "version": "0.0.1-beta.4",
   "description": "Lynx DevTool toolkit",
   "license": "Apache-2.0",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@lynx-js/debug-router-connector": "0.0.2",
-    "@lynx-dev/lynx-devtool-utils": "workspace:*",
+    "@lynx-js/lynx-devtool-utils": "workspace:*",
     "asar": "^3.2.0",
     "async": "3.2.4",
     "axios": "^1.8.1",
diff --git a/packages/lynx-devtool-cli/src/cli/command/handler.ts b/packages/lynx-devtool-cli/src/cli/command/handler.ts
@@ -14,7 +14,7 @@ import { app } from 'electron';
 import path from 'path';
 import { LDT_DIR } from '../utils';
 import { getCurrentChannel } from '../updator/updator';
-import { kCliPackageName, kScopeName } from '@lynx-dev/lynx-devtool-utils';
+import { kCliPackageName, kScopeName } from '@lynx-js/lynx-devtool-utils';
 
 export const uploadFilePath = utils.getUploadFilePath();
 const separator = '___';
diff --git a/packages/lynx-devtool-cli/src/cli/command/httpServer.ts b/packages/lynx-devtool-cli/src/cli/command/httpServer.ts
@@ -16,7 +16,7 @@ import * as utils from '../utils';
 import * as handler from './handler';
 import { getDebugDriver, restartLDTServer } from './toolkit';
 import { LDT_DIR } from '../utils';
-import { kScopeName, kCliPackageName } from '@lynx-dev/lynx-devtool-utils';
+import { kScopeName, kCliPackageName } from '@lynx-js/lynx-devtool-utils';
 const detect = require('detect-port');
 const { createProxyMiddleware } = require('http-proxy-middleware');
 
diff --git a/packages/lynx-devtool-cli/src/cli/updator/updator.ts b/packages/lynx-devtool-cli/src/cli/updator/updator.ts
@@ -12,7 +12,7 @@ import {
   kCliPackageName,
   kScopeName,
   kWebPackageName,
-} from "@lynx-dev/lynx-devtool-utils";
+} from "@lynx-js/lynx-devtool-utils";
 import { app } from "electron";
 import asar from "asar";
 import { electron } from "node:process";
@@ -81,7 +81,7 @@ export async function setupResource(
 
     // build the target path
 
-    // ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli
+    // ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli
     const ldtPath = path.resolve(
       LDT_DIR,
       currentChannel,
@@ -125,7 +125,7 @@ export async function setupResource(
 
       // copy bin directory
       // from <devtool>/packages/lynx-devtool-cli/bin
-      // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/bin
+      // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/bin
       if (fs.existsSync(path.resolve(debugSourcePath, "bin"))) {
         copyDir(
           path.resolve(debugSourcePath, "bin"),
@@ -135,7 +135,7 @@ export async function setupResource(
 
       // copy dist directory
       // from <devtool>/packages/lynx-devtool-cli/dist
-      // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/dist
+      // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/dist
       if (fs.existsSync(path.resolve(debugSourcePath, "dist"))) {
         copyDir(
           path.resolve(debugSourcePath, "dist"),
@@ -144,11 +144,11 @@ export async function setupResource(
       }
 
       // from <devtool>/packages/lynx-devtool-cli/package.json
-      // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/package.json
+      // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/package.json
       copyFileSync(packageJsonPath, path.resolve(ldtPath, "package.json"));
 
       // from <devtool>/dist/lynx-devtool-web
-      // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/dist/static/ldt_home/dist
+      // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/dist/static/ldt_home/dist
       const webSourcePath = path.resolve(
         process.cwd(),
         "dist/lynx-devtool-web"
@@ -183,7 +183,7 @@ export async function setupResource(
 
       const innerPackageJson = asar.extractFile(
         asarPath,
-        "node_modules/@lynx-dev/lynx-devtool-cli/package.json"
+        "node_modules/@lynx-js/lynx-devtool-cli/package.json"
       );
       const innerPackageJsonObj = JSON.parse(innerPackageJson.toString());
       const innerVersion = innerPackageJsonObj.version;
@@ -211,50 +211,50 @@ export async function setupResource(
 
           // copy CLI resources
 
-          // ~/.lynx-devtool/.temp/node_modules/@lynx-dev/lynx-devtool-cli
+          // ~/.lynx-devtool/.temp/node_modules/@lynx-js/lynx-devtool-cli
           const tmpCliSourcePath = path.join(
             tempDir,
             "node_modules",
             kScopeName,
             kCliPackageName
           );
 
-          // ~/.lynx-devtool/.temp/node_modules/@lynx-dev/lynx-devtool-cli/package.json
+          // ~/.lynx-devtool/.temp/node_modules/@lynx-js/lynx-devtool-cli/package.json
           const tmpPackageJsonPath = path.join(
             tmpCliSourcePath,
             "package.json"
           );
 
           // copy bin directory
-          // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/bin
+          // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/bin
           copyDir(
             path.join(tmpCliSourcePath, "bin"),
             path.resolve(ldtPath, "bin")
           );
 
           // copy dist directory
-          // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/dist
+          // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/dist
           copyDir(
             path.join(tmpCliSourcePath, "dist"),
             path.resolve(ldtPath, "dist")
           );
 
-          // from  ~/.lynx-devtool/.temp/node_modules/@lynx-dev/lynx-devtool-cli/package.json
-          // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/package.json
+          // from  ~/.lynx-devtool/.temp/node_modules/@lynx-js/lynx-devtool-cli/package.json
+          // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/package.json
           copyFileSync(
             tmpPackageJsonPath,
             path.resolve(ldtPath, "package.json")
           );
 
           // copy web resources
-          // ~/.lynx-devtool/.temp/node_modules/@lynx-dev/lynx-devtool-web/dist
+          // ~/.lynx-devtool/.temp/node_modules/@lynx-js/lynx-devtool-web/dist
           const tempWebDistPath = path.join(
             tempDir,
             "dist",
             kWebPackageName
           );
 
-          // to ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/dist/static/ldt_home/dist
+          // to ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/dist/static/ldt_home/dist
           copyDir(
             tempWebDistPath,
             path.resolve(ldtPath, "dist/static/ldt_home/dist")
@@ -274,7 +274,7 @@ export async function setupResource(
       fs.mkdirSync(homeCnDir, { recursive: true });
     }
 
-    // ~/.lynx-devtool/3x/@lynx-dev/lynx-devtool-cli/dist/static/ldt_home/RES_READY_FLAG
+    // ~/.lynx-devtool/3x/@lynx-js/lynx-devtool-cli/dist/static/ldt_home/RES_READY_FLAG
     fs.writeFileSync(
       path.resolve(homeCnDir, RES_READY_FLAG),
       `${isPackagedApp ? "prod" : "dev"}`
diff --git a/packages/lynx-devtool-utils/README.md b/packages/lynx-devtool-utils/README.md
@@ -1 +1 @@
-# @lynx-dev/lynx-devtool-utils
+# @lynx-js/lynx-devtool-utils
diff --git a/packages/lynx-devtool-utils/package.json b/packages/lynx-devtool-utils/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lynx-dev/lynx-devtool-utils",
+  "name": "@lynx-js/lynx-devtool-utils",
   "version": "0.0.1-beta.4",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/lib/index.js",
diff --git a/packages/lynx-devtool-web-components/README.md b/packages/lynx-devtool-web-components/README.md
@@ -1 +1 @@
-# @lynx-dev/lynx-devtool-web-components
+# @lynx-js/lynx-devtool-web-components
diff --git a/packages/lynx-devtool-web-components/package.json b/packages/lynx-devtool-web-components/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lynx-dev/lynx-devtool-web-components",
+  "name": "@lynx-js/lynx-devtool-web-components",
   "version": "0.0.1-beta.4",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
diff --git a/packages/lynx-devtool-web/package.json b/packages/lynx-devtool-web/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@lynx-dev/lynx-devtool-web",
+  "name": "@lynx-js/lynx-devtool-web",
   "version": "0.0.1-beta.4",
   "scripts": {
     "reset": "npx rimraf ./**/node_modules",
@@ -22,8 +22,8 @@
     "dist/*"
   ],
   "dependencies": {
-    "@lynx-dev/lynx-devtool-web-components": "workspace:*",
-    "@lynx-dev/lynx-devtool-utils": "workspace:*",
+    "@lynx-js/lynx-devtool-web-components": "workspace:*",
+    "@lynx-js/lynx-devtool-utils": "workspace:*",
     "@ant-design/icons": "^4.8.0",
     "antd": "^4.24.14",
     "@modern-js/runtime": "2.63.2",
diff --git a/packages/lynx-devtool-web/src/containers/DevTool/DevTool.tsx b/packages/lynx-devtool-web/src/containers/DevTool/DevTool.tsx
@@ -26,7 +26,7 @@ import {
   DevtoolsFrameImpl,
   createCustomData,
   devtoolActionHandler,
-} from '@lynx-dev/lynx-devtool-web-components';
+} from '@lynx-js/lynx-devtool-web-components';
 import { Button, notification, Tabs, Tag, Tooltip } from 'antd';
 import { useLocation, useNavigate } from '@modern-js/runtime/router';
 import { useEffect, useMemo, useRef, useState } from 'react';
diff --git a/packages/lynx-devtool-web/src/store/connection.ts b/packages/lynx-devtool-web/src/store/connection.ts
@@ -18,7 +18,7 @@ import {
   IClientDescriptor,
   ICustomDataWrapper,
   IRemoteDebugDriverEvent2Payload
-} from '@lynx-dev/lynx-devtool-web-components';
+} from '@lynx-js/lynx-devtool-web-components';
 import { notification, message } from 'antd';
 import { t } from 'i18next';
 import create, { getStore } from '../utils/flooks';
diff --git a/packages/lynx-devtool-web/src/types/diagnose.ts b/packages/lynx-devtool-web/src/types/diagnose.ts
@@ -2,7 +2,7 @@
 // Licensed under the Apache License Version 2.0 that can be found in the
 // LICENSE file in the root directory of this source tree.
 
-import { DiagnoseDetailData, DiagnoseItemType } from '@lynx-dev/lynx-devtool-utils';
+import { DiagnoseDetailData, DiagnoseItemType } from '@lynx-js/lynx-devtool-utils';
 
 export type DiagnoseReport = {
   [key in DiagnoseItemType]?: DiagnoseDetailData[];
diff --git a/packages/lynx-devtool-web/src/utils/debugDriver.ts b/packages/lynx-devtool-web/src/utils/debugDriver.ts
@@ -15,7 +15,7 @@ import {
   SocketEvents,
   bootstrapRemoteDriver,
   getRemoteDebugDriver
-} from '@lynx-dev/lynx-devtool-web-components';
+} from '@lynx-js/lynx-devtool-web-components';
 import { getCurrentIntranetIp } from '.';
 import LDT_CONST, { isOfflineMode } from './const';
 import { queryService } from './query';
diff --git a/packages/lynx-devtool-web/src/utils/statisticsUtils.ts b/packages/lynx-devtool-web/src/utils/statisticsUtils.ts
@@ -7,7 +7,7 @@ import { getSelectClient } from './storeUtils';
 import { getGitInfo, getLDTVersion } from '@/api/api';
 import { getStore } from './flooks';
 import useUser from '@/store/user';
-import { StatisticsCustomEventData } from '@lynx-dev/lynx-devtool-utils';
+import { StatisticsCustomEventData } from '@lynx-js/lynx-devtool-utils';
 
 export interface IStatistics {
   init(data: { bid: string; release: string }): void;
diff --git a/packages/lynx-devtool-web/src/utils/xdbDriver.ts b/packages/lynx-devtool-web/src/utils/xdbDriver.ts
@@ -5,7 +5,7 @@
 import { canUseDebugRouter } from '@/services/device';
 import useConnection from '@/store/connection';
 import { IDevice, IGroupDevice } from '@/types/device';
-import { ERemoteDebugDriverExternalEvent, ISocketMessage, SocketEvents } from '@lynx-dev/lynx-devtool-web-components';
+import { ERemoteDebugDriverExternalEvent, ISocketMessage, SocketEvents } from '@lynx-js/lynx-devtool-web-components';
 import { t } from 'i18next';
 import SocketIO from 'socket.io-client';
 import debugDriver from './debugDriver';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/rsbuild.config.ts b/rsbuild.config.ts
@@ -36,7 +36,7 @@ export default defineConfig({
       externals: {
         'electron': 'electron',
         '@electron/remote': '@electron/remote',
-        '@lynx-dev/lynx-devtool-cli': '@lynx-dev/lynx-devtool-cli',
+        '@lynx-js/lynx-devtool-cli': '@lynx-js/lynx-devtool-cli',
         'electron-log': 'electron-log',
         'node-machine-id': 'node-machine-id'
       },
diff --git a/src/main/App.ts b/src/main/App.ts
@@ -1,5 +1,5 @@
-import { getConfigItem, setConfigItem, LDT_DIR, getCurrentChannel, defaultLogger } from '@lynx-dev/lynx-devtool-cli';
-import { kScopeName, kCliPackageName } from '@lynx-dev/lynx-devtool-utils';
+import { getConfigItem, setConfigItem, LDT_DIR, getCurrentChannel, defaultLogger } from '@lynx-js/lynx-devtool-cli';
+import { kScopeName, kCliPackageName } from '@lynx-js/lynx-devtool-utils';
 import axios from 'axios';
 import { BrowserWindow, Menu, app, dialog, shell } from 'electron';
 import ProgressBar from 'electron-progressbar';
diff --git a/src/main/utils/config.ts b/src/main/utils/config.ts
@@ -1,4 +1,4 @@
-import { ILDTConfig, OnChangeListener } from '@lynx-dev/lynx-devtool-utils';
+import { ILDTConfig, OnChangeListener } from '@lynx-js/lynx-devtool-utils';
 import { LDT_CONFIG_FILE } from './const';
 import fs from 'fs';
 
diff --git a/src/main/utils/server.ts b/src/main/utils/server.ts
@@ -1,4 +1,4 @@
-import { toolkitExecutor, getDebugDriver, sendUsbMessageToWeb, CliOptions } from '@lynx-dev/lynx-devtool-cli';
+import { toolkitExecutor, getDebugDriver, sendUsbMessageToWeb, CliOptions } from '@lynx-js/lynx-devtool-cli';
 
 export interface LDTServerOptions extends CliOptions {
   forceNew?: boolean;

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# @lynx-dev/lynx-devtool-cli`
	`1`	`+# @lynx-js/lynx-devtool-cli`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# @lynx-dev/lynx-devtool-utils`
	`1`	`+# @lynx-js/lynx-devtool-utils`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@lynx-dev/lynx-devtool-utils",`
	`2`	`+ "name": "@lynx-js/lynx-devtool-utils",`
`3`	`3`	`"version": "0.0.1-beta.4",`
`4`	`4`	`"types": "./dist/types/index.d.ts",`
`5`	`5`	`"main": "./dist/lib/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-# @lynx-dev/lynx-devtool-web-components`
	`1`	`+# @lynx-js/lynx-devtool-web-components`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "@lynx-dev/lynx-devtool-web-components",`
	`2`	`+ "name": "@lynx-js/lynx-devtool-web-components",`
`3`	`3`	`"version": "0.0.1-beta.4",`
`4`	`4`	`"jsnext:source": "./src/index.ts",`
`5`	`5`	`"types": "./dist/types/index.d.ts",`