fix: normalize to .js extensions when compiling libraries (#893)

* fix: normalize to .js extensions when compiling libraries * chore: move logging to after path normalization * chore: log pretty-printed relative paths
dhis2 · Nov 21, 2024 · 58b33a8 · 58b33a8
1 parent 6e90419
commit 58b33a8
Show file tree

Hide file tree

Showing 2 changed files with 597 additions and 780 deletions.
diff --git a/cli/src/lib/compiler/compile.js b/cli/src/lib/compiler/compile.js
@@ -10,16 +10,16 @@ const {
     createAppEntrypointWrapper,
     createPluginEntrypointWrapper,
 } = require('./entrypoints.js')
-const { extensionPattern } = require('./extensionHelpers.js')
+const {
+    extensionPattern,
+    normalizeExtension,
+} = require('./extensionHelpers.js')
 
 const watchFiles = ({ inputDir, outputDir, processFileCallback, watch }) => {
-    const compileFile = async (source) => {
+    const processFile = async (source) => {
         const relative = path.relative(inputDir, source)
         const destination = path.join(outputDir, relative)
-        reporter.debug(
-            `File ${relative} changed or added... dest: `,
-            path.relative(inputDir, destination)
-        )
+        reporter.debug(`File ${relative} changed or added...`)
         await fs.ensureDir(path.dirname(destination))
         await processFileCallback(source, destination)
     }
@@ -43,8 +43,8 @@ const watchFiles = ({ inputDir, outputDir, processFileCallback, watch }) => {
                 }
                 resolve()
             })
-            .on('add', compileFile)
-            .on('change', compileFile)
+            .on('add', processFile)
+            .on('change', processFile)
             .on('unlink', removeFile)
             .on('error', (error) => {
                 reporter.debugErr('Chokidar error:', error)
@@ -97,6 +97,11 @@ const compile = async ({
     const babelConfig = makeBabelConfig({ moduleType, mode })
 
     const copyFile = async (source, destination) => {
+        reporter.debug(
+            `Copying ${prettyPrint.relativePath(
+                source
+            )} to ${prettyPrint.relativePath(destination)}`
+        )
         await fs.copy(source, destination)
     }
     const compileFile = async (source, destination) => {
@@ -106,7 +111,19 @@ const compile = async ({
                     source,
                     babelConfig
                 )
-                await fs.writeFile(destination, result.code)
+
+                // Always write .js files
+                const jsDestination = normalizeExtension(destination)
+
+                reporter.debug(
+                    `Compiled ${prettyPrint.relativePath(
+                        source
+                    )} with Babel, saving to ${prettyPrint.relativePath(
+                        jsDestination
+                    )}`
+                )
+
+                await fs.writeFile(jsDestination, result.code)
             } catch (err) {
                 reporter.dumpErr(err)
                 reporter.error(