From 9ea3535b12e878c9052d5ccc0a8bab297a49c071 Mon Sep 17 00:00:00 2001 From: pqcqaq <905739777@qq.com> Date: Sun, 8 Dec 2024 00:08:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=BB=98=E8=AE=A4=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=BC=80=E6=B5=8F=E8=A7=88=E5=99=A8=EF=BC=8C?= =?UTF-8?q?oak-cli=E6=B7=BB=E5=8A=A0--open=E5=8F=82=E6=95=B0=EF=BC=8C?= =?UTF-8?q?=E5=9C=A8=E6=9C=8D=E5=8A=A1=E5=90=AF=E5=8A=A8=E5=90=8E=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/build.js | 1 + lib/index.js | 1 + lib/template.js | 5 ++--- scripts/start-web.js | 6 ++++-- src/build.ts | 2 ++ src/index.ts | 1 + 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/build.js b/lib/build.js index 2775e33..3bc5fa6 100644 --- a/lib/build.js +++ b/lib/build.js @@ -76,6 +76,7 @@ async function build(cmd) { `SUB_DIR_NAME=${subdir}`, `COMPILE_ANALYZE=${!!cmd.analyze}`, `GENERATE_SOURCEMAP=${!!cmd.sourcemap}`, + !!cmd.open && `OPEN_IN_BROWSER=true`, `PORT=${port || 3000}`, !!cmd.memoryLimit && `MEMORY_LIMIT=${cmd.memoryLimit}`, `node`, diff --git a/lib/index.js b/lib/index.js index b380110..a65420f 100755 --- a/lib/index.js +++ b/lib/index.js @@ -63,6 +63,7 @@ commander_1.default .option('--analyze', 'analyze') .option('--memoryLimit ', 'memoryLimit of node') .option('--stackSize ', 'stackSize of node') + .option('--open', 'open in browser') .option('-t, --target ', 'target') .option('-m, --mode ', 'mode') .option('-d, --subDir ', 'subDirName') diff --git a/lib/template.js b/lib/template.js index 3cd23b4..ce32b0c 100644 --- a/lib/template.js +++ b/lib/template.js @@ -60,7 +60,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i oakDevDependencyStr = `"${cliName}": "~${getPackageLatestVersion(cliName)}",`; } const serverInitScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/initServer.js" : "cross-env OAK_PLATFORM=server node scripts/initServer.js"; - const serverStartScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/startServer.js" : "cross-env OAK_PLATFORM=server node scripts/startServer.js"; + // const serverStartScript = isDev ? "cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node scripts/startServer.js" : "cross-env OAK_PLATFORM=server node scripts/startServer.js"; const serverStartWatchScript = isDev ? "cross-env ENABLE_TRACE=true cross-env NODE_ENV=development cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js" : "cross-env OAK_PLATFORM=server node --stack-size=65500 scripts/watchServer.js"; return `{ "name": "${name}", @@ -97,8 +97,7 @@ function packageJsonContent({ name, version, description, cliName, cliBinName, i "run:ios": "oak-cli run -p ios", "run:android": "oak-cli run -p android", "server:init": "${serverInitScript}", - "server:start": "${serverStartScript}", - "server:start:watch": "${serverStartWatchScript}", + "server:start": "${serverStartWatchScript}", "postinstall": "npm run make:dep" }, "keywords": [], diff --git a/scripts/start-web.js b/scripts/start-web.js index 666bfc3..6e9b482 100644 --- a/scripts/start-web.js +++ b/scripts/start-web.js @@ -38,6 +38,8 @@ const env = getClientEnvironment(paths.publicUrlOrPath.slice(0, -1)); const useYarn = fs.existsSync(paths.yarnLockFile); const isInteractive = process.stdout.isTTY; +const open = !!process.env.OPEN_IN_BROWSER; + // Warn and crash if required files are missing if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) { process.exit(1); @@ -128,8 +130,8 @@ checkBrowsers(paths.appPath, isInteractive) ); } - console.log(chalk.cyan('Starting the development server...\n')); - openBrowser(urls.localUrlForBrowser); + // console.log(chalk.cyan('Starting the development server...\n')); + open && openBrowser(urls.localUrlForBrowser); }); ['SIGINT', 'SIGTERM'].forEach(function (sig) { diff --git a/src/build.ts b/src/build.ts index 8ce42eb..3bc2cea 100644 --- a/src/build.ts +++ b/src/build.ts @@ -22,6 +22,7 @@ export default async function build(cmd: any) { const mode = (cmd.mode || 'development') as Mode; const target = cmd.target as Target; const devMode = (cmd.devMode || 'server') as DevMode; + if (!cmd.target) { Error( `${error( @@ -101,6 +102,7 @@ export default async function build(cmd: any) { `SUB_DIR_NAME=${subdir}`, `COMPILE_ANALYZE=${!!cmd.analyze}`, `GENERATE_SOURCEMAP=${!!cmd.sourcemap}`, + !!cmd.open && `OPEN_IN_BROWSER=true`, `PORT=${port || 3000}`, !!cmd.memoryLimit && `MEMORY_LIMIT=${cmd.memoryLimit}`, `node`, diff --git a/src/index.ts b/src/index.ts index 2a05dcd..42effca 100644 --- a/src/index.ts +++ b/src/index.ts @@ -72,6 +72,7 @@ program .option('--analyze', 'analyze') .option('--memoryLimit ', 'memoryLimit of node') .option('--stackSize ', 'stackSize of node') + .option('--open' , 'open in browser') .option('-t, --target ', 'target') .option('-m, --mode ', 'mode') .option('-d, --subDir ', 'subDirName')