Merge branch 'main' into feat/init-custom-version

callstack · Apr 16, 2024 · 0913d75 · 0913d75
2 parents c45cef4 + 6c09015
commit 0913d75
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 17 deletions.
diff --git a/.changeset/sharp-stingrays-wave.md b/.changeset/sharp-stingrays-wave.md
@@ -0,0 +1,5 @@
+---
+"@callstack/repack": patch
+---
+
+Update webpack.config templates
diff --git a/packages/TesterApp/webpack.config.mjs b/packages/TesterApp/webpack.config.mjs
@@ -1,7 +1,11 @@
-import path from 'path';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 import TerserPlugin from 'terser-webpack-plugin';
 import * as Repack from '@callstack/repack';
 
+const dirname = Repack.getDirname(import.meta.url);
+const { resolve } = createRequire(import.meta.url);
+
 /**
  * More documentation, installation, usage, motivation and differences with Metro is available at:
  * https://github.com/callstack/repack/blob/main/README.md
@@ -20,18 +24,16 @@ import * as Repack from '@callstack/repack';
 export default (env) => {
   const {
     mode = 'development',
-    context = Repack.getDirname(import.meta.url),
+    context = dirname,
     entry = './index.js',
     platform = process.env.PLATFORM,
     minimize = mode === 'production',
     devServer = undefined,
     bundleFilename = undefined,
     sourceMapFilename = undefined,
     assetsPath = undefined,
-    reactNativePath = new URL('./node_modules/react-native', import.meta.url)
-      .pathname,
+    reactNativePath = resolve('react-native'),
   } = env;
-  const dirname = context;
 
   if (!platform) {
     throw new Error('Missing platform');
@@ -156,7 +158,7 @@ export default (env) => {
             /node_modules(.*[/\\])+pretty-format/,
             /node_modules(.*[/\\])+metro/,
             /node_modules(.*[/\\])+abort-controller/,
-            /node_modules(.*[/\\])+@callstack\/repack/,
+            /node_modules(.*[/\\])+@callstack[/\\]repack/,
           ],
           use: 'babel-loader',
         },

diff --git a/packages/repack/src/webpack/utils/getInitializationEntries.ts b/packages/repack/src/webpack/utils/getInitializationEntries.ts
@@ -29,11 +29,12 @@ export interface InitializationEntriesOptions {
  * ```ts
  * import * as Repack from '@callstack/repack';
  *
+ * const { resolve } = createRequire(import.meta.url);
+ *
  * export default (env) => {
  *   const {
  *     devServer,
- *     reactNativePath = new URL('./node_modules/react-native', import.meta.url)
- *       .pathname,
+ *     reactNativePath = resolve('react-native'),
  *   } = env;
  *
  *   return {

diff --git a/templates/webpack.config.cjs b/templates/webpack.config.cjs
@@ -22,7 +22,7 @@ module.exports = (env) => {
     mode = 'development',
     context = __dirname,
     entry = './index.js',
-    platform,
+    platform = process.env.PLATFORM,
     minimize = mode === 'production',
     devServer = undefined,
     bundleFilename = undefined,
@@ -157,7 +157,7 @@ module.exports = (env) => {
             /node_modules(.*[/\\])+pretty-format/,
             /node_modules(.*[/\\])+metro/,
             /node_modules(.*[/\\])+abort-controller/,
-            /node_modules(.*[/\\])+@callstack\/repack/,
+            /node_modules(.*[/\\])+@callstack[/\\]repack/,
           ],
           use: 'babel-loader',
         },

diff --git a/templates/webpack.config.mjs b/templates/webpack.config.mjs
@@ -1,7 +1,11 @@
-import path from 'path';
+import { createRequire } from 'node:module';
+import path from 'node:path';
 import TerserPlugin from 'terser-webpack-plugin';
 import * as Repack from '@callstack/repack';
 
+const dirname = Repack.getDirname(import.meta.url);
+const { resolve } = createRequire(import.meta.url);
+
 /**
  * More documentation, installation, usage, motivation and differences with Metro is available at:
  * https://github.com/callstack/repack/blob/main/README.md
@@ -20,24 +24,22 @@ import * as Repack from '@callstack/repack';
 export default (env) => {
   const {
     mode = 'development',
-    context = Repack.getDirname(import.meta.url),
+    context = dirname,
     entry = './index.js',
     platform = process.env.PLATFORM,
     minimize = mode === 'production',
     devServer = undefined,
     bundleFilename = undefined,
     sourceMapFilename = undefined,
     assetsPath = undefined,
-    reactNativePath = new URL('./node_modules/react-native', import.meta.url)
-      .pathname,
+    reactNativePath = resolve('react-native'),
   } = env;
-  const dirname = Repack.getDirname(import.meta.url);
 
   if (!platform) {
     throw new Error('Missing platform');
   }
 
-    /**
+  /**
    * Using Module Federation might require disabling hmr.
    * Uncomment below to set `devServer.hmr` to `false`.
    *
@@ -159,7 +161,7 @@ export default (env) => {
             /node_modules(.*[/\\])+pretty-format/,
             /node_modules(.*[/\\])+metro/,
             /node_modules(.*[/\\])+abort-controller/,
-            /node_modules(.*[/\\])+@callstack\/repack/,
+            /node_modules(.*[/\\])+@callstack[/\\]repack/,
           ],
           use: 'babel-loader',
         },