fix ut

beyondkmp · Oct 31, 2024 · 71fd764 · 71fd764
1 parent b9fcfed
commit 71fd764
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/app-builder-lib/src/asar/unpackDetector.ts b/packages/app-builder-lib/src/asar/unpackDetector.ts
@@ -15,7 +15,7 @@ export function detectUnpackedDirs(fileSet: ResolvedFileSet, autoUnpackDirs: Set
   for (let i = 0, n = fileSet.files.length; i < n; i++) {
     const file = fileSet.files[i]
     const stat: FilterStats = metadata.get(file)!
-    if (!stat.destNodeModulesDirPath || autoUnpackDirs.has(stat.destNodeModulesDirPath.replace(/\\/g, "/"))) {
+    if (!stat.destNodeModulesDirPath || autoUnpackDirs.has(stat.destNodeModulesDirPath)) {
       continue
     }
 
@@ -42,6 +42,6 @@ export function detectUnpackedDirs(fileSet: ResolvedFileSet, autoUnpackDirs: Set
     if (log.isDebugEnabled) {
       log.debug({ file: stat.destNodeModulesFilePath, reason: "contains executable code" }, "not packed into asar archive")
     }
-    autoUnpackDirs.add(stat.destNodeModulesDirPath.replace(/\\/g, "/"))
+    autoUnpackDirs.add(stat.destNodeModulesDirPath)
   }
 }
diff --git a/test/src/BuildTest.ts b/test/src/BuildTest.ts
@@ -283,18 +283,17 @@ test.ifLinuxOrDevMac("beforeBuild", () => {
   )
 })
 
-test("win smart unpack", () => {
+test.ifDevOrWinCi("win smart unpack", () => {
   // test onNodeModuleFile hook
   const nodeModuleFiles: Array<string> = []
-  let p = ""
   return app(
     {
       targets: Platform.WINDOWS.createTarget(DIR_TARGET),
       config: {
         npmRebuild: true,
         onNodeModuleFile: file => {
-          const name = toSystemIndependentPath(path.relative(p, file))
-          console.log("test is her,", p, file, nodeModuleFiles, name)
+          const index = file.indexOf(path.sep + "node_modules"+ path.sep)
+          const name = toSystemIndependentPath(file.slice(index + 1))
           if (!name.startsWith(".") && !name.endsWith(".dll") && name.includes(".")) {
             nodeModuleFiles.push(name)
           }
@@ -305,8 +304,8 @@ test("win smart unpack", () => {
       },
     },
     {
+      isInstallDepsBefore:true,
       projectDirCreated: projectDir => {
-        p = projectDir
         return packageJson(it => {
           it.dependencies = {
             debug: "3.1.0",