From 7a25294c5f0598f48de6efadc7b4f472c65714fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Ch=C5=82odnicki?= <rchl2k@gmail.com>
Date: Fri, 24 Jun 2022 01:07:09 +0200
Subject: [PATCH] fix(webpack): allow files with `.cjs` extension to be
 transpiled (#10340)

[release]
---
 packages/cli/test/unit/__snapshots__/webpack.test.js.snap | 4 ++--
 packages/webpack/src/config/base.js                       | 4 ++--
 2 files changed, 4 insertions(+), 4 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..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
@@ -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]