@meteorjs/rspack 0.0.0 → 0.0.2

package/index.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Extend Rspack’s Configuration with Meteor-specific options.
+ */
+import {
+  defineConfig as _rspackDefineConfig,
+  Configuration as _RspackConfig,
+} from '@rspack/cli';
+
+export interface MeteorRspackConfig extends _RspackConfig {
+  meteor?: {
+    packageNamespace?: string;
+  };
+}
+
+type MeteorEnv = Record<string, any> & {
+  isDevelopment: boolean;
+  isProduction: boolean;
+  isClient: boolean;
+  isServer: boolean;
+  isTest: boolean;
+  isDebug: boolean;
+  isRun: boolean;
+  isBuild: boolean;
+  isReactEnabled: boolean;
+  isBlazeEnabled: boolean;
+  isBlazeHotEnabled: boolean;
+}
+
+export type ConfigFactory = (
+  env: MeteorEnv,
+  argv: Record<string, any>
+) => MeteorRspackConfig;
+
+export function defineConfig(
+  factory: ConfigFactory
+): ReturnType<typeof _rspackDefineConfig>;

package/index.js

@@ -0,0 +1,23 @@
+import { defineConfig as rspackDefineConfig } from '@rspack/cli';
+
+/**
+ * @typedef {import('rspack').Configuration & {
+ *   meteor?: { packageNamespace?: string }
+ * }} MeteorRspackConfig
+ */
+
+/**
+ * @typedef {(env: Record<string, any>, argv: Record<string, any>) => MeteorRspackConfig} ConfigFactory
+ */
+
+/**
+ * Wrap rspack.defineConfig but only accept a factory function.
+ * @param {ConfigFactory} factory
+ * @returns {ReturnType<typeof rspackDefineConfig>}
+ */
+export function defineConfig(factory) {
+  return rspackDefineConfig(factory);
+}
+
+// Export our helper plus passthrough
+export default defineConfig;

package/lib/swc.js

@@ -0,0 +1,62 @@
+import fs from 'fs';
+import vm from 'vm';
+
+/**
+ * Reads and parses the SWC configuration file.
+ * @param {string} file - The name of the SWC configuration file (default: '.swcrc')
+ * @returns {Object|undefined} The parsed SWC configuration or undefined if an error occurs
+ */
+export function getMeteorAppSwcrc(file = '.swcrc') {
+  try {
+    const filePath = `${process.cwd()}/${file}`;
+    if (file.endsWith('.js')) {
+      let content = fs.readFileSync(filePath, 'utf-8');
+      // Check if the content uses ES module syntax (export default)
+      if (content.includes('export default')) {
+        // Transform ES module syntax to CommonJS
+        content = content.replace(/export\s+default\s+/, 'module.exports = ');
+      }
+      const script = new vm.Script(`
+        (function() {
+          const module = {};
+          module.exports = {};
+          (function(exports, module) {
+            ${content}
+          })(module.exports, module);
+          return module.exports;
+        })()
+      `);
+      const context = vm.createContext({ process });
+      return script.runInContext(context);
+    } else {
+      // For .swcrc and other JSON files, parse as JSON
+      return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+    }
+  } catch (e) {
+    return undefined;
+  }
+}
+
+/**
+ * Checks for SWC configuration files and returns the configuration.
+ * If the configuration has a baseUrl property, it will be set to process.cwd().
+ * @returns {Object|undefined} The SWC configuration or undefined if no configuration exists
+ */
+export function getMeteorAppSwcConfig() {
+  const hasSwcRc = fs.existsSync(`${process.cwd()}/.swcrc`);
+  const hasSwcJs = !hasSwcRc && fs.existsSync(`${process.cwd()}/swc.config.js`);
+
+  if (!hasSwcRc && !hasSwcJs) {
+    return undefined;
+  }
+
+  const swcFile = hasSwcJs ? 'swc.config.js' : '.swcrc';
+  const config = getMeteorAppSwcrc(swcFile);
+
+  // Set baseUrl to process.cwd() if it exists
+  if (config?.jsc && config.jsc.baseUrl) {
+    config.jsc.baseUrl = process.cwd();
+  }
+
+  return config;
+}

package/package.json

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

package/rspack.config.js

@@ -5,6 +5,7 @@ import path from 'path';
 import { merge } from 'webpack-merge';
 
 import { RequireExternalsPlugin } from './plugins/RequireExtenalsPlugin.js';
+import { getMeteorAppSwcConfig } from "./lib/swc.js";
 
 const require = createRequire(import.meta.url);
 
@@ -41,31 +42,38 @@ function createCacheStrategy(mode) {
 }
 
 // SWC loader rule (JSX/JS)
-function createSwcConfig({ isRun }) {
+function createSwcConfig({ isRun, isTypeScriptEnabled, isJsxEnabled, isTsxEnabled }) {
+  const defaultConfig = {
+    jsc: {
+      baseUrl: process.cwd(),
+      paths: { '/*': ['*'] },
+      parser: {
+        syntax: isTypeScriptEnabled ? 'typescript' : 'ecmascript',
+        ...(isTsxEnabled && { tsx: true }),
+        ...(isJsxEnabled && { jsx: true }),
+      },
+      target: 'es2015',
+      transform: {
+        react: {
+          development: isRun,
+          refresh: isRun,
+        },
+      },
+    },
+  };
+  const customConfig = getMeteorAppSwcConfig() || {};
+  const swcConfig = merge(defaultConfig, customConfig);
   return {
     test: /\.[jt]sx?$/,
     exclude: /node_modules|\.meteor\/local/,
     loader: 'builtin:swc-loader',
-    options: {
-      jsc: {
-        baseUrl: process.cwd(),
-        paths: { '/*': ['*'] },
-        parser: { syntax: 'ecmascript', jsx: true },
-        target: 'es2015',
-        transform: {
-          react: {
-            development: isRun,
-            refresh: isRun,
-          },
-        },
-      },
-    },
+    options: swcConfig,
   };
 }
 
 // Watch options shared across both builds
 const watchOptions = {
-  ignored: ['**/main.html', '**/dist/**', '**/.meteor/local/**'],
+  ignored: ['**/.meteor/local/**', '**/dist/**'],
 };
 
 /**
@@ -93,6 +101,10 @@ export default function (inMeteor = {}, argv = {}) {
   const isReactEnabled = Meteor.isReactEnabled;
   const mode = isProd ? 'production' : 'development';
 
+  const isTypeScriptEnabled = Meteor.isTypeScriptEnabled || false;
+  const isJsxEnabled = Meteor.isJsxEnabled || false;
+  const isTsxEnabled = Meteor.isTsxEnabled || false;
+
   // Determine entry points
   const entryPath = Meteor.entryPath;
 
@@ -120,6 +132,27 @@ export default function (inMeteor = {}, argv = {}) {
     console.log('[i] Meteor flags:', Meteor);
   }
 
+  const swcConfig = createSwcConfig({
+    isRun,
+    isTypeScriptEnabled,
+    isJsxEnabled,
+    isTsxEnabled,
+  });
+  const externals = [
+    /^meteor.*/,
+    ...(isReactEnabled ? [/^react$/, /^react-dom$/] : [])
+  ];
+  const extensions = [
+    '.ts',
+    '.tsx',
+    '.js',
+    '.jsx',
+    '.mjs',
+    '.cjs',
+    '.json',
+    '.wasm',
+  ];
+
   // Base client config
   let clientConfig = {
     name: 'meteor-client',
@@ -141,7 +174,7 @@ export default function (inMeteor = {}, argv = {}) {
     },
     module: {
       rules: [
-        createSwcConfig({ isRun }),
+        swcConfig,
         ...(Meteor.isBlazeEnabled
           ? [
               {
@@ -152,8 +185,8 @@ export default function (inMeteor = {}, argv = {}) {
           : []),
       ],
     },
-    resolve: { extensions: ['.js', '.jsx', '.json'] },
-    externals: [/^(meteor.*|react$|react-dom$)/],
+    resolve: { extensions },
+    externals,
     plugins: [
       ...(isRun
         ? [
@@ -202,7 +235,6 @@ export default function (inMeteor = {}, argv = {}) {
           writeToDisk: false,
         },
       },
-      experiments: { incremental: true },
     }),
   };
 
@@ -221,21 +253,14 @@ export default function (inMeteor = {}, argv = {}) {
     },
     optimization: { usedExports: true },
     module: {
-      rules: [
-        {
-          test: /\.meteor\/local/,
-          use: 'builtin:empty-loader',
-          sideEffects: false,
-        },
-        createSwcConfig({ isRun }),
-      ],
+      rules: [swcConfig],
     },
     resolve: {
-      extensions: ['.js', '.jsx', '.json'],
+      extensions,
       modules: ['node_modules', path.resolve(process.cwd())],
       conditionNames: ['import', 'require', 'node', 'default'],
     },
-    externals: [/^(meteor.*|react|react-dom)/],
+    externals,
     plugins: [
       new DefinePlugin({
         'Meteor.isClient': JSON.stringify(false),
@@ -252,7 +277,8 @@ export default function (inMeteor = {}, argv = {}) {
     watchOptions,
     devtool: isRun ? 'source-map' : 'hidden-source-map',
     ...(isRun &&
-      merge(createCacheStrategy(mode), { experiments: { incremental: true } })),
+      createCacheStrategy(mode)
+    ),
   };
 
   // Load and apply project-level overrides for the selected build