@teambit/webpack 0.0.973 → 0.0.975

package/dist/{preview-1675222253639.js → preview-1675394883140.js}

@@ -1,5 +1,5 @@
-import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.webpack_webpack@0.0.973/dist/webpack.composition.js';
-import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.webpack_webpack@0.0.973/dist/webpack.docs.mdx';
+import * as compositions_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.webpack_webpack@0.0.975/dist/webpack.composition.js';
+import * as overview_0 from '/home/circleci/Library/Caches/Bit/capsules/8891be5ad3d35bfc38b9cd90c0e05b598a5a55af/teambit.webpack_webpack@0.0.975/dist/webpack.docs.mdx';
 
 export const compositions = [compositions_0];
 export const overview = [overview_0];

package/dist/webpack.dev-server.d.ts

@@ -10,9 +10,18 @@ export interface WebpackConfigWithDevServer extends Configuration {
 export declare class WebpackDevServer implements DevServer {
     private config;
     private webpack;
-    private webpackDevServerModulePath;
+    /**
+     * path to the webpack-dev-server module or instance of webpack-dev-server.
+     * this accept getting an instance for backward compatibility.
+     */
+    private webpackDevServer;
     private readonly WsDevServer;
-    constructor(config: WebpackConfigWithDevServer, webpack: typeof webpackCompiler, webpackDevServerModulePath: string);
+    constructor(config: WebpackConfigWithDevServer, webpack: typeof webpackCompiler, 
+    /**
+     * path to the webpack-dev-server module or instance of webpack-dev-server.
+     * this accept getting an instance for backward compatibility.
+     */
+    webpackDevServer: string | typeof WDS);
     private getCompiler;
     id: string;
     displayName: string;

package/dist/webpack.dev-server.js

@@ -42,23 +42,35 @@ function _webpack() {
   return data;
 }
 class WebpackDevServer {
-  constructor(config, webpack, webpackDevServerModulePath) {
+  constructor(config, webpack,
+  /**
+   * path to the webpack-dev-server module or instance of webpack-dev-server.
+   * this accept getting an instance for backward compatibility.
+   */
+  webpackDevServer) {
     this.config = config;
     this.webpack = webpack;
-    this.webpackDevServerModulePath = webpackDevServerModulePath;
+    this.webpackDevServer = webpackDevServer;
     (0, _defineProperty2().default)(this, "WsDevServer", void 0);
     (0, _defineProperty2().default)(this, "id", _webpack().WebpackAspect.id);
     (0, _defineProperty2().default)(this, "displayName", 'Webpack dev server');
-    // eslint-disable-next-line import/no-dynamic-require, global-require
-    this.WsDevServer = require(this.webpackDevServerModulePath);
+    if (typeof this.webpackDevServer === 'string') {
+      // eslint-disable-next-line import/no-dynamic-require, global-require
+      this.WsDevServer = require(this.webpackDevServer);
+    } else {
+      this.WsDevServer = this.webpackDevServer;
+    }
   }
   getCompiler() {
     return this.webpack(this.config);
   }
   version() {
+    if (typeof this.webpackDevServer !== 'string') {
+      return 'unknown';
+    }
     // Resolve version from the webpack-dev-server package.json
     try {
-      const root = (0, _findRoot().default)(this.webpackDevServerModulePath);
+      const root = (0, _findRoot().default)(this.webpackDevServer);
       const packageJsonPath = (0, _path().join)(root, 'package.json');
       // eslint-disable-next-line import/no-dynamic-require, global-require
       const packageJson = require(packageJsonPath);

package/dist/webpack.dev-server.js.map

@@ -1 +1 @@
-{"version":3,"names":["WebpackDevServer","constructor","config","webpack","webpackDevServerModulePath","WebpackAspect","id","WsDevServer","require","getCompiler","version","root","findRoot","packageJsonPath","join","packageJson","err","displayConfig","inspect","depth","listen","port","devServer","Error","addSignalListener","addDevServerEntrypoints","webpackDs","start","server","process","on","exit"],"sources":["webpack.dev-server.ts"],"sourcesContent":["import { join } from 'path';\nimport type { DevServer } from '@teambit/bundler';\nimport findRoot from 'find-root';\nimport type { Server } from 'http';\nimport type { webpack as webpackCompiler, Configuration } from 'webpack';\nimport type * as WDS from 'webpack-dev-server';\nimport { inspect } from 'util';\nimport { WebpackAspect } from './webpack.aspect';\n\nexport interface WebpackConfigWithDevServer extends Configuration {\n  devServer: WDS.Configuration;\n  favicon?: string;\n}\nexport class WebpackDevServer implements DevServer {\n  private readonly WsDevServer: typeof WDS;\n  constructor(\n    private config: WebpackConfigWithDevServer,\n    private webpack: typeof webpackCompiler,\n    private webpackDevServerModulePath: string\n  ) {\n    // eslint-disable-next-line import/no-dynamic-require, global-require\n    this.WsDevServer = require(this.webpackDevServerModulePath);\n  }\n\n  private getCompiler(): any {\n    return this.webpack(this.config);\n  }\n\n  id = WebpackAspect.id;\n\n  displayName = 'Webpack dev server';\n\n  version(): string {\n    // Resolve version from the webpack-dev-server package.json\n    try {\n      const root = findRoot(this.webpackDevServerModulePath);\n      const packageJsonPath = join(root, 'package.json');\n      // eslint-disable-next-line import/no-dynamic-require, global-require\n      const packageJson = require(packageJsonPath);\n      return packageJson.version;\n    } catch (err) {\n      return 'unknown';\n    }\n  }\n\n  displayConfig(): string {\n    return inspect(this.config, { depth: 10 });\n  }\n\n  async listen(port: number): Promise<Server> {\n    if (!this.config.devServer) {\n      throw new Error('Missing devServer configuration for webpack');\n    }\n    // Prevent different port between the config port and the listen arg port\n    this.config.devServer.port = port;\n\n    // Adding signal listeners to make sure we immediately close the process on sigint / sigterm (otherwise webpack dev server closing will take time)\n    this.addSignalListener();\n\n    // Compatibility check for Webpack dev server v3 (e.g. for Angular v8)\n    if (typeof (this.WsDevServer as any).addDevServerEntrypoints !== 'undefined') {\n      // @ts-ignore in the capsules it throws an error about compatibilities issues between webpack.compiler and webpackDevServer/webpack/compiler\n      const webpackDs = new (this.WsDevServer as any)(this.getCompiler(), this.config.devServer);\n      return webpackDs.listen(port);\n    }\n\n    // @ts-ignore in the capsules it throws an error about compatibilities issues between webpack.compiler and webpackDevServer/webpack/compiler\n    const webpackDs: WDS = new this.WsDevServer(this.config.devServer, this.getCompiler());\n    await webpackDs.start();\n\n    return webpackDs.server;\n  }\n\n  private addSignalListener() {\n    process.on('SIGTERM', () => {\n      process.exit();\n    });\n\n    process.on('SIGINT', () => {\n      process.exit();\n    });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAMO,MAAMA,gBAAgB,CAAsB;EAEjDC,WAAW,CACDC,MAAkC,EAClCC,OAA+B,EAC/BC,0BAAkC,EAC1C;IAAA,KAHQF,MAAkC,GAAlCA,MAAkC;IAAA,KAClCC,OAA+B,GAA/BA,OAA+B;IAAA,KAC/BC,0BAAkC,GAAlCA,0BAAkC;IAAA;IAAA,4CAUvCC,wBAAa,CAACC,EAAE;IAAA,qDAEP,oBAAoB;IAVhC;IACA,IAAI,CAACC,WAAW,GAAGC,OAAO,CAAC,IAAI,CAACJ,0BAA0B,CAAC;EAC7D;EAEQK,WAAW,GAAQ;IACzB,OAAO,IAAI,CAACN,OAAO,CAAC,IAAI,CAACD,MAAM,CAAC;EAClC;EAMAQ,OAAO,GAAW;IAChB;IACA,IAAI;MACF,MAAMC,IAAI,GAAG,IAAAC,mBAAQ,EAAC,IAAI,CAACR,0BAA0B,CAAC;MACtD,MAAMS,eAAe,GAAG,IAAAC,YAAI,EAACH,IAAI,EAAE,cAAc,CAAC;MAClD;MACA,MAAMI,WAAW,GAAGP,OAAO,CAACK,eAAe,CAAC;MAC5C,OAAOE,WAAW,CAACL,OAAO;IAC5B,CAAC,CAAC,OAAOM,GAAG,EAAE;MACZ,OAAO,SAAS;IAClB;EACF;EAEAC,aAAa,GAAW;IACtB,OAAO,IAAAC,eAAO,EAAC,IAAI,CAAChB,MAAM,EAAE;MAAEiB,KAAK,EAAE;IAAG,CAAC,CAAC;EAC5C;EAEA,MAAMC,MAAM,CAACC,IAAY,EAAmB;IAC1C,IAAI,CAAC,IAAI,CAACnB,MAAM,CAACoB,SAAS,EAAE;MAC1B,MAAM,IAAIC,KAAK,CAAC,6CAA6C,CAAC;IAChE;IACA;IACA,IAAI,CAACrB,MAAM,CAACoB,SAAS,CAACD,IAAI,GAAGA,IAAI;;IAEjC;IACA,IAAI,CAACG,iBAAiB,EAAE;;IAExB;IACA,IAAI,OAAQ,IAAI,CAACjB,WAAW,CAASkB,uBAAuB,KAAK,WAAW,EAAE;MAC5E;MACA,MAAMC,SAAS,GAAG,IAAK,IAAI,CAACnB,WAAW,CAAS,IAAI,CAACE,WAAW,EAAE,EAAE,IAAI,CAACP,MAAM,CAACoB,SAAS,CAAC;MAC1F,OAAOI,SAAS,CAACN,MAAM,CAACC,IAAI,CAAC;IAC/B;;IAEA;IACA,MAAMK,SAAc,GAAG,IAAI,IAAI,CAACnB,WAAW,CAAC,IAAI,CAACL,MAAM,CAACoB,SAAS,EAAE,IAAI,CAACb,WAAW,EAAE,CAAC;IACtF,MAAMiB,SAAS,CAACC,KAAK,EAAE;IAEvB,OAAOD,SAAS,CAACE,MAAM;EACzB;EAEQJ,iBAAiB,GAAG;IAC1BK,OAAO,CAACC,EAAE,CAAC,SAAS,EAAE,MAAM;MAC1BD,OAAO,CAACE,IAAI,EAAE;IAChB,CAAC,CAAC;IAEFF,OAAO,CAACC,EAAE,CAAC,QAAQ,EAAE,MAAM;MACzBD,OAAO,CAACE,IAAI,EAAE;IAChB,CAAC,CAAC;EACJ;AACF;AAAC"}
+{"version":3,"names":["WebpackDevServer","constructor","config","webpack","webpackDevServer","WebpackAspect","id","WsDevServer","require","getCompiler","version","root","findRoot","packageJsonPath","join","packageJson","err","displayConfig","inspect","depth","listen","port","devServer","Error","addSignalListener","addDevServerEntrypoints","webpackDs","start","server","process","on","exit"],"sources":["webpack.dev-server.ts"],"sourcesContent":["import { join } from 'path';\nimport type { DevServer } from '@teambit/bundler';\nimport findRoot from 'find-root';\nimport type { Server } from 'http';\nimport type { webpack as webpackCompiler, Configuration } from 'webpack';\nimport type * as WDS from 'webpack-dev-server';\nimport { inspect } from 'util';\nimport { WebpackAspect } from './webpack.aspect';\n\nexport interface WebpackConfigWithDevServer extends Configuration {\n  devServer: WDS.Configuration;\n  favicon?: string;\n}\nexport class WebpackDevServer implements DevServer {\n  private readonly WsDevServer: typeof WDS;\n  constructor(\n    private config: WebpackConfigWithDevServer,\n    private webpack: typeof webpackCompiler,\n    /**\n     * path to the webpack-dev-server module or instance of webpack-dev-server.\n     * this accept getting an instance for backward compatibility.\n     */\n    private webpackDevServer: string | typeof WDS\n  ) {\n    if (typeof this.webpackDevServer === 'string'){\n      // eslint-disable-next-line import/no-dynamic-require, global-require\n      this.WsDevServer = require(this.webpackDevServer);\n    } else {\n      this.WsDevServer = this.webpackDevServer;\n    }\n  }\n\n  private getCompiler(): any {\n    return this.webpack(this.config);\n  }\n\n  id = WebpackAspect.id;\n\n  displayName = 'Webpack dev server';\n\n  version(): string {\n    if (typeof this.webpackDevServer !== 'string') {\n      return 'unknown';\n    }\n    // Resolve version from the webpack-dev-server package.json\n    try {\n      const root = findRoot(this.webpackDevServer);\n      const packageJsonPath = join(root, 'package.json');\n      // eslint-disable-next-line import/no-dynamic-require, global-require\n      const packageJson = require(packageJsonPath);\n      return packageJson.version;\n    } catch (err) {\n      return 'unknown';\n    }\n  }\n\n  displayConfig(): string {\n    return inspect(this.config, { depth: 10 });\n  }\n\n  async listen(port: number): Promise<Server> {\n    if (!this.config.devServer) {\n      throw new Error('Missing devServer configuration for webpack');\n    }\n    // Prevent different port between the config port and the listen arg port\n    this.config.devServer.port = port;\n\n    // Adding signal listeners to make sure we immediately close the process on sigint / sigterm (otherwise webpack dev server closing will take time)\n    this.addSignalListener();\n\n    // Compatibility check for Webpack dev server v3 (e.g. for Angular v8)\n    if (typeof (this.WsDevServer as any).addDevServerEntrypoints !== 'undefined') {\n      // @ts-ignore in the capsules it throws an error about compatibilities issues between webpack.compiler and webpackDevServer/webpack/compiler\n      const webpackDs = new (this.WsDevServer as any)(this.getCompiler(), this.config.devServer);\n      return webpackDs.listen(port);\n    }\n\n    // @ts-ignore in the capsules it throws an error about compatibilities issues between webpack.compiler and webpackDevServer/webpack/compiler\n    const webpackDs: WDS = new this.WsDevServer(this.config.devServer, this.getCompiler());\n    await webpackDs.start();\n\n    return webpackDs.server;\n  }\n\n  private addSignalListener() {\n    process.on('SIGTERM', () => {\n      process.exit();\n    });\n\n    process.on('SIGINT', () => {\n      process.exit();\n    });\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;;AAAA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAEA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAIA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AACA;EAAA;EAAA;IAAA;EAAA;EAAA;AAAA;AAMO,MAAMA,gBAAgB,CAAsB;EAEjDC,WAAW,CACDC,MAAkC,EAClCC,OAA+B;EACvC;AACJ;AACA;AACA;EACYC,gBAAqC,EAC7C;IAAA,KAPQF,MAAkC,GAAlCA,MAAkC;IAAA,KAClCC,OAA+B,GAA/BA,OAA+B;IAAA,KAK/BC,gBAAqC,GAArCA,gBAAqC;IAAA;IAAA,4CAc1CC,wBAAa,CAACC,EAAE;IAAA,qDAEP,oBAAoB;IAdhC,IAAI,OAAO,IAAI,CAACF,gBAAgB,KAAK,QAAQ,EAAC;MAC5C;MACA,IAAI,CAACG,WAAW,GAAGC,OAAO,CAAC,IAAI,CAACJ,gBAAgB,CAAC;IACnD,CAAC,MAAM;MACL,IAAI,CAACG,WAAW,GAAG,IAAI,CAACH,gBAAgB;IAC1C;EACF;EAEQK,WAAW,GAAQ;IACzB,OAAO,IAAI,CAACN,OAAO,CAAC,IAAI,CAACD,MAAM,CAAC;EAClC;EAMAQ,OAAO,GAAW;IAChB,IAAI,OAAO,IAAI,CAACN,gBAAgB,KAAK,QAAQ,EAAE;MAC7C,OAAO,SAAS;IAClB;IACA;IACA,IAAI;MACF,MAAMO,IAAI,GAAG,IAAAC,mBAAQ,EAAC,IAAI,CAACR,gBAAgB,CAAC;MAC5C,MAAMS,eAAe,GAAG,IAAAC,YAAI,EAACH,IAAI,EAAE,cAAc,CAAC;MAClD;MACA,MAAMI,WAAW,GAAGP,OAAO,CAACK,eAAe,CAAC;MAC5C,OAAOE,WAAW,CAACL,OAAO;IAC5B,CAAC,CAAC,OAAOM,GAAG,EAAE;MACZ,OAAO,SAAS;IAClB;EACF;EAEAC,aAAa,GAAW;IACtB,OAAO,IAAAC,eAAO,EAAC,IAAI,CAAChB,MAAM,EAAE;MAAEiB,KAAK,EAAE;IAAG,CAAC,CAAC;EAC5C;EAEA,MAAMC,MAAM,CAACC,IAAY,EAAmB;IAC1C,IAAI,CAAC,IAAI,CAACnB,MAAM,CAACoB,SAAS,EAAE;MAC1B,MAAM,IAAIC,KAAK,CAAC,6CAA6C,CAAC;IAChE;IACA;IACA,IAAI,CAACrB,MAAM,CAACoB,SAAS,CAACD,IAAI,GAAGA,IAAI;;IAEjC;IACA,IAAI,CAACG,iBAAiB,EAAE;;IAExB;IACA,IAAI,OAAQ,IAAI,CAACjB,WAAW,CAASkB,uBAAuB,KAAK,WAAW,EAAE;MAC5E;MACA,MAAMC,SAAS,GAAG,IAAK,IAAI,CAACnB,WAAW,CAAS,IAAI,CAACE,WAAW,EAAE,EAAE,IAAI,CAACP,MAAM,CAACoB,SAAS,CAAC;MAC1F,OAAOI,SAAS,CAACN,MAAM,CAACC,IAAI,CAAC;IAC/B;;IAEA;IACA,MAAMK,SAAc,GAAG,IAAI,IAAI,CAACnB,WAAW,CAAC,IAAI,CAACL,MAAM,CAACoB,SAAS,EAAE,IAAI,CAACb,WAAW,EAAE,CAAC;IACtF,MAAMiB,SAAS,CAACC,KAAK,EAAE;IAEvB,OAAOD,SAAS,CAACE,MAAM;EACzB;EAEQJ,iBAAiB,GAAG;IAC1BK,OAAO,CAACC,EAAE,CAAC,SAAS,EAAE,MAAM;MAC1BD,OAAO,CAACE,IAAI,EAAE;IAChB,CAAC,CAAC;IAEFF,OAAO,CAACC,EAAE,CAAC,QAAQ,EAAE,MAAM;MACzBD,OAAO,CAACE,IAAI,EAAE;IAChB,CAAC,CAAC;EACJ;AACF;AAAC"}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@teambit/webpack",
-  "version": "0.0.973",
+  "version": "0.0.975",
   "homepage": "https://bit.dev/teambit/webpack/webpack",
   "main": "dist/index.js",
   "componentId": {
     "scope": "teambit.webpack",
     "name": "webpack",
-    "version": "0.0.973"
+    "version": "0.0.975"
   },
   "dependencies": {
     "webpack": "5.51.1",
@@ -48,11 +48,11 @@
     "@teambit/harmony": "0.4.6",
     "@teambit/webpack.modules.config-mutator": "0.0.151",
     "@teambit/bit-error": "0.0.402",
-    "@teambit/bundler": "0.0.973",
-    "@teambit/logger": "0.0.746",
-    "@teambit/cli": "0.0.653",
-    "@teambit/pubsub": "0.0.973",
-    "@teambit/workspace": "0.0.973",
+    "@teambit/bundler": "0.0.975",
+    "@teambit/logger": "0.0.748",
+    "@teambit/cli": "0.0.655",
+    "@teambit/pubsub": "0.0.975",
+    "@teambit/workspace": "0.0.975",
     "@teambit/webpack.modules.generate-expose-loaders": "0.0.10",
     "@teambit/webpack.modules.generate-externals": "0.0.11",
     "@teambit/webpack.plugins.inject-head-webpack-plugin": "0.0.3"
@@ -70,7 +70,7 @@
     "@types/testing-library__jest-dom": "5.9.5"
   },
   "peerDependencies": {
-    "@teambit/legacy": "1.0.435",
+    "@teambit/legacy": "1.0.437",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"
   },