From c9eb5aedcffbee1626882ad784875ce509dc2131 Mon Sep 17 00:00:00 2001 From: Jan Wloka Date: Sun, 26 Jan 2025 23:13:08 +0100 Subject: [PATCH] R!! Removes WebsmithLoaderOptions#sourceMap fixes #53 --- packages/webpack/src/loader-options.ts | 5 ++--- packages/webpack/src/options.spec.ts | 3 --- packages/webpack/src/options.ts | 19 +++---------------- 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/packages/webpack/src/loader-options.ts b/packages/webpack/src/loader-options.ts index 43546b3..d8017dc 100644 --- a/packages/webpack/src/loader-options.ts +++ b/packages/webpack/src/loader-options.ts @@ -14,14 +14,13 @@ export interface WebsmithLoaderOptions { addons?: string[]; addonsDir?: string; buildDir?: string; - config?: CompilationConfig; configFile?: string; + config?: CompilationConfig; debug?: boolean; project?: string; - sourceMap?: boolean; + targets?: string[]; transpileOnly?: boolean; tsConfig?: ts.CompilerOptions; - targets?: string[]; webpackTarget?: string; } diff --git a/packages/webpack/src/options.spec.ts b/packages/webpack/src/options.spec.ts index 6b2d72e..e2c616c 100644 --- a/packages/webpack/src/options.spec.ts +++ b/packages/webpack/src/options.spec.ts @@ -31,7 +31,6 @@ describe("createOptions", () => { expect(actual).toEqual({ configFilePath: "/expected/tsconfig.json", outDir: "/lib", - sourceMap: false, }); }); @@ -45,7 +44,6 @@ describe("createOptions", () => { expect(actual).toEqual({ configFilePath: "/expected/tsconfig.json", outDir: "/lib", - sourceMap: false, strict: true, }); }); @@ -60,7 +58,6 @@ describe("createOptions", () => { expect(actual).toEqual({ configFilePath: "/expected/tsconfig.json", outDir: "/lib", - sourceMap: false, strict: true, }); }); diff --git a/packages/webpack/src/options.ts b/packages/webpack/src/options.ts index 63f6b60..dbae01a 100644 --- a/packages/webpack/src/options.ts +++ b/packages/webpack/src/options.ts @@ -18,17 +18,7 @@ import ts from "typescript"; import { WebsmithLoaderConfig } from "./loader-options"; export const createOptions = (args: WebsmithLoaderConfig, reporter: Reporter = new NoReporter(), system = ts.sys): CompilerOptions => { - const { - buildDir, - config, - configFile, - debug = false, - project = "./tsconfig.json", - sourceMap = false, - targets = ["*"], - tsConfig, - transpileOnly, - } = args; + const { buildDir, config, configFile, debug = false, project = "./tsconfig.json", targets = ["*"], tsConfig, transpileOnly } = args; const cliArgs = resolveTsConfig(project, system); cliArgs.options = { ...cliArgs.options, ...tsConfig }; @@ -40,11 +30,8 @@ export const createOptions = (args: WebsmithLoaderConfig, reporter: Reporter = n cliArgs.options = updateCompilerOptions(cliArgs.options, system, projectDirectory); } - if (sourceMap !== undefined) { - cliArgs.options.sourceMap = sourceMap; - if (cliArgs.options.sourceMap === false) { - delete cliArgs.options.inlineSources; - } + if (cliArgs.options.sourceMap === false) { + delete cliArgs.options.inlineSources; } let mergedConfig = compilationConfig || config ? Object.assign({}, compilationConfig, config) : undefined;