@simplysm/sd-cli 7.0.38 → 7.0.43

package/src/build-tool/SdCliNgCacheCompilerHost.ts

@@ -1,5 +1,5 @@
 import ts from "typescript";
-import { PathUtil } from "@simplysm/sd-core-node";
+import { PathUtil } from "@simplysm/sd-core/node";
 import sass from "sass";
 import { pathToFileURL, URL } from "url";
 
@@ -25,10 +25,10 @@ export class SdCliNgCacheCompilerHost {
       if (cache.styleContent === undefined) {
         cache.styleContent = (
           await sass.compileStringAsync(data, {
-            url: new URL(context.containingFile + ".sd.scss"),
+            url: new URL((context.containingFile as string) + ".sd.scss"),
             importer: {
               findFileUrl: (url) => {
-                if (!url.startsWith("~")) return null;
+                if (!url.startsWith("~")) return pathToFileURL(url);
                 return new URL(url.substring(1), pathToFileURL("node_modules"));
               }
             }

package/src/build-tool/SdCliPackageLinter.ts

@@ -1,6 +1,6 @@
 import { ISdCliPackageBuildResult } from "../commons";
 import ts from "typescript";
-import { FsUtil } from "@simplysm/sd-core-node";
+import { FsUtil } from "@simplysm/sd-core/node";
 import path from "path";
 import { ESLint } from "eslint";
 

package/src/builder/SdCliClientBuilder.ts

@@ -1,6 +1,6 @@
 import { INpmConfig, ISdCliClientPackageConfig, ISdCliPackageBuildResult } from "../commons";
 import { EventEmitter } from "events";
-import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core/node";
 import webpack from "webpack";
 import path from "path";
 import ts from "typescript";
@@ -10,13 +10,13 @@ import {
   AnyComponentStyleBudgetChecker,
   CommonJsUsageWarnPlugin,
   DedupeModuleResolvePlugin,
+  JavaScriptOptimizerPlugin,
   SuppressExtractedTextChunksWebpackPlugin
 } from "@angular-devkit/build-angular/src/webpack/plugins";
 import CopyWebpackPlugin from "copy-webpack-plugin";
 import MiniCssExtractPlugin from "mini-css-extract-plugin";
 import { AngularWebpackPlugin } from "@ngtools/webpack";
 import { IndexHtmlWebpackPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/index-html-webpack-plugin";
-import { createHash } from "crypto";
 import { SassWorkerImplementation } from "@angular-devkit/build-angular/src/sass/sass-service";
 import { HmrLoader } from "@angular-devkit/build-angular/src/webpack/plugins/hmr/hmr-loader";
 import wdm from "webpack-dev-middleware";
@@ -24,6 +24,15 @@ import whm from "webpack-hot-middleware";
 import { NextHandleFunction } from "connect";
 import { LicenseWebpackPlugin } from "license-webpack-plugin";
 import { Type } from "@angular-devkit/build-angular";
+import NodePolyfillPlugin from "node-polyfill-webpack-plugin";
+import { createHash } from "crypto";
+import ESLintWebpackPlugin from "eslint-webpack-plugin";
+import os from "os";
+import { ESLint } from "eslint";
+import { TransferSizePlugin } from "@angular-devkit/build-angular/src/webpack/plugins/transfer-size-plugin";
+import { CssOptimizerPlugin } from "@angular-devkit/build-angular/src/webpack/plugins/css-optimizer-plugin";
+import browserslist from "browserslist";
+import LintResult = ESLint.LintResult;
 
 export class SdCliClientBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
@@ -119,13 +128,18 @@ export class SdCliClientBuilder extends EventEmitter {
   }
 
   private _getWebpackConfig(watch: boolean): webpack.Configuration {
+    const internalModuleCachePaths = watch
+      ? FsUtil.findAllParentChildDirPaths("node_modules/!(@simplysm)", this._rootPath, this._workspaceRootPath)
+      : undefined;
+
     const npmConfig = this._getNpmConfig(this._rootPath)!;
     const pkgVersion = npmConfig.version;
+    const ngVersion = this._getNpmConfig(FsUtil.findAllParentChildDirPaths("node_modules/@angular/core", this._rootPath, this._workspaceRootPath)[0])!.version;
 
     const pkgKey = npmConfig.name.split("/").last()!;
     const publicPath = `/${pkgKey}/`;
 
-    const cacheBasePath = path.resolve(this._rootPath, ".angular");
+    const cacheBasePath = path.resolve(this._rootPath, ".cache");
     const cachePath = path.resolve(cacheBasePath, pkgVersion);
 
     const distPath = this._parsedTsconfig.options.outDir;
@@ -156,7 +170,7 @@ export class SdCliClientBuilder extends EventEmitter {
       entry: {
         main: [
           ...watch ? [
-            `webpack-hot-middleware/client?path=${publicPath}__webpack_hmr&timeout=20000&reload=true&overlay=true`,
+            `webpack-hot-middleware/client?path=${publicPath}__webpack_hmr&timeout=20000&reload=true&overlay=true`
           ] : [],
           mainFilePath
         ],
@@ -174,7 +188,7 @@ export class SdCliClientBuilder extends EventEmitter {
         libraryTarget: undefined,
         crossOriginLoading: false,
         trustedTypes: "angular#bundler",
-        scriptType: "module",
+        scriptType: "module"
       },
       watch: false,
       watchOptions: { poll: undefined, ignored: undefined },
@@ -182,7 +196,7 @@ export class SdCliClientBuilder extends EventEmitter {
       ignoreWarnings: [
         /Failed to parse source map from/,
         /Add postcss as project dependency/,
-        /"@charset" must be the first rule in the file/,
+        /"@charset" must be the first rule in the file/
       ],
       experiments: { backCompat: false, syncWebAssembly: true, asyncWebAssembly: true },
       infrastructureLogging: { level: "error" },
@@ -192,11 +206,46 @@ export class SdCliClientBuilder extends EventEmitter {
         profile: watch ? undefined : false,
         cacheDirectory: path.resolve(cachePath, "angular-webpack"),
         maxMemoryGenerations: 1,
-        name: createHash("sha1").update(pkgVersion).digest("hex")
+        name: createHash("sha1")
+          .update(pkgVersion)
+          .update(ngVersion)
+          .update(JSON.stringify(this._parsedTsconfig.options))
+          .update(this._workspaceRootPath)
+          .update(this._rootPath)
+          .update(JSON.stringify(this._config))
+          .update(watch.toString())
+          .digest("hex")
       },
+      ...watch ? {
+        snapshot: {
+          immutablePaths: internalModuleCachePaths,
+          managedPaths: internalModuleCachePaths
+        }
+      } : {},
       node: false,
       optimization: {
-        minimizer: [],
+        minimizer: watch ? [] : [
+          new JavaScriptOptimizerPlugin({
+            define: {
+              ngDevMode: false,
+              ngI18nClosureMode: false,
+              ngJitMode: false
+            },
+            sourcemap: false,
+            target: ts.ScriptTarget.ES2017,
+            keepIdentifierNames: true,
+            keepNames: true,
+            removeLicenses: true,
+            advanced: true
+          }),
+          new TransferSizePlugin(),
+          new CssOptimizerPlugin({
+            supportedBrowsers: browserslist([
+              "last 1 Chrome versions",
+              "last 2 Edge major versions"
+            ], { path: this._workspaceRootPath })
+          })
+        ] as any[],
         moduleIds: "deterministic",
         chunkIds: watch ? "named" : "deterministic",
         emitOnErrors: watch,
@@ -226,111 +275,6 @@ export class SdCliClientBuilder extends EventEmitter {
           }
         }
       },
-      plugins: [
-        new NamedChunksPlugin(),
-        new DedupeModuleResolvePlugin(),
-        /*new webpack.ProgressPlugin({
-          handler: (per: number, msg: string, ...args: string[]) => {
-            const phaseText = msg ? ` - phase: ${msg}` : "";
-            const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
-            this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
-          }
-        }),*/
-        new CommonJsUsageWarnPlugin(),
-        ...watch ? [] : [
-          new LicenseWebpackPlugin({
-            stats: { warnings: false, errors: false, },
-            perChunkOutput: false,
-            outputFilename: "3rdpartylicenses.txt",
-            skipChildCompilers: true
-          })
-        ],
-        new CopyWebpackPlugin({
-          patterns: [
-            ...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
-              context: this._rootPath,
-              to: item,
-              from: `src/${item}`,
-              noErrorOnMissing: true,
-              force: true,
-              globOptions: {
-                dot: true,
-                followSymbolicLinks: false,
-                ignore: [
-                  ".gitkeep",
-                  "**/.DS_Store",
-                  "**/Thumbs.db"
-                ].map((i) => PathUtil.posix(this._rootPath, i))
-              },
-              priority: 0
-            }))
-          ]
-        }),
-        ...watch ? [
-          new webpack.SourceMapDevToolPlugin({
-            filename: "[file].map",
-            include: [/js$/, /css$/],
-            sourceRoot: "webpack:///",
-            moduleFilenameTemplate: "[resource-path]",
-            append: undefined,
-          })
-        ] : [],
-        new AngularWebpackPlugin({
-          tsconfig: this._tsconfigFilePath,
-          compilerOptions: {
-            sourceMap: watch,
-            declaration: false,
-            declarationMap: false,
-            preserveSymlinks: false
-          },
-          jitMode: false,
-          emitNgModuleScope: watch,
-          inlineStyleFileExtension: "scss"
-        }),
-        new AnyComponentStyleBudgetChecker(watch ? [] : [
-          { type: Type.AnyComponentStyle, maximumWarning: "2kb", maximumError: "4kb" }
-        ]),
-        {
-          apply: (compiler: webpack.Compiler) => {
-            compiler.hooks.shutdown.tap("sass-worker", () => {
-              sassImplementation.close();
-            });
-          }
-        },
-        new MiniCssExtractPlugin({ filename: "[name].css" }),
-        new SuppressExtractedTextChunksWebpackPlugin(),
-        // NgBuildAnalyticsPlugin,
-        new IndexHtmlWebpackPlugin({
-          indexPath: path.resolve(this._rootPath, "src/index.html"),
-          outputPath: "index.html",
-          baseHref: publicPath,
-          entrypoints: [
-            ["runtime", true],
-            ["polyfills", true],
-            ["styles", false],
-            ["vendor", true],
-            ["main", true]
-          ],
-          deployUrl: undefined,
-          sri: false,
-          cache: {
-            enabled: true,
-            basePath: cacheBasePath,
-            path: cachePath
-          },
-          postTransform: undefined,
-          optimization: {
-            scripts: !watch,
-            styles: { minify: !watch, inlineCritical: !watch },
-            fonts: { inline: !watch }
-          },
-          crossOrigin: "none",
-          lang: undefined
-        }),
-        ...watch ? [
-          new webpack.HotModuleReplacementPlugin()
-        ] : []
-      ] as any[],
       module: {
         strictExportPresence: true,
         parser: { javascript: { url: false, worker: false } },
@@ -342,7 +286,7 @@ export class SdCliClientBuilder extends EventEmitter {
           },
           {
             test: /[/\\]rxjs[/\\]add[/\\].+\.js$/,
-            sideEffects: true,
+            sideEffects: true
           },
           {
             test: /\.[cm]?[tj]sx?$/,
@@ -359,7 +303,7 @@ export class SdCliClientBuilder extends EventEmitter {
                   instrumentCode: undefined
                 }
               }
-            ],
+            ]
           },
           ...watch ? [
             {
@@ -367,8 +311,8 @@ export class SdCliClientBuilder extends EventEmitter {
               enforce: "pre" as const,
               loader: "source-map-loader",
               options: {
-                filterSourceMappingUrl: (_mapUri: string, resourcePath: string) => {
-                  return !resourcePath.includes("node_modules") || (/@simplysm[\\/]sd/).test(resourcePath);
+                filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
+                  return !resourcePath.includes("node_modules") || (/@simplysm[\\/]/).test(resourcePath);
                 }
               }
             }
@@ -376,7 +320,7 @@ export class SdCliClientBuilder extends EventEmitter {
           {
             test: /\.[cm]?tsx?$/,
             loader: "@ngtools/webpack",
-            exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/],
+            exclude: [/[/\\](?:css-loader|mini-css-extract-plugin|webpack-dev-server|webpack)[/\\]/]
           },
           {
             test: /\.css$/i,
@@ -439,6 +383,143 @@ export class SdCliClientBuilder extends EventEmitter {
           ] : []
         ]
       },
+      plugins: [
+        new NodePolyfillPlugin(),
+        new NamedChunksPlugin(),
+        new DedupeModuleResolvePlugin(),
+        /*new webpack.ProgressPlugin({
+          handler: (per: number, msg: string, ...args: string[]) => {
+            const phaseText = msg ? ` - phase: ${msg}` : "";
+            const argsText = args.length > 0 ? ` - args: [${args.join(", ")}]` : "";
+            this._logger.debug(`Webpack 빌드 수행중...(${Math.round(per * 100)}%)${phaseText}${argsText}`);
+          }
+        }),*/
+        new CommonJsUsageWarnPlugin(),
+        ...watch ? [] : [
+          new LicenseWebpackPlugin({
+            stats: { warnings: false, errors: false },
+            perChunkOutput: false,
+            outputFilename: "3rdpartylicenses.txt",
+            skipChildCompilers: true
+          })
+        ],
+        new CopyWebpackPlugin({
+          patterns: [
+            ...["favicon.ico", "assets/", "manifest.webmanifest"].map((item) => ({
+              context: this._rootPath,
+              to: item,
+              from: `src/${item}`,
+              noErrorOnMissing: true,
+              force: true,
+              globOptions: {
+                dot: true,
+                followSymbolicLinks: false,
+                ignore: [
+                  ".gitkeep",
+                  "**/.DS_Store",
+                  "**/Thumbs.db"
+                ].map((i) => PathUtil.posix(this._rootPath, i))
+              },
+              priority: 0
+            }))
+          ]
+        }),
+        ...watch ? [
+          new webpack.SourceMapDevToolPlugin({
+            filename: "[file].map",
+            include: [/js$/, /css$/],
+            sourceRoot: "webpack:///",
+            moduleFilenameTemplate: "[resource-path]",
+            append: undefined
+          })
+        ] : [],
+        new AngularWebpackPlugin({
+          tsconfig: this._tsconfigFilePath,
+          compilerOptions: {
+            sourceMap: watch,
+            declaration: false,
+            declarationMap: false,
+            preserveSymlinks: false
+          },
+          jitMode: false,
+          emitNgModuleScope: watch,
+          inlineStyleFileExtension: "scss"
+        }),
+        new AnyComponentStyleBudgetChecker(watch ? [] : [
+          { type: Type.AnyComponentStyle, maximumWarning: "2kb", maximumError: "4kb" }
+        ]),
+        {
+          apply: (compiler: webpack.Compiler) => {
+            compiler.hooks.shutdown.tap("sass-worker", () => {
+              sassImplementation.close();
+            });
+          }
+        },
+        new MiniCssExtractPlugin({ filename: "[name].css" }),
+        new SuppressExtractedTextChunksWebpackPlugin(),
+        // NgBuildAnalyticsPlugin,
+        new IndexHtmlWebpackPlugin({
+          indexPath: path.resolve(this._rootPath, "src/index.html"),
+          outputPath: "index.html",
+          baseHref: publicPath,
+          entrypoints: [
+            ["runtime", true],
+            ["polyfills", true],
+            ["styles", false],
+            ["vendor", true],
+            ["main", true]
+          ],
+          deployUrl: undefined,
+          sri: false,
+          cache: {
+            enabled: true,
+            basePath: cacheBasePath,
+            path: cachePath
+          },
+          postTransform: undefined,
+          optimization: {
+            scripts: !watch,
+            styles: { minify: !watch, inlineCritical: !watch },
+            fonts: { inline: !watch }
+          },
+          crossOrigin: "none",
+          lang: undefined
+        }),
+        ...watch ? [
+          new webpack.HotModuleReplacementPlugin()
+        ] : [],
+        new webpack.EnvironmentPlugin({
+          SD_VERSION: this._getNpmConfig(this._rootPath)!.version,
+          ...this._config.env
+        }),
+        new ESLintWebpackPlugin({
+          context: this._rootPath,
+          eslintPath: path.resolve(this._workspaceRootPath, "node_modules", "eslint"),
+          exclude: ["node_modules"],
+          extensions: ["ts", "js", "mjs", "cjs"],
+          fix: false,
+          threads: false,
+          formatter: (results: LintResult[]) => {
+            const resultMessages: string[] = [];
+            for (const result of results) {
+              for (const msg of result.messages) {
+                const severity = msg.severity === 1 ? "warning" : msg.severity === 2 ? "error" : undefined;
+                if (severity === undefined) continue;
+
+                resultMessages.push(SdCliBuildResultUtil.getMessage({
+                  filePath: result.filePath,
+                  line: msg.line,
+                  char: msg.column,
+                  code: msg.ruleId?.toString(),
+                  severity,
+                  message: msg.message
+                }));
+              }
+            }
+            return resultMessages.join(os.EOL);
+          }
+        })
+      ] as any[]
     };
   }
 

package/src/builder/SdCliJsLibBuilder.ts

@@ -1,6 +1,6 @@
 import { ISdCliPackageBuildResult } from "../commons";
 import { EventEmitter } from "events";
-import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, SdFsWatcher } from "@simplysm/sd-core/node";
 import * as path from "path";
 import { SdCliPackageLinter } from "../build-tool/SdCliPackageLinter";
 
@@ -27,12 +27,16 @@ export class SdCliJsLibBuilder extends EventEmitter {
     const watcher = SdFsWatcher.watch(relatedPaths);
     watcher.onChange({}, async (changeInfos) => {
       const changeFilePaths = changeInfos.filter((item) => ["add", "change", "unlink"].includes(item.event)).map((item) => item.path);
-      if(changeFilePaths.length === 0) return;
+      if (changeFilePaths.length === 0) return;
 
       this._logger.debug("파일 변경 감지", changeInfos);
       this.emit("change");
+      const watchBuildResults: ISdCliPackageBuildResult[] = [];
 
-      const watchBuildResults = await this._linter.lintAsync(changeFilePaths);
+      const lintFilePaths = changeInfos.filter((item) => ["add", "change"].includes(item.event)).map((item) => item.path);
+      if (lintFilePaths.length > 0) {
+        watchBuildResults.push(...await this._linter.lintAsync(lintFilePaths));
+      }
 
       const watchRelatedPaths = await this.getRelatedPathsAsync();
       watcher.add(watchRelatedPaths);

package/src/builder/SdCliServerBuilder.ts

@@ -1,6 +1,6 @@
 import { INpmConfig, ISdCliPackageBuildResult, ISdCliServerPackageConfig } from "../commons";
 import { EventEmitter } from "events";
-import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core-node";
+import { FsUtil, Logger, PathUtil } from "@simplysm/sd-core/node";
 import webpack from "webpack";
 import path from "path";
 import ts from "typescript";
@@ -9,11 +9,12 @@ import { ErrorInfo } from "ts-loader/dist/interfaces";
 import os from "os";
 import { ESLint } from "eslint";
 import TerserPlugin from "terser-webpack-plugin";
-import { ObjectUtil, StringUtil } from "@simplysm/sd-core-common";
+import { ObjectUtil, StringUtil } from "@simplysm/sd-core/common";
 import ESLintWebpackPlugin from "eslint-webpack-plugin";
 import CopyWebpackPlugin from "copy-webpack-plugin";
 import { LicenseWebpackPlugin } from "license-webpack-plugin";
 import LintResult = ESLint.LintResult;
+import { createHash } from "crypto";
 
 export class SdCliServerBuilder extends EventEmitter {
   private readonly _logger = Logger.get(["simplysm", "sd-cli", this.constructor.name]);
@@ -207,6 +208,13 @@ export class SdCliServerBuilder extends EventEmitter {
       ? FsUtil.findAllParentChildDirPaths("node_modules/!(@simplysm)", this._rootPath, this._workspaceRootPath)
       : undefined;
 
+    const npmConfig = this._getNpmConfig(this._rootPath)!;
+    const pkgKey = npmConfig.name.split("/").last()!;
+    const pkgVersion = npmConfig.version;
+
+    const cacheBasePath = path.resolve(this._rootPath, ".cache");
+    const cachePath = path.resolve(cacheBasePath, pkgVersion);
+
     return {
       mode: watch ? "development" : "production",
       devtool: false,
@@ -216,7 +224,12 @@ export class SdCliServerBuilder extends EventEmitter {
         roots: [this._rootPath],
         extensions: [".ts", ".js", ".mjs", ".cjs"],
         symlinks: true,
-        mainFields: ["es2020", "default", "module", "main"]
+        modules: [this._workspaceRootPath, "node_modules"],
+        mainFields: ["es2020", "default", "module", "main"],
+        conditionNames: ["es2020", "..."]
+      },
+      resolveLoader: {
+        symlinks: true
       },
       context: this._workspaceRootPath,
       entry: {
@@ -225,6 +238,8 @@ export class SdCliServerBuilder extends EventEmitter {
         ]
       },
       output: {
+        uniqueName: pkgKey,
+        hashFunction: "xxhash64",
         clean: true,
         path: this._parsedTsconfig.options.outDir,
         filename: "[name].mjs",
@@ -232,46 +247,57 @@ export class SdCliServerBuilder extends EventEmitter {
         assetModuleFilename: "res/[name][ext][query]",
         libraryTarget: "module"
       },
+      watch: false,
+      watchOptions: { poll: undefined, ignored: undefined },
+      performance: { hints: false },
       experiments: {
         outputModule: true
       },
-      performance: { hints: false },
-      node: {
-        __dirname: true
-      },
+      infrastructureLogging: { level: "error" },
       stats: "errors-warnings",
       externals: extModuleNames,
+      cache: {
+        type: "filesystem",
+        profile: watch ? undefined : false,
+        cacheDirectory: path.resolve(cachePath, "server-webpack"),
+        maxMemoryGenerations: 1,
+        name: createHash("sha1")
+          .update(pkgVersion)
+          .update(JSON.stringify(this._parsedTsconfig.options))
+          .update(this._workspaceRootPath)
+          .update(this._rootPath)
+          .update(JSON.stringify(this._config))
+          .update(watch.toString())
+          .digest("hex")
+      },
       ...watch ? {
-        cache: { type: "memory", maxGenerations: 1 },
         snapshot: {
           immutablePaths: internalModuleCachePaths,
           managedPaths: internalModuleCachePaths
         }
-      } : {
-        cache: false
+      } : {},
+      node: {
+        __dirname: true
       },
       optimization: {
-        ...watch ? {} : {
-          minimize: true,
-          minimizer: [
-            new TerserPlugin({
-              extractComments: false,
-              terserOptions: {
-                compress: true,
-                ecma: 2020,
-                sourceMap: false,
-                keep_classnames: true,
-                keep_fnames: true,
-                ie8: false,
-                safari10: false,
-                module: true,
-                format: {
-                  comments: false
-                }
+        minimizer: watch ? [
+          new TerserPlugin({
+            extractComments: false,
+            terserOptions: {
+              compress: true,
+              ecma: 2020,
+              sourceMap: false,
+              keep_classnames: true,
+              keep_fnames: true,
+              ie8: false,
+              safari10: false,
+              module: true,
+              format: {
+                comments: false
               }
-            })
-          ]
-        },
+            }
+          })
+        ] : [],
         moduleIds: "deterministic",
         chunkIds: watch ? "named" : "deterministic",
         emitOnErrors: watch
@@ -280,7 +306,7 @@ export class SdCliServerBuilder extends EventEmitter {
         strictExportPresence: true,
         rules: [
           {
-            test: /\.m?js/,
+            test: /\.[cm]?[tj]sx?$/,
             resolve: {
               fullySpecified: false
             }
@@ -292,13 +318,13 @@ export class SdCliServerBuilder extends EventEmitter {
               loader: "source-map-loader",
               options: {
                 filterSourceMappingUrl: (mapUri: string, resourcePath: string) => {
-                  return !resourcePath.includes("node_modules") || (/@simplysm[\\/]sd/).test(resourcePath);
+                  return !resourcePath.includes("node_modules") || (/@simplysm[\\/]/).test(resourcePath);
                 }
               }
             }
           ] : [],
           {
-            test: /\.ts$/,
+            test: /\.[cm]?tsx?$/,
             exclude: /node_modules/,
             loader: "ts-loader",
             options: {