From 48793907a0619b612d9574d0e4605e553bff9a91 Mon Sep 17 00:00:00 2001 From: Jack Westbrook Date: Mon, 17 Feb 2025 17:18:03 +0100 Subject: [PATCH] refactor(plugin-configs): use the amd option rather than hacking per node_module for amd deps --- .../grafana-plugin-configs/rspack.config.ts | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/packages/grafana-plugin-configs/rspack.config.ts b/packages/grafana-plugin-configs/rspack.config.ts index 4ee22d47268..43062dbedcc 100644 --- a/packages/grafana-plugin-configs/rspack.config.ts +++ b/packages/grafana-plugin-configs/rspack.config.ts @@ -31,6 +31,7 @@ __webpack_public_path__ = const config = async (env: Record): Promise => { const baseConfig: Configuration = { + amd: {}, context: process.cwd(), devtool: 'source-map', @@ -100,17 +101,17 @@ const config = async (env: Record): Promise => { // HACKS: Workaround for rspack not outputting UMD modules as webpack does. // We have systemjs amd define which doesn't work like standard amd define so we need to disable it, // in any umd module otherwise it will break at runtime. - { - test: [require.resolve('json-logic-js'), require.resolve('classnames')], - use: [ - { - loader: require.resolve('imports-loader'), - options: { - additionalCode: 'var define = false; /* Disable AMD for misbehaving libraries */', - }, - }, - ], - }, + // { + // test: [require.resolve('json-logic-js'), require.resolve('classnames')], + // use: [ + // { + // loader: require.resolve('imports-loader'), + // options: { + // additionalCode: 'var define = false; /* Disable AMD for misbehaving libraries */', + // }, + // }, + // ], + // }, { exclude: /(node_modules)/, test: /\.[tj]sx?$/,