From ca1ce79c8ae2d4ba57d23eee8b6a9a4e89caf654 Mon Sep 17 00:00:00 2001 From: Naily Date: Thu, 13 Feb 2025 16:52:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix(#224):=20=E4=BF=AE=E5=A4=8Dimportx?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84HMR=E5=A4=B1=E6=95=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=85=B3=E9=97=AD=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-packages/cli-service/src/hooks/start-dev-server.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-packages/cli-service/src/hooks/start-dev-server.ts b/dev-packages/cli-service/src/hooks/start-dev-server.ts index 8a73f98e9..e50ab5ca4 100644 --- a/dev-packages/cli-service/src/hooks/start-dev-server.ts +++ b/dev-packages/cli-service/src/hooks/start-dev-server.ts @@ -70,7 +70,10 @@ async function attachBackendServer(ctx: ConfigurationContext, callback: Callback while (true) { if (fs.existsSync(entryPath)) { mountRuntimeModuleCaches(); - return importx(entryPath, __filename); + return importx(entryPath, { + parentURL: __filename, + cache: false, + }); } await delay(200); } From a4c6d0f2f237c04ba30ebbf7f42c0b21bc9c257e Mon Sep 17 00:00:00 2001 From: Naily Date: Fri, 14 Feb 2025 14:29:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E5=9C=A8HMR=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E4=BD=BF=E7=94=A8importx=EF=BC=8C=E7=9B=B4=E6=8E=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8createRequire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-packages/cli-service/src/hooks/start-dev-server.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev-packages/cli-service/src/hooks/start-dev-server.ts b/dev-packages/cli-service/src/hooks/start-dev-server.ts index e50ab5ca4..1f1f7e71c 100644 --- a/dev-packages/cli-service/src/hooks/start-dev-server.ts +++ b/dev-packages/cli-service/src/hooks/start-dev-server.ts @@ -7,7 +7,7 @@ import { BACKEND_TARGET, FRONTEND_TARGET } from '@celljs/cli-common/lib/constant import * as delay from 'delay'; import { ConfigurationContext } from '../context/context-protocol'; const clearModule = require('clear-module'); -import { importx } from 'importx-tsup'; +import { createRequire } from 'module'; let server: any; let moduleCaches: string[] = []; @@ -70,10 +70,7 @@ async function attachBackendServer(ctx: ConfigurationContext, callback: Callback while (true) { if (fs.existsSync(entryPath)) { mountRuntimeModuleCaches(); - return importx(entryPath, { - parentURL: __filename, - cache: false, - }); + return createRequire(__filename)(entryPath); } await delay(200); } From 7380c6e2a4400203b5ac7835d033a183727a9623 Mon Sep 17 00:00:00 2001 From: Naily Date: Fri, 14 Feb 2025 14:34:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20HookExecutor=E5=8E=BB=E9=99=A4import?= =?UTF-8?q?x=E7=9A=84cache?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-packages/cli-common/src/hook/hook-executor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/cli-common/src/hook/hook-executor.ts b/dev-packages/cli-common/src/hook/hook-executor.ts index eddc94646..d4ec51864 100644 --- a/dev-packages/cli-common/src/hook/hook-executor.ts +++ b/dev-packages/cli-common/src/hook/hook-executor.ts @@ -92,7 +92,7 @@ export class HookExecutor { } protected async doRequire(context: CliContext, path: string, stage: HookStage = HookStage.on) { - const obj = await import('importx-tsup').then(x => x.import(path, __filename)); + const obj = await import('importx-tsup').then(x => x.import(path, { parentURL: __filename, cache: false })); const mod = this.getModule(obj); if (mod[stage] && typeof mod[stage] === 'function') { return mod[stage](context); From 45f8852f075b34ce6d27c9c569f7bbc5180eeb68 Mon Sep 17 00:00:00 2001 From: Naily Date: Fri, 14 Feb 2025 14:45:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20HMR=E6=94=B9=E5=9B=9E=E4=BD=BF?= =?UTF-8?q?=E7=94=A8importx=EF=BC=8C=E6=89=8D=E8=83=BD=E4=BD=BF=E7=94=A8ES?= =?UTF-8?q?M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-packages/cli-service/src/hooks/start-dev-server.ts | 7 +++++-- examples/backend-app/package.json | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-packages/cli-service/src/hooks/start-dev-server.ts b/dev-packages/cli-service/src/hooks/start-dev-server.ts index 1f1f7e71c..e50ab5ca4 100644 --- a/dev-packages/cli-service/src/hooks/start-dev-server.ts +++ b/dev-packages/cli-service/src/hooks/start-dev-server.ts @@ -7,7 +7,7 @@ import { BACKEND_TARGET, FRONTEND_TARGET } from '@celljs/cli-common/lib/constant import * as delay from 'delay'; import { ConfigurationContext } from '../context/context-protocol'; const clearModule = require('clear-module'); -import { createRequire } from 'module'; +import { importx } from 'importx-tsup'; let server: any; let moduleCaches: string[] = []; @@ -70,7 +70,10 @@ async function attachBackendServer(ctx: ConfigurationContext, callback: Callback while (true) { if (fs.existsSync(entryPath)) { mountRuntimeModuleCaches(); - return createRequire(__filename)(entryPath); + return importx(entryPath, { + parentURL: __filename, + cache: false, + }); } await delay(200); } diff --git a/examples/backend-app/package.json b/examples/backend-app/package.json index a3b39bd98..a1a18fa66 100644 --- a/examples/backend-app/package.json +++ b/examples/backend-app/package.json @@ -1,6 +1,7 @@ { "private": true, "name": "@celljs/example-backend-app", + "type": "module", "keywords": [ "cell-component" ], From 74c0030b5ca88abbce23974c365e2245eb7e8ffc Mon Sep 17 00:00:00 2001 From: Naily Date: Fri, 14 Feb 2025 14:50:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?chore:=20=E8=BF=98=E5=8E=9F=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/backend-app/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/backend-app/package.json b/examples/backend-app/package.json index a1a18fa66..a3b39bd98 100644 --- a/examples/backend-app/package.json +++ b/examples/backend-app/package.json @@ -1,7 +1,6 @@ { "private": true, "name": "@celljs/example-backend-app", - "type": "module", "keywords": [ "cell-component" ], From 73e0f440e32f9b9533e79a0ae5fd28613c70d0f6 Mon Sep 17 00:00:00 2001 From: Naily Date: Fri, 14 Feb 2025 15:12:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E6=94=B9=E5=9B=9E=E4=BD=BF=E7=94=A8?= =?UTF-8?q?require=E5=AF=BC=E5=85=A5entry=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-packages/cli-service/src/hooks/start-dev-server.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dev-packages/cli-service/src/hooks/start-dev-server.ts b/dev-packages/cli-service/src/hooks/start-dev-server.ts index e50ab5ca4..1f1f7e71c 100644 --- a/dev-packages/cli-service/src/hooks/start-dev-server.ts +++ b/dev-packages/cli-service/src/hooks/start-dev-server.ts @@ -7,7 +7,7 @@ import { BACKEND_TARGET, FRONTEND_TARGET } from '@celljs/cli-common/lib/constant import * as delay from 'delay'; import { ConfigurationContext } from '../context/context-protocol'; const clearModule = require('clear-module'); -import { importx } from 'importx-tsup'; +import { createRequire } from 'module'; let server: any; let moduleCaches: string[] = []; @@ -70,10 +70,7 @@ async function attachBackendServer(ctx: ConfigurationContext, callback: Callback while (true) { if (fs.existsSync(entryPath)) { mountRuntimeModuleCaches(); - return importx(entryPath, { - parentURL: __filename, - cache: false, - }); + return createRequire(__filename)(entryPath); } await delay(200); }