fix: Use automatic runtime for React.

cowtech-archive · Jun 1, 2021 · 6275b49 · 6275b49
1 parent 19c849a
commit 6275b49
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 26 deletions.
diff --git a/dist/cjs/rules.js b/dist/cjs/rules.js
@@ -105,7 +105,11 @@ async function setupRules(options) {
             exclude: /node_modules/,
             use: {
                 loader: 'babel-loader',
-                options: { presets: babelPresets.concat('@babel/react'), plugins: babelPlugins, ...babelConfiguration }
+                options: {
+                    presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }]),
+                    plugins: babelPlugins,
+                    ...babelConfiguration
+                }
             }
         });
         if (useTypescript) {
@@ -115,7 +119,7 @@ async function setupRules(options) {
                 use: {
                     loader: 'babel-loader',
                     options: {
-                        presets: babelPresets.concat('@babel/react', '@babel/typescript'),
+                        presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }], '@babel/typescript'),
                         plugins: babelPlugins,
                         ...babelConfiguration
                     }

diff --git a/dist/mjs/icons.mjs b/dist/mjs/icons.mjs
@@ -1,5 +1,5 @@
-import { loadFontAwesomeIcons } from "./fontAwesome.js";
-export { generateSVG as generateFontAwesomeSVG, loadFontAwesomeIcons } from "./fontAwesome.js";
+import { loadFontAwesomeIcons } from "./fontAwesome.mjs";
+export { generateSVG as generateFontAwesomeSVG, loadFontAwesomeIcons } from "./fontAwesome.mjs";
 export async function loadIcons(options) {
     var _a;
     const toLoad = ((_a = options.icons) !== null && _a !== void 0 ? _a : {});

diff --git a/dist/mjs/index.mjs b/dist/mjs/index.mjs
@@ -1,19 +1,19 @@
 import { generateVersion, normalizeAssetPath } from '@cowtech/webpack-utils';
 import { resolve } from 'path';
 import TerserPlugin from 'terser-webpack-plugin';
-import { autoDetectEntries } from "./entries.js";
-import { runHook, setupEnvironment } from "./environment.js";
-import { loadIcons } from "./icons.js";
-import { setupPlugins } from "./plugins.js";
-import { setupRules } from "./rules.js";
-import { setupServer } from "./server.js";
-export * from "./entries.js";
-export * from "./environment.js";
-export * from "./icons.js";
-export * from "./plugins.js";
-export * from "./rules.js";
-export * from "./server.js";
-export * from "./types.js";
+import { autoDetectEntries } from "./entries.mjs";
+import { runHook, setupEnvironment } from "./environment.mjs";
+import { loadIcons } from "./icons.mjs";
+import { setupPlugins } from "./plugins.mjs";
+import { setupRules } from "./rules.mjs";
+import { setupServer } from "./server.mjs";
+export * from "./entries.mjs";
+export * from "./environment.mjs";
+export * from "./icons.mjs";
+export * from "./plugins.mjs";
+export * from "./rules.mjs";
+export * from "./server.mjs";
+export * from "./types.mjs";
 export async function setup(options = {}) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
     if (!options.environment || typeof options.environment !== 'string') {

diff --git a/dist/mjs/plugins.mjs b/dist/mjs/plugins.mjs
@@ -8,8 +8,8 @@ import { Compilation, DefinePlugin, EnvironmentPlugin, HotModuleReplacementPlugi
 // @ts-expect-error - Even if @types/webpack-bundle-analyzer, it generates a conflict with Webpack 5. Revisit in the future.
 import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
 import { InjectManifest } from 'workbox-webpack-plugin';
-import { runHook } from "./environment.js";
-export * from "./babel-remove-function.js";
+import { runHook } from "./environment.mjs";
+export * from "./babel-remove-function.mjs";
 export const serviceWorkerDefaultInclude = [
     /\.(?:html|js|json|mjs|css)$/,
     /images.+\.(?:bmp|jpg|jpeg|png|svg|webp)$/

diff --git a/dist/mjs/rules.mjs b/dist/mjs/rules.mjs
@@ -1,8 +1,8 @@
 import { imagesExtensions } from '@cowtech/webpack-utils';
 import globby from 'globby';
 import { resolve } from 'path';
-import { babelRemoveFunction } from "./babel-remove-function.js";
-import { runHook } from "./environment.js";
+import { babelRemoveFunction } from "./babel-remove-function.mjs";
+import { runHook } from "./environment.mjs";
 /*
 Refresh the following two constants periodically by running with 'last 2 versions' and debug=true
 Modifications:
@@ -97,7 +97,11 @@ export async function setupRules(options) {
             exclude: /node_modules/,
             use: {
                 loader: 'babel-loader',
-                options: { presets: babelPresets.concat('@babel/react'), plugins: babelPlugins, ...babelConfiguration }
+                options: {
+                    presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }]),
+                    plugins: babelPlugins,
+                    ...babelConfiguration
+                }
             }
         });
         if (useTypescript) {
@@ -107,7 +111,7 @@ export async function setupRules(options) {
                 use: {
                     loader: 'babel-loader',
                     options: {
-                        presets: babelPresets.concat('@babel/react', '@babel/typescript'),
+                        presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }], '@babel/typescript'),
                         plugins: babelPlugins,
                         ...babelConfiguration
                     }

diff --git a/dist/mjs/server.mjs b/dist/mjs/server.mjs
@@ -1,7 +1,7 @@
 import { readFile } from 'fs/promises';
 import globby from 'globby';
 import { resolve } from 'path';
-import { runHook } from "./environment.js";
+import { runHook } from "./environment.mjs";
 export async function setupServer(options) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const serverOptions = (_a = options.server) !== null && _a !== void 0 ? _a : {};

diff --git a/src/rules.ts b/src/rules.ts
@@ -115,7 +115,11 @@ export async function setupRules(options: Options): Promise<Array<RuleSetRule>>
       exclude: /node_modules/,
       use: {
         loader: 'babel-loader',
-        options: { presets: babelPresets.concat('@babel/react'), plugins: babelPlugins, ...babelConfiguration }
+        options: {
+          presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }]),
+          plugins: babelPlugins,
+          ...babelConfiguration
+        }
       }
     })
 
@@ -126,7 +130,7 @@ export async function setupRules(options: Options): Promise<Array<RuleSetRule>>
         use: {
           loader: 'babel-loader',
           options: {
-            presets: babelPresets.concat('@babel/react', '@babel/typescript'),
+            presets: babelPresets.concat(['@babel/react', { runtime: 'automatic' }], '@babel/typescript'),
             plugins: babelPlugins,
             ...babelConfiguration
           }