From afb22a3e857802471ac3a23f6215122f2448a98a Mon Sep 17 00:00:00 2001 From: owjs3901 Date: Mon, 7 Jul 2025 14:23:46 +0900 Subject: [PATCH 1/2] Fix sourcemap issue --- .changeset/ninety-kings-boil.md | 5 +++++ packages/webpack-plugin/src/loader.ts | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/ninety-kings-boil.md diff --git a/.changeset/ninety-kings-boil.md b/.changeset/ninety-kings-boil.md new file mode 100644 index 00000000..09b5a6b7 --- /dev/null +++ b/.changeset/ninety-kings-boil.md @@ -0,0 +1,5 @@ +--- +"@devup-ui/webpack-plugin": patch +--- + +Fix sourcemap issue diff --git a/packages/webpack-plugin/src/loader.ts b/packages/webpack-plugin/src/loader.ts index 19d37cc6..f4de4fb3 100644 --- a/packages/webpack-plugin/src/loader.ts +++ b/packages/webpack-plugin/src/loader.ts @@ -41,10 +41,10 @@ const devupUILoader: RawLoaderDefinitionFunction = writeFile(classMapFile, exportClassMap()), ]) .catch(console.error) - .finally(() => callback(null, code, map)) + .finally(() => callback(null, code, map ? JSON.parse(map) : null)) return } - callback(null, code, map) + callback(null, code, map ? JSON.parse(map) : null) } catch (error) { callback(error as Error) } From 59b1a416f2cb58afe60c689192d8d38f70f4d652 Mon Sep 17 00:00:00 2001 From: owjs3901 Date: Mon, 7 Jul 2025 14:27:49 +0900 Subject: [PATCH 2/2] Fix sourcemap issue --- packages/webpack-plugin/src/__tests__/loader.test.ts | 6 +++--- packages/webpack-plugin/src/loader.ts | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/webpack-plugin/src/__tests__/loader.test.ts b/packages/webpack-plugin/src/__tests__/loader.test.ts index cee49dad..b1646ff4 100644 --- a/packages/webpack-plugin/src/__tests__/loader.test.ts +++ b/packages/webpack-plugin/src/__tests__/loader.test.ts @@ -37,7 +37,7 @@ describe('devupUILoader', () => { code: 'code', css: 'css', free: vi.fn(), - map: undefined, + map: '{}', }) devupUILoader.bind(t as any)(Buffer.from('code'), 'index.tsx') @@ -49,7 +49,7 @@ describe('devupUILoader', () => { 'cssFile', ) await vi.waitFor(() => { - expect(t.async()).toHaveBeenCalledWith(null, 'code', undefined) + expect(t.async()).toHaveBeenCalledWith(null, 'code', {}) }) expect(writeFile).toHaveBeenCalledWith('cssFile', '/* index.tsx 0 */') expect(writeFile).toHaveBeenCalledWith('sheetFile', 'sheet') @@ -84,7 +84,7 @@ describe('devupUILoader', () => { 'package', 'cssFile', ) - expect(t.async()).toHaveBeenCalledWith(null, 'code', undefined) + expect(t.async()).toHaveBeenCalledWith(null, 'code', null) expect(writeFile).not.toHaveBeenCalledWith('cssFile', 'css', { encoding: 'utf-8', }) diff --git a/packages/webpack-plugin/src/loader.ts b/packages/webpack-plugin/src/loader.ts index f4de4fb3..0ce6d993 100644 --- a/packages/webpack-plugin/src/loader.ts +++ b/packages/webpack-plugin/src/loader.ts @@ -31,6 +31,7 @@ const devupUILoader: RawLoaderDefinitionFunction = libPackage, relative(dirname(this.resourcePath), cssFile).replaceAll('\\', '/'), ) + const sourceMap = map ? JSON.parse(map) : null if (css && watch) { const content = `${this.resourcePath} ${Date.now()}` if (this._compiler) (this._compiler as any).__DEVUP_CACHE = content @@ -41,10 +42,10 @@ const devupUILoader: RawLoaderDefinitionFunction = writeFile(classMapFile, exportClassMap()), ]) .catch(console.error) - .finally(() => callback(null, code, map ? JSON.parse(map) : null)) + .finally(() => callback(null, code, sourceMap)) return } - callback(null, code, map ? JSON.parse(map) : null) + callback(null, code, sourceMap) } catch (error) { callback(error as Error) }