fix: resolve AEM import path

The hashsum of the generated file was incorrectly calculated for some files
aem-vite · Jan 20, 2022 · bca085c · bca085c
1 parent 4a34255
commit bca085c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/src/bundles.ts b/src/bundles.ts
@@ -98,18 +98,17 @@ export function bundlesImportRewriter(options: BundlesImportRewriterOptions): Pl
       const mainEntryPath = getMainEntryPath()
       const mainEntryAEMPath = getAEMImportFilePath(mainEntryPath, options)
 
-      const mainEntryAEMPathWithHash = getAEMImportFilePath(
-        mainEntryPath,
-        options,
-        true,
-        rollupOptions as NormalizedOutputOptions,
-      )
-
       for (const [fileName, chunk] of Object.entries(bundles)) {
         if (!isOutputChunk(chunk) || !chunk.code) {
           continue
         }
 
+        let aemImportPath = mainEntryAEMPath
+
+        if (options.caching && options.caching.enabled) {
+          aemImportPath = getAEMImportFilePath(mainEntryPath, options, true, rollupOptions as NormalizedOutputOptions)
+        }
+
         const source = chunk.code
 
         await init
@@ -141,11 +140,7 @@ export function bundlesImportRewriter(options: BundlesImportRewriterOptions): Pl
             importPath &&
             importPath.substring(importPath.lastIndexOf('/') + 1) === mainEntryAEMPath
           ) {
-            str().overwrite(
-              start,
-              end,
-              importPath.substring(0, importPath.lastIndexOf('/') + 1) + mainEntryAEMPathWithHash,
-            )
+            str().overwrite(start, end, importPath.substring(0, importPath.lastIndexOf('/') + 1) + aemImportPath)
           }
 
           // Dynamic imports
@@ -166,7 +161,7 @@ export function bundlesImportRewriter(options: BundlesImportRewriterOptions): Pl
         let newSource = (s && s.toString()) || source
 
         // Ensure all entry file imports are replaced with the correct AEM ClientLib path
-        newSource = newSource.replace(new RegExp(mainEntryPath, 'g'), mainEntryAEMPathWithHash)
+        newSource = newSource.replace(new RegExp(mainEntryPath, 'g'), aemImportPath)
 
         writeFileSync(join(rollupOptions.dir as string, fileName), newSource)
       }

diff --git a/src/helpers.ts b/src/helpers.ts
@@ -89,7 +89,7 @@ export function getAEMImportFilePath(
   if (mainEntryPath && mainEntryPath === path) {
     path = `${path.substring(0, path.indexOf('/'))}.js`
 
-    if (withCacheChecksum && options.caching && options.caching.enabled && rollupOptions) {
+    if (withCacheChecksum && options.caching && options.caching.enabled && rollupOptions !== undefined) {
       const entryPath = join(rollupOptions.dir as string, mainEntryPath)
 
       // Remove '.js'