@posthog/webpack-plugin 1.1.4 → 1.2.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,eAAe,CAAA;AACpD,OAAO,EAAE,YAAY,EAAiB,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAS,MAAM,SAAS,CAAA;AAI5C,cAAc,UAAU,CAAA;AAExB,qBAAa,oBAAoB;IAC7B,cAAc,EAAE,oBAAoB,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;gBAEF,YAAY,EAAE,YAAY;IAatC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IAmBpB,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CA+CjG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAgB,MAAM,eAAe,CAAA;AACpD,OAAO,EAAE,YAAY,EAAiB,oBAAoB,EAAE,MAAM,UAAU,CAAA;AAC5E,OAAO,EAAE,WAAW,EAA2C,MAAM,SAAS,CAAA;AAI9E,cAAc,UAAU,CAAA;AAExB,qBAAa,oBAAoB;IAC7B,cAAc,EAAE,oBAAoB,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;gBAEF,YAAY,EAAE,YAAY;IAatC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,IAAI;IA0BpB,iBAAiB,CAAC,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CA2CjG"}

package/dist/index.js

@@ -11,6 +11,9 @@ var __webpack_modules__ = {
     },
     path: function(module) {
         module.exports = require("path");
+    },
+    webpack: function(module) {
+        module.exports = require("webpack");
     }
 };
 var __webpack_module_cache__ = {};
@@ -61,9 +64,10 @@ var __webpack_exports__ = {};
     });
     var _posthog_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("@posthog/core");
     var _config__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./config");
-    var _posthog_core_process__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("@posthog/core/process");
-    var path__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("path");
-    var path__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_3__);
+    var webpack__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("webpack");
+    var _posthog_core_process__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("@posthog/core/process");
+    var path__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("path");
+    var path__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/ __webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_4__);
     var __WEBPACK_REEXPORT_OBJECT__ = {};
     for(var __WEBPACK_IMPORT_KEY__ in _config__WEBPACK_IMPORTED_MODULE_1__)if ([
         "default",
@@ -74,17 +78,23 @@ var __webpack_exports__ = {};
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     class PosthogWebpackPlugin {
         apply(compiler) {
+            new webpack__WEBPACK_IMPORTED_MODULE_2__.SourceMapDevToolPlugin({
+                filename: '[file].map',
+                noSources: false,
+                moduleFilenameTemplate: '[resource-path]',
+                append: this.resolvedConfig.sourcemaps.deleteAfterUpload ? false : void 0
+            }).apply(compiler);
             const onDone = async (stats, callback)=>{
                 callback = callback || (()=>{});
                 try {
                     await this.processSourceMaps(stats.compilation, this.resolvedConfig);
                 } catch (error) {
                     const errorMessage = error instanceof Error ? error.message : error;
-                    this.logger.error('Error running PostHog sourcemap plugin:', errorMessage);
+                    this.logger.error('Error running PostHog webpack plugin:', errorMessage);
                 }
                 return callback();
             };
-            if (compiler.hooks) compiler.hooks.done.tapAsync('SourcemapWebpackPlugin', onDone);
+            if (compiler.hooks) compiler.hooks.done.tapAsync('PosthogWebpackPlugin', onDone);
             else compiler.plugin('done', onDone);
         }
         async processSourceMaps(compilation, config) {
@@ -95,14 +105,14 @@ var __webpack_exports__ = {};
             ];
             const chunkArray = Array.from(compilation.chunks);
             if (0 == chunkArray.length) return;
-            const filePaths = chunkArray.flatMap((chunk)=>Array.from(chunk.files).map((file)=>path__WEBPACK_IMPORTED_MODULE_3___default().resolve(outputDirectory, file)));
-            const [commonDirectory, relativeFilePaths] = splitFilePaths(filePaths);
-            args.push('--directory', commonDirectory);
-            for (const chunkPath of relativeFilePaths)args.push('--include', `**/${chunkPath}`);
+            chunkArray.forEach((chunk)=>chunk.files.forEach((file)=>{
+                    const chunkPath = path__WEBPACK_IMPORTED_MODULE_4___default().resolve(outputDirectory, file);
+                    args.push('--file', chunkPath);
+                }));
             if (config.sourcemaps.project) args.push('--project', config.sourcemaps.project);
             if (config.sourcemaps.version) args.push('--version', config.sourcemaps.version);
             if (config.sourcemaps.deleteAfterUpload) args.push('--delete-after');
-            await (0, _posthog_core_process__WEBPACK_IMPORTED_MODULE_2__.spawnLocal)(config.cliBinaryPath, args, {
+            await (0, _posthog_core_process__WEBPACK_IMPORTED_MODULE_3__.spawnLocal)(config.cliBinaryPath, args, {
                 cwd: process.cwd(),
                 env: {
                     ...process.env,
@@ -124,27 +134,6 @@ var __webpack_exports__ = {};
     function assertValue(value, message) {
         if (!value) throw new Error(message);
     }
-    function splitFilePaths(absolutePaths) {
-        if (!absolutePaths || 0 === absolutePaths.length) return [
-            process.cwd(),
-            []
-        ];
-        let commonDir = path__WEBPACK_IMPORTED_MODULE_3___default().dirname(absolutePaths[0]);
-        const isCommonAncestor = (candidate)=>absolutePaths.every((p)=>{
-                const rel = path__WEBPACK_IMPORTED_MODULE_3___default().relative(candidate, p);
-                return '' === rel || !rel.startsWith('..') && !path__WEBPACK_IMPORTED_MODULE_3___default().isAbsolute(rel);
-            });
-        while(!isCommonAncestor(commonDir)){
-            const parent = path__WEBPACK_IMPORTED_MODULE_3___default().dirname(commonDir);
-            if (parent === commonDir) break;
-            commonDir = parent;
-        }
-        const relativePaths = absolutePaths.map((p)=>path__WEBPACK_IMPORTED_MODULE_3___default().relative(commonDir, p).replace(/\\/g, '/'));
-        return [
-            commonDir,
-            relativePaths
-        ];
-    }
 })();
 exports.PosthogWebpackPlugin = __webpack_exports__.PosthogWebpackPlugin;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [

package/dist/index.mjs

@@ -1,21 +1,28 @@
 import { createLogger } from "@posthog/core";
 import { resolveConfig } from "./config.mjs";
+import { SourceMapDevToolPlugin } from "webpack";
 import { spawnLocal } from "@posthog/core/process";
 import path from "path";
 export * from "./config.mjs";
 class PosthogWebpackPlugin {
     apply(compiler) {
+        new SourceMapDevToolPlugin({
+            filename: '[file].map',
+            noSources: false,
+            moduleFilenameTemplate: '[resource-path]',
+            append: this.resolvedConfig.sourcemaps.deleteAfterUpload ? false : void 0
+        }).apply(compiler);
         const onDone = async (stats, callback)=>{
             callback = callback || (()=>{});
             try {
                 await this.processSourceMaps(stats.compilation, this.resolvedConfig);
             } catch (error) {
                 const errorMessage = error instanceof Error ? error.message : error;
-                this.logger.error('Error running PostHog sourcemap plugin:', errorMessage);
+                this.logger.error('Error running PostHog webpack plugin:', errorMessage);
             }
             return callback();
         };
-        if (compiler.hooks) compiler.hooks.done.tapAsync('SourcemapWebpackPlugin', onDone);
+        if (compiler.hooks) compiler.hooks.done.tapAsync('PosthogWebpackPlugin', onDone);
         else compiler.plugin('done', onDone);
     }
     async processSourceMaps(compilation, config) {
@@ -26,10 +33,10 @@ class PosthogWebpackPlugin {
         ];
         const chunkArray = Array.from(compilation.chunks);
         if (0 == chunkArray.length) return;
-        const filePaths = chunkArray.flatMap((chunk)=>Array.from(chunk.files).map((file)=>path.resolve(outputDirectory, file)));
-        const [commonDirectory, relativeFilePaths] = splitFilePaths(filePaths);
-        args.push('--directory', commonDirectory);
-        for (const chunkPath of relativeFilePaths)args.push('--include', `**/${chunkPath}`);
+        chunkArray.forEach((chunk)=>chunk.files.forEach((file)=>{
+                const chunkPath = path.resolve(outputDirectory, file);
+                args.push('--file', chunkPath);
+            }));
         if (config.sourcemaps.project) args.push('--project', config.sourcemaps.project);
         if (config.sourcemaps.version) args.push('--version', config.sourcemaps.version);
         if (config.sourcemaps.deleteAfterUpload) args.push('--delete-after');
@@ -55,25 +62,4 @@ class PosthogWebpackPlugin {
 function assertValue(value, message) {
     if (!value) throw new Error(message);
 }
-function splitFilePaths(absolutePaths) {
-    if (!absolutePaths || 0 === absolutePaths.length) return [
-        process.cwd(),
-        []
-    ];
-    let commonDir = path.dirname(absolutePaths[0]);
-    const isCommonAncestor = (candidate)=>absolutePaths.every((p)=>{
-            const rel = path.relative(candidate, p);
-            return '' === rel || !rel.startsWith('..') && !path.isAbsolute(rel);
-        });
-    while(!isCommonAncestor(commonDir)){
-        const parent = path.dirname(commonDir);
-        if (parent === commonDir) break;
-        commonDir = parent;
-    }
-    const relativePaths = absolutePaths.map((p)=>path.relative(commonDir, p).replace(/\\/g, '/'));
-    return [
-        commonDir,
-        relativePaths
-    ];
-}
 export { PosthogWebpackPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posthog/webpack-plugin",
-  "version": "1.1.4",
+  "version": "1.2.0",
   "description": "Webpack plugin for Posthog 🦔",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@posthog/cli": "~0.5.16",
+    "@posthog/cli": "~0.5.17",
     "@posthog/core": "1.7.1"
   },
   "files": [

package/src/index.ts

@@ -1,6 +1,6 @@
 import { Logger, createLogger } from '@posthog/core'
 import { PluginConfig, resolveConfig, ResolvedPluginConfig } from './config'
-import { Compilation, Stats } from 'webpack'
+import { Compilation, Stats, SourceMapDevToolPlugin, Compiler } from 'webpack'
 import { spawnLocal } from '@posthog/core/process'
 import path from 'path'
 
@@ -24,19 +24,26 @@ export class PosthogWebpackPlugin {
     }
 
     apply(compiler: any): void {
+        new SourceMapDevToolPlugin({
+            filename: '[file].map',
+            noSources: false,
+            moduleFilenameTemplate: '[resource-path]',
+            append: this.resolvedConfig.sourcemaps.deleteAfterUpload ? false : undefined,
+        }).apply(compiler)
+
         const onDone = async (stats: Stats, callback: any): Promise<void> => {
             callback = callback || (() => {})
             try {
                 await this.processSourceMaps(stats.compilation, this.resolvedConfig)
             } catch (error) {
                 const errorMessage = error instanceof Error ? error.message : error
-                this.logger.error('Error running PostHog sourcemap plugin:', errorMessage)
+                this.logger.error('Error running PostHog webpack plugin:', errorMessage)
             }
             return callback()
         }
 
         if (compiler.hooks) {
-            compiler.hooks.done.tapAsync('SourcemapWebpackPlugin', onDone)
+            compiler.hooks.done.tapAsync('PosthogWebpackPlugin', onDone)
         } else {
             compiler.plugin('done', onDone)
         }
@@ -54,16 +61,12 @@ export class PosthogWebpackPlugin {
             return
         }
 
-        const filePaths = chunkArray.flatMap((chunk) =>
-            Array.from(chunk.files).map((file) => path.resolve(outputDirectory, file))
+        chunkArray.forEach((chunk) =>
+            chunk.files.forEach((file) => {
+                const chunkPath = path.resolve(outputDirectory, file)
+                args.push('--file', chunkPath)
+            })
         )
-        const [commonDirectory, relativeFilePaths] = splitFilePaths(filePaths)
-
-        args.push('--directory', commonDirectory)
-
-        for (const chunkPath of relativeFilePaths) {
-            args.push('--include', `**/${chunkPath}`)
-        }
 
         if (config.sourcemaps.project) {
             args.push('--project', config.sourcemaps.project)
@@ -96,36 +99,3 @@ function assertValue(value: any, message: string): void {
         throw new Error(message)
     }
 }
-
-// Convert a list of absolute file path to a common absolute directory ancestor path and relative path
-function splitFilePaths(absolutePaths: string[]): [string, string[]] {
-    if (!absolutePaths || absolutePaths.length === 0) {
-        return [process.cwd(), []]
-    }
-
-    // Start with the directory of the first path and walk up until we find a common ancestor
-    let commonDir = path.dirname(absolutePaths[0])
-
-    const isCommonAncestor = (candidate: string): boolean => {
-        return absolutePaths.every((p) => {
-            const rel = path.relative(candidate, p)
-            // If rel starts with '..' or is absolute, p is not inside candidate
-            return rel === '' || (!rel.startsWith('..') && !path.isAbsolute(rel))
-        })
-    }
-
-    // If the first candidate isn't a common ancestor, walk up the directory tree
-    while (!isCommonAncestor(commonDir)) {
-        const parent = path.dirname(commonDir)
-        if (parent === commonDir) {
-            // reached filesystem root
-            break
-        }
-        commonDir = parent
-    }
-
-    // Compute relative paths from the common directory, normalize to forward slashes for globs
-    const relativePaths = absolutePaths.map((p) => path.relative(commonDir, p).replace(/\\/g, '/'))
-
-    return [commonDir, relativePaths]
-}