From 4f87ed0ca1d57edd9b6882ce824f799f31128255 Mon Sep 17 00:00:00 2001
From: Rafal Chlodnicki <rchl2k@gmail.com>
Date: Sat, 19 Mar 2022 18:02:27 +0100
Subject: [PATCH 1/2] fix: allow files with .cjs extension to be transpiled

Fixes #10339
---
 packages/cli/test/unit/__snapshots__/webpack.test.js.snap | 4 ++--
 packages/webpack/src/config/base.js                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/test/unit/__snapshots__/webpack.test.js.snap b/packages/cli/test/unit/__snapshots__/webpack.test.js.snap
index 3ad51f4341b3..7c83e11a3f91 100644
--- a/packages/cli/test/unit/__snapshots__/webpack.test.js.snap
+++ b/packages/cli/test/unit/__snapshots__/webpack.test.js.snap
@@ -61,7 +61,7 @@ exports[`webpack nuxt webpack module.rules 1`] = `
   },
   Object {
     \\"exclude\\": [Function exclude],
-    \\"test\\": /\\\\.m?jsx?$/i,
+    \\"test\\": /\\\\.(c|m)?jsx?$/i,
     \\"type\\": \\"javascript/auto\\",
     \\"use\\": Array [
       Object {
@@ -674,7 +674,7 @@ exports[`webpack nuxt webpack module.rules loader=vue- 1`] = `
 exports[`webpack nuxt webpack module.rules test=.jsx 1`] = `
 "Object {
   \\"exclude\\": [Function exclude],
-  \\"test\\": /\\\\.m?jsx?$/i,
+  \\"test\\": /\\\\.(c|m)?jsx?$/i,
   \\"type\\": \\"javascript/auto\\",
   \\"use\\": Array [
     Object {
diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js
index 694e82010892..858386dac32c 100644
--- a/packages/webpack/src/config/base.js
+++ b/packages/webpack/src/config/base.js
@@ -329,7 +329,7 @@ export default class WebpackBaseConfig {
         ]
       },
       {
-        test: /\.m?jsx?$/i,
+        test: /\.(c|m)?jsx?$/i,
         type: 'javascript/auto',
         exclude: (file) => {
           file = file.split(/node_modules(.*)/)[1]

From e7e47de55d038e21d7bbbea20620d243060a0bbf Mon Sep 17 00:00:00 2001
From: Rafal Chlodnicki <rchl2k@gmail.com>
Date: Mon, 21 Mar 2022 10:39:04 +0100
Subject: [PATCH 2/2] add .cjs for "extensions"

---
 packages/webpack/src/config/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webpack/src/config/base.js b/packages/webpack/src/config/base.js
index 858386dac32c..7f2d8b3df697 100644
--- a/packages/webpack/src/config/base.js
+++ b/packages/webpack/src/config/base.js
@@ -239,7 +239,7 @@ export default class WebpackBaseConfig {
 
     return {
       resolve: {
-        extensions: ['.wasm', '.mjs', '.js', '.json', '.vue', '.jsx'],
+        extensions: ['.wasm', '.mjs', '.cjs', '.js', '.json', '.vue', '.jsx'],
         alias: this.alias(),
         modules: webpackModulesDir,
         plugins: resolvePlugins