From 725321a29c5699869e502371f6695cf0bbc64c02 Mon Sep 17 00:00:00 2001 From: Arvin Han <20640097+ArvinJ-H@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:11:08 +1000 Subject: [PATCH 1/2] TINY-12932: Remove dependency on '@ephox/swag' --- .../src/main/ts/bedrock/compiler/Webpack.ts | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/server/src/main/ts/bedrock/compiler/Webpack.ts b/modules/server/src/main/ts/bedrock/compiler/Webpack.ts index 4002e343..a6bcf553 100644 --- a/modules/server/src/main/ts/bedrock/compiler/Webpack.ts +++ b/modules/server/src/main/ts/bedrock/compiler/Webpack.ts @@ -20,23 +20,7 @@ interface CompileInfo { readonly config: webpack.Configuration; } -const moduleAvailable = (name: string) => { - try { - require.resolve(name); - return true; - } catch (e) { - return false; - } -}; - -const webpackRemap: Array> = moduleAvailable('@ephox/swag') ? [ - { - test: /\.(js|mjs|tsx?)$/, - use: [ '@ephox/swag/webpack/remapper' ] - } -] : []; - -const webpackSharedRules = webpackRemap.concat([ +const webpackSharedRules = ([] as any[]).concat([ { test: /\.js$/, resolve: { From b108dd60fb98283906b4fd558a07b880e1f1c5be Mon Sep 17 00:00:00 2001 From: Arvin Han <20640097+ArvinJ-H@users.noreply.github.com> Date: Tue, 14 Oct 2025 18:14:08 +1000 Subject: [PATCH 2/2] TINY-12932: Add changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index abebc068..b472ff44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Unreleased +## Fixed +- Fixed an issue where `remapper` was still referenced in the webpack config. #TINY-12932 + ## 15.0.2 - 2025-02-03 ## Improved