@nx/rspack 16.1.2 → 16.2.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/package.json +3 -3
  2. package/src/utils/create-compiler.js +1 -2
  3. package/src/utils/create-compiler.js.map +1 -1
  4. package/src/utils/versions.d.ts +4 -4
  5. package/src/utils/versions.js +4 -4
  6. package/src/utils/versions.js.map +1 -1
  7. package/src/utils/with-nx.js +12 -0
  8. package/src/utils/with-nx.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/rspack",
3
- "version": "16.1.2",
3
+ "version": "16.2.0-beta.2",
4
4
  "type": "commonjs",
5
5
  "repository": {
6
6
  "type": "git",
@@ -29,8 +29,8 @@
29
29
  "less-loader": "11.1.0",
30
30
  "sass-loader": "^12.2.0",
31
31
  "stylus-loader": "^7.1.0",
32
- "tsconfig-paths": "4.1.2",
33
- "@nrwl/rspack": "16.1.2"
32
+ "tsconfig-paths": "4.2.0",
33
+ "@nrwl/rspack": "16.2.0-beta.2"
34
34
  },
35
35
  "nx-migrations": {
36
36
  "migrations": "./migrations.json"
package/src/utils/create-compiler.js CHANGED
@@ -6,8 +6,7 @@ const core_1 = require("@rspack/core");
6
6
  const path = require("path");
7
7
  function createCompiler(options, context) {
8
8
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
9
- var _a;
10
- let userDefinedConfig = yield (_a = path.join(context.root, options.rspackConfig), Promise.resolve().then(() => require(_a))).then((x) => x.default || x);
9
+ let userDefinedConfig = yield Promise.resolve(`${path.join(context.root, options.rspackConfig)}`).then(s => require(s)).then((x) => x.default || x);
11
10
  if (typeof userDefinedConfig.then === 'function') {
12
11
  userDefinedConfig = yield userDefinedConfig;
13
12
  }
package/src/utils/create-compiler.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-compiler.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/create-compiler.ts"],"names":[],"mappings":";;;;AACA,uCAA2E;AAC3E,6BAA6B;AAG7B,SAAsB,cAAc,CAClC,OAA6B,EAC7B,OAAwB;;;QAExB,IAAI,iBAAiB,GAAG,MAAM,MAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,6CAC7C,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QAE9B,IAAI,OAAO,iBAAiB,CAAC,IAAI,KAAK,UAAU,EAAE;YAChD,iBAAiB,GAAG,MAAM,iBAAiB,CAAC;SAC7C;QAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAEjE,OAAO,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CAAA;AAfD,wCAeC"}
1
+ {"version":3,"file":"create-compiler.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/create-compiler.ts"],"names":[],"mappings":";;;;AACA,uCAA2E;AAC3E,6BAA6B;AAG7B,SAAsB,cAAc,CAClC,OAA6B,EAC7B,OAAwB;;QAExB,IAAI,iBAAiB,GAAG,MAAM,mBAC5B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,YAAY,CAAC,0BAC7C,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;QAE9B,IAAI,OAAO,iBAAiB,CAAC,IAAI,KAAK,UAAU,EAAE;YAChD,iBAAiB,GAAG,MAAM,iBAAiB,CAAC;SAC7C;QAED,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QAEjE,OAAO,IAAA,qBAAe,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;CAAA;AAfD,wCAeC"}
package/src/utils/versions.d.ts CHANGED
@@ -1,7 +1,7 @@
1
- export declare const rspackCoreVersion = "~0.1.0";
2
- export declare const rspackDevServerVersion = "~0.1.0";
3
- export declare const rspackPluginMinifyVersion = "~0.1.0";
4
- export declare const rspackLessLoaderVersion = "~0.1.0";
1
+ export declare const rspackCoreVersion = "~0.1.12";
2
+ export declare const rspackDevServerVersion = "~0.1.12";
3
+ export declare const rspackPluginMinifyVersion = "~0.1.12";
4
+ export declare const rspackLessLoaderVersion = "^0.0.22";
5
5
  export declare const reactVersion = "~18.2.0";
6
6
  export declare const reactDomVersion = "~18.2.0";
7
7
  export declare const typesReactVersion = "~18.0.28";
package/src/utils/versions.js CHANGED
@@ -1,10 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.eslintPluginReactHooksVersion = exports.eslintPluginReactVersion = exports.eslintPluginJsxA11yVersion = exports.eslintPluginImportVersion = exports.stylusVersion = exports.sassVersion = exports.lessVersion = exports.nestjsMicroservicesVersion = exports.nestjsPlatformExpressVersion = exports.nestjsCoreVersion = exports.nestjsCommonVersion = exports.typesReactDomVersion = exports.typesReactVersion = exports.reactDomVersion = exports.reactVersion = exports.rspackLessLoaderVersion = exports.rspackPluginMinifyVersion = exports.rspackDevServerVersion = exports.rspackCoreVersion = void 0;
4
- exports.rspackCoreVersion = '~0.1.0';
5
- exports.rspackDevServerVersion = '~0.1.0';
6
- exports.rspackPluginMinifyVersion = '~0.1.0';
7
- exports.rspackLessLoaderVersion = '~0.1.0';
4
+ exports.rspackCoreVersion = '~0.1.12';
5
+ exports.rspackDevServerVersion = '~0.1.12';
6
+ exports.rspackPluginMinifyVersion = '~0.1.12';
7
+ exports.rspackLessLoaderVersion = '^0.0.22';
8
8
  exports.reactVersion = '~18.2.0';
9
9
  exports.reactDomVersion = '~18.2.0';
10
10
  exports.typesReactVersion = '~18.0.28';
package/src/utils/versions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAElC,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AAEnC,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,oBAAoB,GAAG,UAAU,CAAC;AAElC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,WAAW,GAAG,OAAO,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,aAAa,GAAG,SAAS,CAAC;AAE1B,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC"}
1
+ {"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/versions.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,SAAS,CAAC;AAC9B,QAAA,sBAAsB,GAAG,SAAS,CAAC;AAEnC,QAAA,yBAAyB,GAAG,SAAS,CAAC;AACtC,QAAA,uBAAuB,GAAG,SAAS,CAAC;AAEpC,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,oBAAoB,GAAG,UAAU,CAAC;AAElC,QAAA,mBAAmB,GAAG,QAAQ,CAAC;AAC/B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,4BAA4B,GAAG,QAAQ,CAAC;AACxC,QAAA,0BAA0B,GAAG,QAAQ,CAAC;AAEtC,QAAA,WAAW,GAAG,OAAO,CAAC;AACtB,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,aAAa,GAAG,SAAS,CAAC;AAE1B,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,0BAA0B,GAAG,OAAO,CAAC;AACrC,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,6BAA6B,GAAG,OAAO,CAAC"}
package/src/utils/with-nx.js CHANGED
@@ -42,6 +42,18 @@ function withNx(_opts = {}) {
42
42
  path: path.join(context.root, options.outputPath),
43
43
  publicPath: '/',
44
44
  filename: isProd && options.target !== 'node'
45
+ ? '[name].[contenthash:8].js'
46
+ : '[name].js',
47
+ chunkFilename: isProd && options.target !== 'node'
48
+ ? '[name].[contenthash:8].js'
49
+ : '[name].js',
50
+ cssFilename: isProd && options.target !== 'node'
51
+ ? '[name].[contenthash:8].css'
52
+ : '[name].css',
53
+ cssChunkFilename: isProd && options.target !== 'node'
54
+ ? '[name].[contenthash:8].css'
55
+ : '[name].css',
56
+ assetModuleFilename: isProd && options.target !== 'node'
45
57
  ? '[name].[contenthash:8][ext]'
46
58
  : '[name][ext]',
47
59
  }, devServer: {
package/src/utils/with-nx.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-nx.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"with-nx.js","sourceRoot":"","sources":["../../../../../packages/rspack/src/utils/with-nx.ts"],"names":[],"mappings":"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"}