From ec8cc0327e75cd5404b3e5b65f93e5b3d89ef2a9 Mon Sep 17 00:00:00 2001 From: Maarten Zuidhoorn Date: Thu, 1 Feb 2024 15:04:36 +0100 Subject: [PATCH] Fix CLI tests --- .../snaps-cli/src/webpack/__snapshots__/config.test.ts.snap | 6 +++--- packages/snaps-cli/src/webpack/config.test.ts | 4 +++- packages/snaps-cli/src/webpack/config.ts | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/snaps-cli/src/webpack/__snapshots__/config.test.ts.snap b/packages/snaps-cli/src/webpack/__snapshots__/config.test.ts.snap index 708821c319..aefb7c12a0 100644 --- a/packages/snaps-cli/src/webpack/__snapshots__/config.test.ts.snap +++ b/packages/snaps-cli/src/webpack/__snapshots__/config.test.ts.snap @@ -2031,7 +2031,7 @@ exports[`getDefaultConfiguration returns the default Webpack configuration for t "exclude": /node_modules/u, "test": /\\\\\\.\\[tj\\]sx\\?\\$/u, "use": { - "loader": "/Users/morten/Development/MetaMask/snaps/packages/snaps-cli/src/webpack/loaders/function.ts", + "loader": "/foo/bar/src/webpack/loaders/function.ts", "options": { "bundlerCustomizer": undefined, "depsToTranspile": [], @@ -2166,7 +2166,7 @@ exports[`getDefaultConfiguration returns the default Webpack configuration for t "exclude": /node_modules/u, "test": /\\\\\\.\\[tj\\]sx\\?\\$/u, "use": { - "loader": "/Users/morten/Development/MetaMask/snaps/packages/snaps-cli/src/webpack/loaders/function.ts", + "loader": "/foo/bar/src/webpack/loaders/function.ts", "options": { "bundlerCustomizer": undefined, "depsToTranspile": [], @@ -2301,7 +2301,7 @@ exports[`getDefaultConfiguration returns the default Webpack configuration for t "exclude": /node_modules/u, "test": /\\\\\\.\\[tj\\]sx\\?\\$/u, "use": { - "loader": "/Users/morten/Development/MetaMask/snaps/packages/snaps-cli/src/webpack/loaders/function.ts", + "loader": "/foo/bar/src/webpack/loaders/function.ts", "options": { "bundlerCustomizer": undefined, "depsToTranspile": [], diff --git a/packages/snaps-cli/src/webpack/config.test.ts b/packages/snaps-cli/src/webpack/config.test.ts index 68355e8344..0404de4255 100644 --- a/packages/snaps-cli/src/webpack/config.test.ts +++ b/packages/snaps-cli/src/webpack/config.test.ts @@ -191,8 +191,10 @@ describe('getDefaultConfiguration', () => { async (config) => { jest.spyOn(process, 'cwd').mockReturnValue('/foo/bar'); + const output = await getDefaultConfiguration(config); + // eslint-disable-next-line jest/no-restricted-matchers - expect(await getDefaultConfiguration(config)).toMatchSnapshot(); + expect(normalizeConfig(output)).toMatchSnapshot(); }, ); diff --git a/packages/snaps-cli/src/webpack/config.ts b/packages/snaps-cli/src/webpack/config.ts index 67b80dc9a1..47cb8a49a6 100644 --- a/packages/snaps-cli/src/webpack/config.ts +++ b/packages/snaps-cli/src/webpack/config.ts @@ -196,7 +196,7 @@ export async function getDefaultConfiguration( config.experimental.wasm && { test: /\.wasm$/u, - use: getFunctionLoader(wasm), + use: getFunctionLoader(wasm, {}), }, ], },