From 79a8c65fea9df607b3f51386a4142bef5351558c Mon Sep 17 00:00:00 2001
From: Noritaka Kobayashi <arukimedesu1166777@gmail.com>
Date: Fri, 23 May 2025 10:30:22 +0900
Subject: [PATCH] refactor: use optional chaining & delete unnecessary
 assertion

---
 packages/create-webpack-app/src/index.ts |  6 +++---
 packages/webpack-cli/src/webpack-cli.ts  | 17 ++++++-----------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/create-webpack-app/src/index.ts b/packages/create-webpack-app/src/index.ts
index 03e38001828..e389dfa60a3 100644
--- a/packages/create-webpack-app/src/index.ts
+++ b/packages/create-webpack-app/src/index.ts
@@ -76,7 +76,7 @@ program
   .option("-t --template <template>", "Template to be used for scaffolding", "default")
   .action(async function (projectPath, opts: InitOptions) {
     const { force } = opts;
-    let templateOption = opts.template as string;
+    let templateOption = opts.template;
     let generator = initGenerators[templateOption];
 
     if (generator === undefined) {
@@ -134,7 +134,7 @@ program
   .argument("[projectPath]", "Path to create the project")
   .option("-t --template <template>", "Template to be used for scaffolding", "default")
   .action(async function (projectPath, opts: LoaderOptions) {
-    let templateOption = opts.template as string;
+    let templateOption = opts.template;
     let generator = loaderGenerators[templateOption];
 
     if (generator === undefined) {
@@ -175,7 +175,7 @@ program
   .argument("[projectPath]", "Path to create the project")
   .option("-t --template <template>", "Template to be used for scaffolding", "default")
   .action(async function (projectPath, opts: PluginOptions) {
-    let templateOption = opts.template as string;
+    let templateOption = opts.template;
     let generator = pluginGenerators[templateOption];
 
     if (generator === undefined) {
diff --git a/packages/webpack-cli/src/webpack-cli.ts b/packages/webpack-cli/src/webpack-cli.ts
index 6f397689eff..8dd70497514 100644
--- a/packages/webpack-cli/src/webpack-cli.ts
+++ b/packages/webpack-cli/src/webpack-cli.ts
@@ -1637,7 +1637,7 @@ class WebpackCLI implements IWebpackCLI {
 
         const flag = this.getBuiltInOptions().find((flag) => option.long === `--${flag.name}`);
 
-        if (flag && flag.configs) {
+        if (flag?.configs) {
           const possibleValues = flag.configs.reduce(
             (accumulator, currentValue) => {
               if (currentValue.values) {
@@ -2243,9 +2243,8 @@ class WebpackCLI implements IWebpackCLI {
 
       if (
         options.isWatchingLikeCommand &&
-        options.argv &&
-        options.argv.env &&
-        (typeof originalWatchValue !== "undefined" || typeof options.argv.watch !== "undefined")
+        options.argv?.env &&
+        (typeof originalWatchValue !== "undefined" || typeof options.argv?.watch !== "undefined")
       ) {
         this.logger.warn(
           `No need to use the '${
@@ -2292,8 +2291,7 @@ class WebpackCLI implements IWebpackCLI {
       // Respect `process.env.NODE_ENV`
       if (
         !item.mode &&
-        process.env &&
-        process.env.NODE_ENV &&
+        process.env?.NODE_ENV &&
         (process.env.NODE_ENV === "development" ||
           process.env.NODE_ENV === "production" ||
           process.env.NODE_ENV === "none")
@@ -2408,14 +2406,11 @@ class WebpackCLI implements IWebpackCLI {
   needWatchStdin(compiler: Compiler | MultiCompiler): boolean {
     if (this.isMultipleCompiler(compiler)) {
       return Boolean(
-        compiler.compilers.some(
-          (compiler: Compiler) =>
-            compiler.options.watchOptions && compiler.options.watchOptions.stdin,
-        ),
+        compiler.compilers.some((compiler: Compiler) => compiler.options.watchOptions?.stdin),
       );
     }
 
-    return Boolean(compiler.options.watchOptions && compiler.options.watchOptions.stdin);
+    return Boolean(compiler.options.watchOptions?.stdin);
   }
 
   async runWebpack(options: WebpackRunOptions, isWatchCommand: boolean): Promise<void> {