@playcraft/devkit 1.0.31-beta.11 → 1.0.31-beta.14

package/core/engines/cocos/cli-build.js

@@ -1,118 +1,4 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { spawnCocosSync, needsXvfb } = require('./cli.js');
-const { resolveCreatorOutputDir } = require('./creator-cli.js');
-const { stripAdsdkCjsImport } = require('./strip-social-share.js');
-const { prepareWritableCocosCli } = require('./writable-cli.js');
-const { cleanCocosProjectCaches, ensureWritableCocosWorkdirs, shouldCleanCocosCache } = require('./clean-cache.js');
-
-function shouldSkipEngineBuild(buildOptions = {}) {
-  const cocos = buildOptions.cocos || {};
-  return Boolean(
-    buildOptions.skipEngineBuild ||
-    cocos.skipEngineBuild ||
-    process.env.PLAYABLE_SKIP_ENGINE_BUILD === '1'
-  );
-}
-
-function resolveWebMobileDest(projectRoot, buildOptions = {}) {
-  const cocos = buildOptions.cocos || {};
-  const fromConfig = resolveCreatorOutputDir(projectRoot, cocos.buildConfig || 'build-configs/web-mobile.json');
-  const explicit = cocos.webMobileDir ? path.resolve(projectRoot, cocos.webMobileDir) : null;
-  if (shouldSkipEngineBuild(buildOptions)) {
-    return explicit || fromConfig || path.resolve(projectRoot, 'dist/web-mobile');
-  }
-  return fromConfig || explicit || path.resolve(projectRoot, 'dist/web-mobile');
-}
-
-function logStrip(result) {
-  if (result.skipped && result.reason === 'missing') {
-    console.warn('[cocos] adsdk CJS missing, skip social-share strip');
-    return;
-  }
-  if (result.skipped && result.reason === 'already') {
-    console.log('[cocos] social-share import() already stripped');
-    return;
-  }
-  if (result.skipped) {
-    console.warn('[cocos] social-share import() not found in CJS');
-    return;
-  }
-  console.log('[cocos] stripped social-share import() from adsdk CJS');
-}
-
-/**
+"use strict";const fs=require("fs");const path=require("path");const{spawnCocosSync,needsXvfb}=require("./cli.js");const{resolveCreatorOutputDir}=require("./creator-cli.js");const{stripAdsdkCjsImport}=require("./strip-social-share.js");const{prepareWritableCocosCli}=require("./writable-cli.js");const{cleanCocosProjectCaches,ensureWritableCocosWorkdirs,shouldCleanCocosCache}=require("./clean-cache.js");function shouldSkipEngineBuild(buildOptions={}){const cocos=buildOptions.cocos||{};return Boolean(buildOptions.skipEngineBuild||cocos.skipEngineBuild||process.env.PLAYABLE_SKIP_ENGINE_BUILD==="1")}function resolveWebMobileDest(projectRoot,buildOptions={}){const cocos=buildOptions.cocos||{};const fromConfig=resolveCreatorOutputDir(projectRoot,cocos.buildConfig||"build-configs/web-mobile.json");const explicit=cocos.webMobileDir?path.resolve(projectRoot,cocos.webMobileDir):null;if(shouldSkipEngineBuild(buildOptions)){return explicit||fromConfig||path.resolve(projectRoot,"dist/web-mobile")}return fromConfig||explicit||path.resolve(projectRoot,"dist/web-mobile")}function logStrip(result){if(result.skipped&&result.reason==="missing"){console.warn("[cocos] adsdk CJS missing, skip social-share strip");return}if(result.skipped&&result.reason==="already"){console.log("[cocos] social-share import() already stripped");return}if(result.skipped){console.warn("[cocos] social-share import() not found in CJS");return}console.log("[cocos] stripped social-share import() from adsdk CJS")}/**
  * 用官方 cocos CLI 打 web-mobile（不再走 Creator 编辑器）。
  * Linux 上自动套 xvfb-run -a（shader 编译需要虚拟显示）。
- */
-function runCocosEngineBuild(projectRoot, buildOptions = {}) {
-  logStrip(stripAdsdkCjsImport(projectRoot));
-
-  const dest = resolveWebMobileDest(projectRoot, buildOptions);
-  if (shouldSkipEngineBuild(buildOptions)) {
-    if (!fs.existsSync(dest)) {
-      throw new Error(`[cocos] skipEngineBuild but missing ${path.relative(projectRoot, dest)}`);
-    }
-    console.log(`[cocos] skip engine build, using ${path.relative(projectRoot, dest)}`);
-    return dest;
-  }
-
-  if (shouldCleanCocosCache(buildOptions)) {
-    const removed = cleanCocosProjectCaches(projectRoot);
-    console.log(`[cocos] cleaned project caches: ${removed.join(', ') || '(none)'}`);
-  }
-  ensureWritableCocosWorkdirs(projectRoot);
-
-  const cocos = buildOptions.cocos || {};
-  const configRel = cocos.buildConfig || 'build-configs/web-mobile.json';
-  const configPath = path.resolve(projectRoot, configRel);
-  if (!fs.existsSync(configPath)) {
-    throw new Error(`[cocos] missing build config: ${configRel}`);
-  }
-
-  const args = [
-    '--no-interactive',
-    'build',
-    '--project',
-    projectRoot,
-    '--platform',
-    'web-mobile',
-    '--build-config',
-    configPath,
-  ];
-
-  const prepared = prepareWritableCocosCli(projectRoot);
-  const env = { ...process.env, ...prepared.env };
-
-  if (needsXvfb()) {
-    console.log('[cocos] linux, wrapping xvfb-run -a');
-  }
-  console.log(`[cocos] build web-mobile ← ${configRel}`);
-
-  const result = spawnCocosSync(args, {
-    cwd: projectRoot,
-    stdio: 'inherit',
-    env,
-  });
-
-  if (result.error) {
-    throw result.error;
-  }
-  if (result.status !== 0) {
-    throw new Error(`[cocos] build failed, exit ${result.status}`);
-  }
-
-  console.log(`[cocos] web-mobile ready at ${path.relative(projectRoot, dest)}`);
-  return dest;
-}
-
-module.exports = {
-  runCocosEngineBuild,
-  resolveWebMobileDest,
-  shouldSkipEngineBuild,
-  cleanCocosProjectCaches,
-  ensureWritableCocosWorkdirs,
-  shouldCleanCocosCache,
-};
+ */function runCocosEngineBuild(projectRoot,buildOptions={}){logStrip(stripAdsdkCjsImport(projectRoot));const dest=resolveWebMobileDest(projectRoot,buildOptions);if(shouldSkipEngineBuild(buildOptions)){if(!fs.existsSync(dest)){throw new Error(`[cocos] skipEngineBuild but missing ${path.relative(projectRoot,dest)}`)}console.log(`[cocos] skip engine build, using ${path.relative(projectRoot,dest)}`);return dest}if(shouldCleanCocosCache(buildOptions)){const removed=cleanCocosProjectCaches(projectRoot);console.log(`[cocos] cleaned project caches: ${removed.join(", ")||"(none)"}`)}ensureWritableCocosWorkdirs(projectRoot);const cocos=buildOptions.cocos||{};const configRel=cocos.buildConfig||"build-configs/web-mobile.json";const configPath=path.resolve(projectRoot,configRel);if(!fs.existsSync(configPath)){throw new Error(`[cocos] missing build config: ${configRel}`)}const args=["--no-interactive","build","--project",projectRoot,"--platform","web-mobile","--build-config",configPath];const prepared=prepareWritableCocosCli(projectRoot);const env={...process.env,...prepared.env};if(needsXvfb()){console.log("[cocos] linux, wrapping xvfb-run -a")}console.log(`[cocos] build web-mobile ← ${configRel}`);const result=spawnCocosSync(args,{cwd:projectRoot,stdio:"inherit",env});if(result.error){throw result.error}if(result.status!==0){throw new Error(`[cocos] build failed, exit ${result.status}`)}console.log(`[cocos] web-mobile ready at ${path.relative(projectRoot,dest)}`);return dest}module.exports={runCocosEngineBuild,resolveWebMobileDest,shouldSkipEngineBuild,cleanCocosProjectCaches,ensureWritableCocosWorkdirs,shouldCleanCocosCache};

package/core/engines/cocos/cli.js

@@ -1,38 +1,11 @@
-'use strict';
-
-const { spawn, spawnSync } = require('child_process');
-
-function resolveCocosBin(env = process.env) {
-  return env.COCOS_CLI || 'cocos';
-}
-
-function needsXvfb() {
-  return process.platform === 'linux';
-}
-
-function cocosCommand(args, env = process.env) {
-  const bin = resolveCocosBin(env);
-  if (needsXvfb()) {
-    return { cmd: 'xvfb-run', args: ['-a', bin, ...args] };
-  }
-  return { cmd: bin, args };
-}
-
-function spawnCocos(args, options = {}) {
-  const env = options.env || process.env;
-  const { cmd, args: fullArgs } = cocosCommand(args, env);
-  return spawn(cmd, fullArgs, options);
-}
-
-function spawnCocosSync(args, options = {}) {
-  const env = options.env || process.env;
-  const { cmd, args: fullArgs } = cocosCommand(args, env);
-  return spawnSync(cmd, fullArgs, options);
-}
-
-module.exports = {
-  resolveCocosBin,
-  needsXvfb,
-  spawnCocos,
-  spawnCocosSync,
-};
+"use strict";const fs=require("fs");const path=require("path");const{spawn,spawnSync}=require("child_process");function resolveCocosBin(env=process.env){return env.COCOS_CLI||"cocos"}function needsXvfb(){return process.platform==="linux"}/**
+ * Windows 上 `cocos` 是 npm 生成的 cmd shim（cocos / cocos.cmd / cocos.ps1），不是 exe：
+ *   spawn('cocos')      → CreateProcess 只补 .exe，找不到 → ENOENT
+ *   spawn('cocos.cmd')  → Node 拒绝无 shell 的 .cmd/.bat → EINVAL
+ * 套 cmd.exe 能跑，但 kill 只会杀掉 cmd.exe，cocos 进程会变成孤儿占着端口，
+ * 所以这里把 shim 里那条 `node <cli.js>` 解出来，用当前 node 直接跑。
+ */function findWindowsShim(bin){if(/[\\/]/.test(bin))return fs.existsSync(bin)?bin:"";const result=spawnSync("where",[bin],{encoding:"utf8",windowsHide:true});if(result.error||result.status!==0)return"";const found=String(result.stdout||"").split(/\r?\n/).map(line=>line.trim()).filter(Boolean);return found.find(file=>/\.cmd$/i.test(file))||found.find(file=>/\.exe$/i.test(file))||found[0]||""}/** npm 的 cmd shim 结尾形如： ... "%_prog%"  "%dp0%\node_modules\cocos-cli\dist\cli.js" %* */function readShimScript(shimPath){try{const source=fs.readFileSync(shimPath,"utf8");const match=source.match(/%dp0%[\\/]([^"%\r\n]+\.(?:[cm]?js))/i)||source.match(/"([^"\r\n]+\.(?:[cm]?js))"/i);if(!match)return"";const script=path.resolve(path.dirname(shimPath),match[1]);return fs.existsSync(script)?script:""}catch(_){return""}}/**
+ * cocos 命令实际落到的文件路径：Windows 上会穿透 npm 的 .cmd shim 拿到 cli.js。
+ * 除了 spawn，preview-json-pack 也要靠它往上找 engine/library。
+ */function resolveCocosEntryPoint(env=process.env){const bin=resolveCocosBin(env);const isWin=process.platform==="win32";if(path.isAbsolute(bin)){if(!isWin||/\.(?:com|exe|[cm]?js)$/i.test(bin))return bin;return readShimScript(bin)||bin}if(isWin){if(/\.(?:[cm]?js)$/i.test(bin)&&fs.existsSync(bin))return bin;const shim=findWindowsShim(bin);if(!shim)return"";if(/\.exe$/i.test(shim))return shim;return readShimScript(shim)||shim}try{const{execSync}=require("child_process");const found=execSync(`command -v ${JSON.stringify(bin)}`,{encoding:"utf8"}).trim();return found.split(/\r?\n/)[0]||""}catch(_){return""}}function windowsCocosCommand(bin,args,env){if(/\.(?:com|exe)$/i.test(bin))return{cmd:bin,args};const entry=resolveCocosEntryPoint(env);if(entry&&/\.(?:[cm]?js)$/i.test(entry))return{cmd:process.execPath,args:[entry,...args]};if(entry&&/\.exe$/i.test(entry))return{cmd:entry,args};// shim 解不出来时退回 shell，交给 cmd.exe 按 PATHEXT 找（kill 语义会差一些）
+return{cmd:entry||bin,args,shell:true}}function cocosCommand(args,env=process.env){const bin=resolveCocosBin(env);if(needsXvfb()){return{cmd:"xvfb-run",args:["-a",bin,...args]}}if(process.platform==="win32"){return windowsCocosCommand(bin,args,env)}return{cmd:bin,args}}function spawnCocos(args,options={}){const env=options.env||process.env;const{cmd,args:fullArgs,shell}=cocosCommand(args,env);return spawn(cmd,fullArgs,shell?{...options,shell}:options)}function spawnCocosSync(args,options={}){const env=options.env||process.env;const{cmd,args:fullArgs,shell}=cocosCommand(args,env);return spawnSync(cmd,fullArgs,shell?{...options,shell}:options)}module.exports={resolveCocosBin,resolveCocosEntryPoint,needsXvfb,cocosCommand,spawnCocos,spawnCocosSync};

package/core/engines/cocos/constants.js

@@ -1,21 +1 @@
-'use strict';
-
-const ADAPTER_FETCH = 'adapterFetch';
-const TO_STRING_EXTNAME = [
-  '.txt', '.xml', '.vsh', '.fsh', '.atlas', '.tmx', '.tsx', '.json',
-  '.ExportJson', '.plist', '.fnt', '.js', '.zip'
-];
-const TO_SKIP_EXTNAME = ['.ico', '.html', '.css'];
-const TRANSPARENT_GIF =
-  'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
-const FILE_MAX_SIZE = 2 * 1024 * 1024 * 0.8;
-const THEME_ASSET_EXT = /\.(png|webp|jpe?g|gif|svg|mp3|mpeg|wav|m4a|aac|ogg|mp4)$/i;
-
-module.exports = {
-  ADAPTER_FETCH,
-  TO_STRING_EXTNAME,
-  TO_SKIP_EXTNAME,
-  TRANSPARENT_GIF,
-  FILE_MAX_SIZE,
-  THEME_ASSET_EXT,
-};
+"use strict";const ADAPTER_FETCH="adapterFetch";const TO_STRING_EXTNAME=[".txt",".xml",".vsh",".fsh",".atlas",".tmx",".tsx",".json",".ExportJson",".plist",".fnt",".js",".zip"];const TO_SKIP_EXTNAME=[".ico",".html",".css"];const TRANSPARENT_GIF="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7";const FILE_MAX_SIZE=2*1024*1024*0.8;const THEME_ASSET_EXT=/\.(png|webp|jpe?g|gif|svg|mp3|mpeg|wav|m4a|aac|ogg|mp4)$/i;module.exports={ADAPTER_FETCH,TO_STRING_EXTNAME,TO_SKIP_EXTNAME,TRANSPARENT_GIF,FILE_MAX_SIZE,THEME_ASSET_EXT};

package/core/engines/cocos/creator-cli.js

@@ -1,108 +1 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-const { spawnSync } = require('child_process');
-
-function readCreatorVersion(root) {
-  try {
-    const pkg = require(path.join(root, 'package.json'));
-    return (pkg.creator && pkg.creator.version) || '3.8.6';
-  } catch {
-    return '3.8.6';
-  }
-}
-
-function resolveCreator(root, creatorBin) {
-  if (creatorBin) return creatorBin;
-  if (process.env.COCOS_CREATOR) return process.env.COCOS_CREATOR;
-
-  const version = readCreatorVersion(root);
-  const darwin = [
-    `/Applications/Cocos/Creator/${version}/CocosCreator.app/Contents/MacOS/CocosCreator`,
-    `/Applications/CocosCreator/Creator/${version}/CocosCreator.app/Contents/MacOS/CocosCreator`,
-  ];
-  const win32 = [
-    `C:\\ProgramData\\cocos\\editors\\Creator\\${version}\\CocosCreator.exe`,
-    `C:\\Cocos\\Creator\\${version}\\CocosCreator.exe`,
-    `C:\\CocosCreator\\Creator\\${version}\\CocosCreator.exe`,
-  ];
-  const linux = [
-    `/opt/Cocos/Creator/${version}/CocosCreator`,
-    `${process.env.HOME || ''}/Cocos/Creator/${version}/CocosCreator`,
-  ];
-  const candidates = process.platform === 'darwin' ? darwin : process.platform === 'win32' ? win32 : linux;
-  return candidates.find((p) => p && fs.existsSync(p));
-}
-
-function creatorEnv() {
-  const env = { ...process.env };
-  delete env.ELECTRON_RUN_AS_NODE;
-  return env;
-}
-
-function resolveCreatorOutputDir(root, buildConfigRel) {
-  const configPath = path.resolve(root, buildConfigRel || 'build-configs/web-mobile.json');
-  if (!fs.existsSync(configPath)) return null;
-  try {
-    const cfg = JSON.parse(fs.readFileSync(configPath, 'utf8'));
-    const outputName = cfg.outputName || 'web-mobile';
-    const buildPath = cfg.buildPath || 'project://build';
-    if (buildPath.startsWith('project://')) {
-      const rel = buildPath.slice('project://'.length).replace(/^\/+/, '');
-      return path.resolve(root, rel, outputName);
-    }
-    if (path.isAbsolute(buildPath)) return path.join(buildPath, outputName);
-    return path.resolve(root, buildPath, outputName);
-  } catch {
-    return null;
-  }
-}
-
-function runCreatorBuild(root, buildOptions) {
-  const cocos = buildOptions.cocos || {};
-  if (cocos.skipEngineBuild) {
-    console.log('[cocos] skipEngineBuild: using existing web-mobile');
-    return;
-  }
-
-  const configPath = path.resolve(root, cocos.buildConfig || 'build-configs/web-mobile.json');
-  if (!fs.existsSync(configPath)) {
-    throw new Error(`[cocos] missing Creator build config: ${configPath}`);
-  }
-
-  const bin = resolveCreator(root, cocos.creatorBin);
-  if (!bin) {
-    throw new Error('[cocos] Cocos Creator not found. Set COCOS_CREATOR or cocos.creatorBin.');
-  }
-
-  if (process.platform === 'linux') {
-    console.warn('[cocos] Creator fallback on linux; prefer official cocos CLI (xvfb-run -a).');
-  }
-
-  const buildArg = `configPath=${configPath.replace(/\\/g, '/')};stage=build`;
-  console.log(`[cocos] ${bin}`);
-  console.log(`[cocos] --build ${buildArg}`);
-
-  const result = spawnSync(bin, ['--project', root, '--nologin', '--build', buildArg], {
-    cwd: root,
-    stdio: 'inherit',
-    env: creatorEnv(),
-  });
-
-  if (result.error) throw result.error;
-  const code = result.status;
-  if (code === 36 || code === 0) {
-    console.log('[cocos] web-mobile ready');
-    return;
-  }
-  throw new Error(`[cocos] Creator build failed, exit ${code}`);
-}
-
-module.exports = {
-  readCreatorVersion,
-  resolveCreator,
-  resolveCreatorOutputDir,
-  creatorEnv,
-  runCreatorBuild,
-};
+"use strict";const fs=require("fs");const path=require("path");const{spawnSync}=require("child_process");function readCreatorVersion(root){try{const pkg=require(path.join(root,"package.json"));return pkg.creator&&pkg.creator.version||"3.8.6"}catch{return"3.8.6"}}function resolveCreator(root,creatorBin){if(creatorBin)return creatorBin;if(process.env.COCOS_CREATOR)return process.env.COCOS_CREATOR;const version=readCreatorVersion(root);const darwin=[`/Applications/Cocos/Creator/${version}/CocosCreator.app/Contents/MacOS/CocosCreator`,`/Applications/CocosCreator/Creator/${version}/CocosCreator.app/Contents/MacOS/CocosCreator`];const win32=[`C:\\ProgramData\\cocos\\editors\\Creator\\${version}\\CocosCreator.exe`,`C:\\Cocos\\Creator\\${version}\\CocosCreator.exe`,`C:\\CocosCreator\\Creator\\${version}\\CocosCreator.exe`];const linux=[`/opt/Cocos/Creator/${version}/CocosCreator`,`${process.env.HOME||""}/Cocos/Creator/${version}/CocosCreator`];const candidates=process.platform==="darwin"?darwin:process.platform==="win32"?win32:linux;return candidates.find(p=>p&&fs.existsSync(p))}function creatorEnv(){const env={...process.env};delete env.ELECTRON_RUN_AS_NODE;return env}function resolveCreatorOutputDir(root,buildConfigRel){const configPath=path.resolve(root,buildConfigRel||"build-configs/web-mobile.json");if(!fs.existsSync(configPath))return null;try{const cfg=JSON.parse(fs.readFileSync(configPath,"utf8"));const outputName=cfg.outputName||"web-mobile";const buildPath=cfg.buildPath||"project://build";if(buildPath.startsWith("project://")){const rel=buildPath.slice("project://".length).replace(/^\/+/,"");return path.resolve(root,rel,outputName)}if(path.isAbsolute(buildPath))return path.join(buildPath,outputName);return path.resolve(root,buildPath,outputName)}catch{return null}}function runCreatorBuild(root,buildOptions){const cocos=buildOptions.cocos||{};if(cocos.skipEngineBuild){console.log("[cocos] skipEngineBuild: using existing web-mobile");return}const configPath=path.resolve(root,cocos.buildConfig||"build-configs/web-mobile.json");if(!fs.existsSync(configPath)){throw new Error(`[cocos] missing Creator build config: ${configPath}`)}const bin=resolveCreator(root,cocos.creatorBin);if(!bin){throw new Error("[cocos] Cocos Creator not found. Set COCOS_CREATOR or cocos.creatorBin.")}if(process.platform==="linux"){console.warn("[cocos] Creator fallback on linux; prefer official cocos CLI (xvfb-run -a).")}const buildArg=`configPath=${configPath.replace(/\\/g,"/")};stage=build`;console.log(`[cocos] ${bin}`);console.log(`[cocos] --build ${buildArg}`);const result=spawnSync(bin,["--project",root,"--nologin","--build",buildArg],{cwd:root,stdio:"inherit",env:creatorEnv()});if(result.error)throw result.error;const code=result.status;if(code===36||code===0){console.log("[cocos] web-mobile ready");return}throw new Error(`[cocos] Creator build failed, exit ${code}`)}module.exports={readCreatorVersion,resolveCreator,resolveCreatorOutputDir,creatorEnv,runCreatorBuild};