From 2625f6a4a40fcdcd66f1f51c4a3cef929d570202 Mon Sep 17 00:00:00 2001
From: Yohan Kim <ddalpange@gmail.com>
Date: Wed, 29 Jun 2022 17:46:27 +0900
Subject: [PATCH] Fix order of extensions

---
 app/angular/src/server/framework-preset-angular-cli.test.ts | 2 +-
 lib/builder-webpack4/src/preview/iframe-webpack.config.ts   | 2 +-
 lib/builder-webpack5/src/preview/iframe-webpack.config.ts   | 2 +-
 lib/manager-webpack4/src/presets/manager-preset.ts          | 2 +-
 lib/manager-webpack5/src/presets/manager-preset.ts          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/angular/src/server/framework-preset-angular-cli.test.ts b/app/angular/src/server/framework-preset-angular-cli.test.ts
index 8dfbc75c02cc..b5e1b86eee2b 100644
--- a/app/angular/src/server/framework-preset-angular-cli.test.ts
+++ b/app/angular/src/server/framework-preset-angular-cli.test.ts
@@ -793,7 +793,7 @@ const newWebpackConfiguration = (
       rules: [{ keepBaseRule: true } as any],
     },
     resolve: {
-      extensions: ['.cjs', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
+      extensions: ['.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
       modules: ['node_modules'],
       mainFields: ['browser', 'main'],
       alias: {
diff --git a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
index 3c62280ea227..66c2fbee4def 100644
--- a/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
+++ b/lib/builder-webpack4/src/preview/iframe-webpack.config.ts
@@ -233,7 +233,7 @@ export default async (options: Options & Record<string, any>): Promise<Configura
       ],
     },
     resolve: {
-      extensions: ['.cjs', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json'],
+      extensions: ['.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
       modules: ['node_modules'].concat(envs.NODE_PATH || []),
       mainFields: [modern ? 'sbmodern' : null, 'browser', 'module', 'main'].filter(Boolean),
       alias: {
diff --git a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
index a6b98075aed6..7d2a18a7bf2e 100644
--- a/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
+++ b/lib/builder-webpack5/src/preview/iframe-webpack.config.ts
@@ -234,7 +234,7 @@ export default async (options: Options & Record<string, any>): Promise<Configura
       ],
     },
     resolve: {
-      extensions: ['.cjs', '.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
+      extensions: ['.mjs', '.js', '.jsx', '.ts', '.tsx', '.json', '.cjs'],
       modules: ['node_modules'].concat(envs.NODE_PATH || []),
       mainFields: [modern ? 'sbmodern' : null, 'browser', 'module', 'main'].filter(Boolean),
       alias: {
diff --git a/lib/manager-webpack4/src/presets/manager-preset.ts b/lib/manager-webpack4/src/presets/manager-preset.ts
index b7b88d1bc922..69fd3620d3e6 100644
--- a/lib/manager-webpack4/src/presets/manager-preset.ts
+++ b/lib/manager-webpack4/src/presets/manager-preset.ts
@@ -156,7 +156,7 @@ export async function managerWebpack(
       ],
     },
     resolve: {
-      extensions: ['.cjs', '.mjs', '.js', '.jsx', '.json', '.cjs', '.ts', '.tsx'],
+      extensions: ['.mjs', '.js', '.jsx', '.json', '.cjs', '.ts', '.tsx'],
       modules: ['node_modules'].concat(envs.NODE_PATH || []),
       mainFields: [modern ? 'sbmodern' : null, 'browser', 'module', 'main'].filter(Boolean),
       alias: {
diff --git a/lib/manager-webpack5/src/presets/manager-preset.ts b/lib/manager-webpack5/src/presets/manager-preset.ts
index c43d73acb256..1a332ea42a65 100644
--- a/lib/manager-webpack5/src/presets/manager-preset.ts
+++ b/lib/manager-webpack5/src/presets/manager-preset.ts
@@ -160,7 +160,7 @@ export async function managerWebpack(
       ],
     },
     resolve: {
-      extensions: ['.cjs', '.mjs', '.js', '.jsx', '.json', '.cjs', '.ts', '.tsx'],
+      extensions: ['.mjs', '.js', '.jsx', '.json', '.cjs', '.ts', '.tsx'],
       modules: ['node_modules'].concat(envs.NODE_PATH || []),
       mainFields: [modern ? 'sbmodern' : null, 'browser', 'module', 'main'].filter(Boolean),
       alias: {