Merge pull request #134 from madtisa/f/support-bundling-on-windows

Support bundling on windows
pinojs · Nov 1, 2023 · 9048a2e · 9048a2e
2 parents 5bfb553 + 2ab8805
commit 9048a2e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,12 +3,13 @@ name: CI
 on: [push, pull_request]
 jobs:
   build:
-    runs-on: ubuntu-latest
     permissions:
       contents: read
     strategy:
       matrix:
-        node-version: [14.x, 16.x, 18.x]
+        node-version: [18.x]
+        os: [ubuntu-latest, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -20,7 +21,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: node_modules
-          key: node-modules-${{ hashFiles('package.json') }}
+          key: node-modules-${{ matrix.os }}-${{ hashFiles('package.json') }}
       - name: Install dependencies
         run: npm install
       - name: Run Tests

diff --git a/src/index.js b/src/index.js
@@ -1,7 +1,7 @@
 const webpack = require('webpack')
 const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency')
 const { createFsFromVolume, Volume } = require('memfs')
-const { sep, dirname, relative } = require('path')
+const { join, dirname, relative } = require('path')
 // const { cache } = require('webpack') // Cache handling missing
 
 const fileBanner = `/* Start of pino-webpack-plugin additions */
@@ -25,6 +25,10 @@ const PLUGIN_NAME = 'PinoWebpackPlugin'
 
 const fs = createFsFromVolume(new Volume())
 
+function quote(path) {
+  return `'${path.replace(/([\\'])/g, '\\$1')}'`
+}
+
 class PinoWebpackPlugin {
   constructor(options) {
     options = { transports: [], ...options }
@@ -164,7 +168,7 @@ class PinoWebpackPlugin {
                   fileBanner,
                   '\n',
                   `globalThis.__bundlerPathsOverrides = {${dependenciesFiles.map(
-                    ([workerId, file]) => `'${workerId}': pinoWebpackAbsolutePath('${relativePath}${sep}${file}')`
+                    ([workerId, file]) => `'${workerId}': pinoWebpackAbsolutePath(${quote(join(relativePath, file))})`
                   )}};`,
                   '\n',
                   '/* End of pino-webpack-plugin additions */',

diff --git a/test/test-utils.js b/test/test-utils.js
@@ -95,14 +95,18 @@ function createTests(tapInstance, webpackConfig, distFolder) {
       const fileContent = readFileSync(resolve(distFolder, filePath), 'utf-8')
       // Test if the file starts with the expected banner
       tapInstance.ok(fileContent.startsWith(banner), `${basename(filePath)} should starts with banner`)
+      const quoteRegex = (path) => `'${path.replace(/\\/g, '\\\\\\\\')}'`
       for (const dependencyKey in dependencies) {
-        // For each dependency, test if the expeted file is in the __bundlerPathsOverrides object
+        // For each dependency, test if the expected file is in the __bundlerPathsOverrides object
         const dependencyRegexp = new RegExp(
-          `globalThis\\.__bundlerPathsOverrides = \\{.*?'${dependencyKey}': pinoWebpackAbsolutePath\\('${
-            (relative(dirname(filePath), dirname(dependencies[dependencyKey])) || '.') +
-            '/' +
-            dependencies[dependencyKey]
-          }'\\).*?\\}`
+          `globalThis\\.__bundlerPathsOverrides = \\{.*?'${dependencyKey}': pinoWebpackAbsolutePath\\(${
+            quoteRegex(
+              join(
+                relative(dirname(filePath), dirname(dependencies[dependencyKey])),
+                dependencies[dependencyKey]
+              )
+            )
+          }\\).*?\\}`
         )
         tapInstance.ok(fileContent.match(dependencyRegexp), `${dependencyKey} should have correct path in ${filePath}`)
       }