@meteorjs/rspack 0.1.5 → 0.2.50

package/index.d.ts

@@ -43,7 +43,7 @@ type MeteorEnv = Record<string, any> & {
    * @param options - Optional configuration options
    * @returns A config object with module rules configuration
    */
-  compileWithRspack: (deps: RuleSetConditions) => Record<string, object>;
+  compileWithRspack: (deps: RuleSetConditions, options?: SwcLoaderOptions) => Record<string, object>;
   /**
    * Enable or disable Rspack cache config.
    * @param enabled - Whether to enable caching
@@ -61,6 +61,11 @@ type MeteorEnv = Record<string, any> & {
    * @returns A config object with SWC loader config
    */
   extendSwcConfig: (swcConfig: SwcLoaderOptions) => Record<string, object>;
+  /**
+   * Extend Rspack configs.
+   * @returns A config object with merged configs
+   */
+  extendConfig: (...configs: Record<string, object>[]) => Record<string, object>;
 }
 
 export type ConfigFactory = (

package/lib/meteorRspackHelpers.js

@@ -2,18 +2,6 @@ const path = require("path");
 const { prepareMeteorRspackConfig } = require("./meteorRspackConfigFactory");
 const { builtinModules } = require("module");
 
-/**
- * Resolve a package directory from node resolution.
- * @param {string} pkg
- * @returns {string} absolute directory of the package
- */
-function pkgDir(pkg) {
-  const resolved = require.resolve(`${pkg}/package.json`, {
-    paths: [process.cwd()],
-  });
-  return path.dirname(resolved);
-}
-
 /**
  * Wrap externals for Meteor runtime (marks deps as externals).
  * Usage: compileWithMeteor(["sharp", "vimeo", "fs"])
@@ -38,7 +26,11 @@ function compileWithMeteor(deps) {
  * @returns {Record<string, object>} `{ meteorRspackConfigX: { module: { rules: [...] } } }`
  */
 function compileWithRspack(deps, { options = {} } = {}) {
-  const includeDirs = deps.flat().filter(Boolean).map(pkgDir);
+  const includeDirs = deps.flat().filter(Boolean)
+      .map(pkg => typeof pkg === 'string' && !pkg.includes('node_modules')
+          ? path.join(process.cwd(), 'node_modules', pkg)
+          : pkg
+      );
 
   return prepareMeteorRspackConfig({
     module: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.1.5",
+  "version": "0.2.50",
   "description": "Configuration logic for using Rspack in Meteor projects",
   "main": "index.js",
   "type": "commonjs",

package/plugins/RequireExtenalsPlugin.js

@@ -443,13 +443,18 @@ class RequireExternalsPlugin {
 
   _ensureGlobalThisModule() {
     const block = [
-      `/* Polyfill globalThis.module & exports */`,
-      `if (typeof globalThis.module === 'undefined') {`,
-      `  globalThis.module = { exports: {} };`,
+      `/* Polyfill globalThis.module, exports & module for legacy */`,
+      `if (typeof globalThis !== 'undefined') {`,
+      `  if (typeof globalThis.module === 'undefined') {`,
+      `    globalThis.module = { exports: {} };`,
+      `  }`,
+      `  if (typeof globalThis.exports === 'undefined') {`,
+      `    globalThis.exports = globalThis.module.exports;`,
+      `  }`,
+      `}`,
+      `if (typeof window.module === 'undefined') {`,
+      `  window.module = { exports: {} };`,
       `}`,
-      `if (typeof globalThis.exports === 'undefined') {`,
-      `  globalThis.exports = globalThis.module.exports;`,
-      `}`
     ].join('\n') + '\n';
 
     let content = '';

package/rspack.config.js

@@ -274,9 +274,9 @@ module.exports = async function (inMeteor = {}, argv = {}) {
 
   // Expose Meteor's helpers to expand Rspack configs
   Meteor.compileWithMeteor = deps => compileWithMeteor(deps);
-  Meteor.compileWithRspack = deps =>
+  Meteor.compileWithRspack = (deps, options = {}) =>
     compileWithRspack(deps, {
-      options: Meteor.swcConfigOptions,
+      options: mergeSplitOverlap(Meteor.swcConfigOptions, options),
     });
   Meteor.setCache = enabled =>
     setCache(
@@ -285,6 +285,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
     );
   Meteor.splitVendorChunk = () => splitVendorChunk();
   Meteor.extendSwcConfig = (customSwcConfig) => extendSwcConfig(customSwcConfig);
+  Meteor.extendConfig = (...configs) => mergeSplitOverlap(...configs);
 
   // Add HtmlRspackPlugin function to Meteor
   Meteor.HtmlRspackPlugin = (options = {}) => {