fix: windows packaging

Author: d-gubert

src/bundler/esbuild.ts

@@ -1,4 +1,3 @@
-import * as os from "os";
 import path from "path";
 import type { OnLoadArgs, OnResolveArgs, PluginBuild } from "esbuild";
 import { build } from "esbuild";
@@ -7,21 +6,15 @@ import type { ICompilerResult } from "../definition";
 import type { IBundledCompilerResult } from "../definition/ICompilerResult";
 import type { AppsEngineValidator } from "../compiler/AppsEngineValidator";
 
-const isWin = os.platform() === "win32";
-
 function normalizeAppModulePath(modulePath: string, parentDir: string): string {
     const isRelative = /\.\.?\//.test(modulePath);
 
     if (!isRelative) {
         return modulePath;
     }
 
-    const baseDir = path.dirname(parentDir);
-    const resolvedPath = isWin
-        ? path.join(baseDir, modulePath)
-        : path.resolve("/", baseDir, modulePath).substring(1);
-
-    return `${resolvedPath}.js`;
+    const baseDir = path.posix.dirname(parentDir);
+    return `${path.posix.join(baseDir, modulePath)}.js`;
 }
 
 export async function bundleCompilation(
@@ -70,13 +63,10 @@ export async function bundleCompilation(
 
                             if (isRelative) {
                                 // normalize into the key you used in r.files
-                                let modulePath = normalizeAppModulePath(
+                                const modulePath = normalizeAppModulePath(
                                     args.path,
                                     args.importer,
                                 );
-                                modulePath = modulePath
-                                    .replace(/^:\\/, "")
-                                    .replace(/\\/g, "/");
                                 if (r.files[modulePath]) {
                                     return {
                                         namespace: "app-source",

src/compiler/AppsEngineValidator.ts

@@ -135,8 +135,8 @@ export class AppsEngineValidator {
                     return undefined;
                 }
 
-                filepath = path.normalize(
-                    path.join(path.dirname(filename), filepath),
+                filepath = path.posix.normalize(
+                    path.posix.join(path.posix.dirname(filename), filepath),
                 );
 
                 // Handles import of other files in app's source

src/compiler/TscBasedCompiler.ts

@@ -211,7 +211,7 @@ export class TscBasedCompiler {
                 withFileTypes: true,
             })) {
                 const full = path.join(dir, entry.name);
-                const rel = path.join(base, entry.name);
+                const rel = path.posix.join(base, entry.name);
                 if (entry.isDirectory()) {
                     await collect(full, rel);
                 } else if (entry.isFile() && rel.endsWith(".js")) {

src/compiler/TypescriptCompiler.ts

@@ -91,7 +91,9 @@ export class TypescriptCompiler {
                 throw new Error(`Invalid TypeScript file: "${key}".`);
             }
 
-            result.files[key].name = path.normalize(result.files[key].name);
+            result.files[key].name = path.posix.normalize(
+                result.files[key].name,
+            );
         });
 
         let hasExternalDependencies = false;
@@ -121,13 +123,13 @@ export class TypescriptCompiler {
         const host = {
             getScriptFileNames: () => Object.keys(result.files),
             getScriptVersion: (fileName) => {
-                fileName = path.normalize(fileName);
+                fileName = path.posix.normalize(fileName.replace(/\\/g, "/"));
                 const file =
                     result.files[fileName] || this.getLibraryFile(fileName);
                 return file?.version?.toString();
             },
             getScriptSnapshot: (fileName) => {
-                fileName = path.normalize(fileName);
+                fileName = path.posix.normalize(fileName.replace(/\\/g, "/"));
                 const file =
                     result.files[fileName] || this.getLibraryFile(fileName);
 
@@ -317,10 +319,20 @@ export class TypescriptCompiler {
     }
 
     private resolvePath(containingFile: string, moduleName: string): string {
-        const currentFolderPath = path
-            .dirname(containingFile)
-            .replace(this.sourcePath.replace(/\/$/, ""), "");
-        const modulePath = path.join(currentFolderPath, moduleName);
+        const posixSourcePath = this.sourcePath
+            .replace(/\\/g, "/")
+            .replace(/\/$/, "");
+        const posixContainingDir = path.posix.dirname(
+            containingFile.replace(/\\/g, "/"),
+        );
+        const currentFolderPath = posixContainingDir.replace(
+            posixSourcePath,
+            "",
+        );
+        const modulePath = path.posix.join(
+            currentFolderPath || ".",
+            moduleName,
+        );
 
         // Let's ensure we search for the App's modules first
         const transformedModule =
@@ -370,7 +382,7 @@ export class TypescriptCompiler {
             return undefined;
         }
 
-        const norm = path.normalize(fileName);
+        const norm = path.posix.normalize(fileName.replace(/\\/g, "/"));
 
         if (this.libraryFiles[norm]) {
             return this.libraryFiles[norm];
@@ -396,7 +408,7 @@ export class TypescriptCompiler {
 
         return (
             file.name.trim() !== "" &&
-            path.normalize(file.name) &&
+            path.posix.normalize(file.name) &&
             file.content.trim() !== ""
         );
     }

src/compiler/getAppSource.ts

@@ -1,5 +1,5 @@
 import { promises as fs } from "fs";
-import { resolve, relative } from "path";
+import path from "path";
 import type { IAppInfo } from "@rocket.chat/apps-engine/definition/metadata";
 
 import type {
@@ -13,7 +13,7 @@ async function walkDirectory(directory: string): Promise<ICompilerFile[]> {
     const files = await Promise.all(
         dirents
             .map(async (dirent) => {
-                const res = resolve(directory, dirent.name);
+                const res = path.resolve(directory, dirent.name);
 
                 const dirsToIgnore = ["node_modules", ".git"];
                 if (dirsToIgnore.some((dir) => res.includes(dir))) {
@@ -49,7 +49,9 @@ function filterProjectFiles(
             // Get the file names like it was inside the project's directory
             .map((file: ICompilerFile) => ({
                 ...file,
-                name: relative(projectDirectory, file.name),
+                name: path
+                    .relative(projectDirectory, file.name)
+                    .replace(/\\/g, "/"),
             }))
     );
 }

src/misc/Utilities.ts

@@ -51,7 +51,7 @@ export class Utilities {
     }
 
     public static transformModuleForCustomRequire(moduleName: string): string {
-        return `${path
+        return `${path.posix
             .normalize(moduleName)
             .replace(/\.\.?\//g, "")
             .replace(/^\//, "")}.ts`;

src/packager/AppPackager.ts

@@ -97,7 +97,9 @@ export class AppPackager {
 
         await Promise.all(
             matches.map(async (realPath) => {
-                const zipPath = path.relative(this.fd.folder, realPath);
+                const zipPath = path
+                    .relative(this.fd.folder, realPath)
+                    .replace(/\\/g, "/");
 
                 const fileStat = await fs.stat(realPath);