From c997388ab1e7539feb5719c677554db58c5bcbb3 Mon Sep 17 00:00:00 2001 From: tada5hi Date: Wed, 17 May 2023 18:04:57 +0200 Subject: [PATCH] fix(esm-shim): bump dependencies --- packages/esm-shim/package.json | 2 +- packages/esm-shim/src/utils.ts | 19 ++++++++++++++++++- pnpm-lock.yaml | 11 +++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/packages/esm-shim/package.json b/packages/esm-shim/package.json index 3714f61e5..fab47d505 100644 --- a/packages/esm-shim/package.json +++ b/packages/esm-shim/package.json @@ -60,7 +60,7 @@ } }, "dependencies": { - "magic-string": "^0.27.0" + "magic-string": "^0.30.0" }, "devDependencies": { "rollup": "^3.0.0-7", diff --git a/packages/esm-shim/src/utils.ts b/packages/esm-shim/src/utils.ts index 75ab87369..ad480a0b9 100644 --- a/packages/esm-shim/src/utils.ts +++ b/packages/esm-shim/src/utils.ts @@ -43,8 +43,25 @@ export function provideCJSSyntax(code: string): Output | null { const s = new MagicString(code); s.appendRight(indexToAppend, ESMShim); + const sourceMap = s.generateMap({ + includeContent: true + }); + let sourcesContent: string[] | undefined; + if (Array.isArray(sourceMap.sourcesContent)) { + sourcesContent = []; + for (let i = 0; i < sourceMap.sourcesContent.length; i++) { + const content = sourceMap.sources[i]; + if (typeof content === 'string') { + sourcesContent.push(content); + } + } + } + return { code: s.toString(), - map: s.generateMap() + map: { + ...sourceMap, + sourcesContent + } }; } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f61b640bf..d42ac7995 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -266,11 +266,11 @@ importers: packages/esm-shim: specifiers: - magic-string: ^0.27.0 + magic-string: ^0.30.0 rollup: ^3.0.0-7 typescript: ^4.8.3 dependencies: - magic-string: 0.27.0 + magic-string: 0.30.0 devDependencies: rollup: 3.2.3 typescript: 4.8.4 @@ -5449,6 +5449,13 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 dev: false + /magic-string/0.30.0: + resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.14 + dev: false + /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} engines: {node: '>=6'}