@meteorjs/rspack 0.1.6 → 0.2.51

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/test.js

@@ -9,6 +9,7 @@ const { createIgnoreRegex, createIgnoreGlobConfig } = require("./ignore.js");
  * @param {string} options.projectDir - The project directory
  * @param {string} options.buildContext - The build context
  * @param {string[]} options.ignoreEntries - Array of ignore patterns
+ * @param {string} options.extraEntry - Extra entry to load
  * @returns {string} The path to the generated file
  */
 const generateEagerTestFile = ({
@@ -17,6 +18,7 @@ const generateEagerTestFile = ({
   buildContext,
   ignoreEntries: inIgnoreEntries = [],
   prefix: inPrefix = '',
+  extraEntry,
 }) => {
   const distDir = path.resolve(projectDir, ".meteor/local/test");
   if (!fs.existsSync(distDir)) {
@@ -38,7 +40,7 @@ const generateEagerTestFile = ({
     createIgnoreGlobConfig(ignoreEntries)
   );
 
-  const prefix = inPrefix && `${inPrefix}-` || '';
+  const prefix = (inPrefix && `${inPrefix}-`) || "";
   const filename = isAppTest
     ? `${prefix}eager-app-tests.mjs`
     : `${prefix}eager-tests.mjs`;
@@ -47,7 +49,8 @@ const generateEagerTestFile = ({
     ? "/\\.app-(?:test|spec)s?\\.[^.]+$/"
     : "/\\.(?:test|spec)s?\\.[^.]+$/";
 
-  const content = `{
+  const content = `${extraEntry ? `import path from 'path';` : ''}
+  {
   const ctx = import.meta.webpackContext('/', {
     recursive: true,
     regExp: ${regExp},
@@ -55,6 +58,18 @@ const generateEagerTestFile = ({
     mode: 'eager',
   });
   ctx.keys().forEach(ctx);
+  ${
+    extraEntry
+      ? `const extra = import.meta.webpackContext('${path.dirname(
+          extraEntry
+        )}', {
+    recursive: false,
+    regExp: new RegExp(\`^\\\\./${path.basename(extraEntry)}$\`),
+    mode: 'eager',
+  });
+  extra.keys().forEach(extra);`
+      : ''
+  }
 }`;
 
   fs.writeFileSync(filePath, content);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meteorjs/rspack",
-  "version": "0.1.6",
+  "version": "0.2.51",
   "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 = {}) => {
@@ -420,6 +421,7 @@ module.exports = async function (inMeteor = {}, argv = {}) {
           buildContext,
           ignoreEntries: [...meteorIgnoreEntries, "**/server/**"],
           prefix: "client",
+          extraEntry: path.resolve(process.cwd(), Meteor.mainClientEntry),
         })
       : isTest && isTestEager
       ? generateEagerTestFile({