@deveco-test/deveco-code 0.1.0-TD.24.test → 0.1.0-TD.24.test2

package/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "postinstall": "node ./postinstall.mjs"
   },
-  "version": "0.1.0-TD.24.test",
+  "version": "0.1.0-TD.24.test2",
   "license": "MIT",
   "os": [
     "darwin",
@@ -25,9 +25,11 @@
     "assets/**/*"
   ],
   "optionalDependencies": {
-    "@deveco-test/deveco-code-windows-x64": "0.1.0-TD.24.test",
-    "@deveco-test/deveco-code-darwin-x64": "0.1.0-TD.24.test",
-    "@deveco-test/deveco-code-darwin-arm64": "0.1.0-TD.24.test",
-    "@deveco-test/deveco-code": "0.1.0-TD.24.test"
+    "@deveco-test/deveco-code-windows-x64": "0.1.0-TD.24.test2",
+    "@deveco-test/deveco-code-darwin-x64": "0.1.0-TD.24.test2",
+    "@deveco-test/deveco-code-darwin-arm64": "0.1.0-TD.24.test2"
+  },
+  "dependencies": {
+    "@deveco/deveco-cli": "1.2.1"
   }
 }

package/postinstall.mjs

@@ -27,6 +27,26 @@ const arch = archMap[os.arch()] ?? os.arch()
 const base = `@deveco-test/deveco-code-${platform}-${arch}`
 const sourceBinary = platform === "windows" ? "deveco.exe" : "deveco"
 const targetBinary = path.join(__dirname, "bin", "deveco.exe")
+const devecoCliEntryMarker = path.join(__dirname, "vendor", ".deveco-cli-entry")
+
+function resolveLocalDevecoCliEntry() {
+  const roots = [
+    path.join(__dirname, "node_modules", "@deveco", "deveco-cli"),
+    path.join(__dirname, "..", "deveco-cli"),
+  ]
+  for (const root of roots) {
+    const entry = path.join(root, "dist", "cli.js")
+    if (fs.existsSync(entry)) return entry
+  }
+  throw new Error(
+    'Local dependency "@deveco/deveco-cli" was not installed. Reinstall @deveco/deveco-code without omitting dependencies.',
+  )
+}
+
+function writeDevecoCliEntryMarker() {
+  fs.mkdirSync(path.dirname(devecoCliEntryMarker), { recursive: true })
+  fs.writeFileSync(devecoCliEntryMarker, `${resolveLocalDevecoCliEntry()}\n`, "utf8")
+}
 
 function supportsAvx2() {
   if (arch !== "x64") return false
@@ -148,29 +168,12 @@ function copyVendor(packageDir) {
   const vendorDst = path.join(__dirname, "vendor")
   if (fs.existsSync(vendorSrc)) {
     copyDir(vendorSrc, vendorDst)
-    restoreDevecoCliDeps(path.join(vendorDst, "deveco-cli"))
-    restoreDevecoCliDeps(path.join(packageDir, "vendor", "deveco-cli"))
     // Windows packs often drop Unix +x; force it back on macOS/Linux install.
     ensureVendorExecutables(vendorDst)
     ensureVendorExecutables(path.join(packageDir, "vendor"))
   }
 }
 
-function restoreDevecoCliDeps(cliDir) {
-  const tarPath = path.join(cliDir, "deps.tar.gz")
-  if (!fs.existsSync(tarPath)) return
-  const result = childProcess.spawnSync("tar", ["-xzf", tarPath, "-C", cliDir], {
-    stdio: "inherit",
-    windowsHide: true,
-    shell: true,
-  })
-  if (result.status !== 0) {
-    console.warn("Warning: failed to restore deveco-cli dependencies")
-    return
-  }
-  fs.unlinkSync(tarPath)
-}
-
 /** Restore execute bits lost when packages are built/published from Windows. */
 function ensureVendorExecutables(vendorRoot) {
   if (process.platform === "win32" || !fs.existsSync(vendorRoot)) return
@@ -246,6 +249,8 @@ function verifyBinary() {
 }
 
 function main() {
+  writeDevecoCliEntryMarker()
+
   for (const name of packageNames()) {
     try {
       copyBinary(resolveBinary(name), targetBinary)