diff --git a/npm-packages/meteor-rspack/package-lock.json b/npm-packages/meteor-rspack/package-lock.json index 2d3aebb77b..4d6dc0b319 100644 --- a/npm-packages/meteor-rspack/package-lock.json +++ b/npm-packages/meteor-rspack/package-lock.json @@ -1,12 +1,12 @@ { "name": "@meteorjs/rspack", - "version": "0.0.32", + "version": "0.0.33", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@meteorjs/rspack", - "version": "0.0.32", + "version": "0.0.33", "license": "ISC", "dependencies": { "ignore-loader": "^0.1.2", diff --git a/npm-packages/meteor-rspack/package.json b/npm-packages/meteor-rspack/package.json index eb938b7402..e554ff84c8 100644 --- a/npm-packages/meteor-rspack/package.json +++ b/npm-packages/meteor-rspack/package.json @@ -1,6 +1,6 @@ { "name": "@meteorjs/rspack", - "version": "0.0.32", + "version": "0.0.33", "description": "Configuration logic for using Rspack in Meteor projects", "main": "index.js", "type": "module", diff --git a/npm-packages/meteor-rspack/rspack.config.js b/npm-packages/meteor-rspack/rspack.config.js index 044743a285..dba23bd0d1 100644 --- a/npm-packages/meteor-rspack/rspack.config.js +++ b/npm-packages/meteor-rspack/rspack.config.js @@ -125,6 +125,7 @@ export default function (inMeteor = {}, argv = {}) { const isTestEager = !!Meteor.isTestEager; const isTestFullApp = !!Meteor.isTestFullApp; const swcExternalHelpers = !!Meteor.swcExternalHelpers; + const isNative = !!Meteor.isNative; const mode = isProd ? 'production' : 'development'; const isTypescriptEnabled = Meteor.isTypescriptEnabled || false; @@ -203,7 +204,7 @@ export default function (inMeteor = {}, argv = {}) { console.log('[i] Meteor flags:', Meteor); } - const isDevEnvironment = isRun && isDev && !isTest; + const isDevEnvironment = isRun && isDev && !isTest && !isNative; const swcConfigRule = createSwcConfig({ isTypescriptEnabled, isJsxEnabled, @@ -325,7 +326,7 @@ export default function (inMeteor = {}, argv = {}) { Meteor.HtmlRspackPlugin(), ], watchOptions, - devtool: isDevEnvironment || isTest ? 'source-map' : 'hidden-source-map', + devtool: isDevEnvironment || isNative || isTest ? 'source-map' : 'hidden-source-map', ...(isDevEnvironment && { devServer: { static: { directory: clientOutputDir, publicPath: '/__rspack__/' }, @@ -406,8 +407,8 @@ export default function (inMeteor = {}, argv = {}) { isTestModule && requireExternalsPlugin, ], watchOptions, - devtool: isDevEnvironment || isTest ? 'source-map' : 'hidden-source-map', - ...((isDevEnvironment || (isTest && !isTestEager)) && + devtool: isDevEnvironment || isNative || isTest ? 'source-map' : 'hidden-source-map', + ...((isDevEnvironment || (isTest && !isTestEager) || isNative) && createCacheStrategy(mode)), }; diff --git a/packages/rspack/lib/build-context.js b/packages/rspack/lib/build-context.js index 06cc6c4cc1..916fb5e2a4 100644 --- a/packages/rspack/lib/build-context.js +++ b/packages/rspack/lib/build-context.js @@ -432,9 +432,7 @@ import '../../${config?.entryFile}';`; } if (config?.outputFile && - (role === FILE_ROLE.build || - config?.isProduction || - config?.isNative || + (role === FILE_ROLE.build || config?.isProduction || (role === FILE_ROLE.run && (config?.isServer || config?.isTest)))) { return `/* Link to ⚡ Rspack ${capitalizeFirstLetter(side)} App */ ${ diff --git a/packages/rspack/lib/constants.js b/packages/rspack/lib/constants.js index e67f5171ec..d9f7e237a0 100644 --- a/packages/rspack/lib/constants.js +++ b/packages/rspack/lib/constants.js @@ -5,7 +5,7 @@ export const DEFAULT_RSPACK_VERSION = '1.4.8'; -export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.32'; +export const DEFAULT_METEOR_RSPACK_VERSION = '0.0.33'; export const DEFAULT_METEOR_RSPACK_REACT_HMR_VERSION = '1.4.3'; diff --git a/packages/rspack/lib/processes.js b/packages/rspack/lib/processes.js index 423bee82a2..873cc91fbb 100644 --- a/packages/rspack/lib/processes.js +++ b/packages/rspack/lib/processes.js @@ -25,6 +25,7 @@ const { isMeteorAppDebug, isMeteorAppRun, isMeteorAppBuild, + isMeteorAppNative, isMeteorBlazeProject, isMeteorBlazeHotProject, getMeteorInitialAppEntrypoints, @@ -109,6 +110,7 @@ export function getRspackEnv({ isClient, isServer, isTest: inIsTest }) { ...(isTest && isTestFullApp && [['isTestFullApp', isTestFullApp]] || []), ['isRun', isMeteorAppRun()], ['isBuild', isMeteorAppBuild()], + ['isNative', isMeteorAppNative()], ['isClient', isClient], ['isServer', isServer], ['entryPath', getBuildFilePath({ ...module, ...env, ...side, role: FILE_ROLE.entry }) ], diff --git a/tools/modern-tests/apps/vue/package.json b/tools/modern-tests/apps/vue/package.json index 8f9c6679e1..8c90feef0d 100644 --- a/tools/modern-tests/apps/vue/package.json +++ b/tools/modern-tests/apps/vue/package.json @@ -17,7 +17,7 @@ "vue-router": "^4.2.5" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@tailwindcss/postcss": "^4.1.12", diff --git a/tools/static-assets/skel-apollo/package.json b/tools/static-assets/skel-apollo/package.json index 1287ac6d65..8aa77d3e88 100644 --- a/tools/static-assets/skel-apollo/package.json +++ b/tools/static-assets/skel-apollo/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@graphql-tools/webpack-loader": "^7.0.0", - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3" diff --git a/tools/static-assets/skel-blaze/package.json b/tools/static-assets/skel-blaze/package.json index e001b8bb56..251cf08b9e 100644 --- a/tools/static-assets/skel-blaze/package.json +++ b/tools/static-assets/skel-blaze/package.json @@ -14,7 +14,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3" diff --git a/tools/static-assets/skel-chakra-ui/package.json b/tools/static-assets/skel-chakra-ui/package.json index 13fa4ebfc4..59e387c9e2 100644 --- a/tools/static-assets/skel-chakra-ui/package.json +++ b/tools/static-assets/skel-chakra-ui/package.json @@ -21,7 +21,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3" diff --git a/tools/static-assets/skel-full/package.json b/tools/static-assets/skel-full/package.json index d8a68c314e..5f26827e4d 100644 --- a/tools/static-assets/skel-full/package.json +++ b/tools/static-assets/skel-full/package.json @@ -12,7 +12,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "chai": "^4.2.0" diff --git a/tools/static-assets/skel-react/package.json b/tools/static-assets/skel-react/package.json index b636288518..0161502fb2 100644 --- a/tools/static-assets/skel-react/package.json +++ b/tools/static-assets/skel-react/package.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3" diff --git a/tools/static-assets/skel-solid/package.json b/tools/static-assets/skel-solid/package.json index 03f0afdbe1..328f742723 100644 --- a/tools/static-assets/skel-solid/package.json +++ b/tools/static-assets/skel-solid/package.json @@ -14,7 +14,7 @@ "picocolors": "^1.1.1" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "babel-loader": "10.0.0", diff --git a/tools/static-assets/skel-svelte/package.json b/tools/static-assets/skel-svelte/package.json index 376a192628..175274ae2b 100644 --- a/tools/static-assets/skel-svelte/package.json +++ b/tools/static-assets/skel-svelte/package.json @@ -13,7 +13,7 @@ "meteor-node-stubs": "^1.2.12" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "postcss-load-config": "^5.1.0", diff --git a/tools/static-assets/skel-tailwind/package.json b/tools/static-assets/skel-tailwind/package.json index 24a8dc485f..e89c6de35f 100644 --- a/tools/static-assets/skel-tailwind/package.json +++ b/tools/static-assets/skel-tailwind/package.json @@ -16,7 +16,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3", diff --git a/tools/static-assets/skel-typescript/package.json b/tools/static-assets/skel-typescript/package.json index 3201a54488..1ed755caa5 100644 --- a/tools/static-assets/skel-typescript/package.json +++ b/tools/static-assets/skel-typescript/package.json @@ -15,7 +15,7 @@ "react-dom": "^18.2.0" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@rspack/plugin-react-refresh": "^1.4.3", diff --git a/tools/static-assets/skel-vue/package.json b/tools/static-assets/skel-vue/package.json index d3f844b850..5b83902368 100644 --- a/tools/static-assets/skel-vue/package.json +++ b/tools/static-assets/skel-vue/package.json @@ -17,7 +17,7 @@ "vue-router": "^4.2.5" }, "devDependencies": { - "@meteorjs/rspack": "^0.0.32", + "@meteorjs/rspack": "^0.0.33", "@rspack/cli": "^1.4.8", "@rspack/core": "^1.4.8", "@tailwindcss/postcss": "^4.1.12",