From c325da8d3d7445eeba3f4516e5027759aa1819cd Mon Sep 17 00:00:00 2001 From: Rohith Ramakrishnan <6977429+MadaraUchiha-314@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:55:31 -0700 Subject: [PATCH] fix: adding sourcemaps #49 (#50) * fix: adding sourcemaps #49 * fix: removing prettier --- package-lock.json | 79 ------------------- packages/examples/project-a/package.json | 1 - packages/examples/project-a/rollup.config.mjs | 5 +- packages/examples/project-b/package.json | 1 - packages/examples/project-b/rollup.config.mjs | 5 +- .../src/index.ts | 6 +- 6 files changed, 7 insertions(+), 90 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a94a67..c007052 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2508,16 +2508,6 @@ "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==", "dev": true }, - "node_modules/@types/prettier": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-3.0.0.tgz", - "integrity": "sha512-mFMBfMOz8QxhYVbuINtswBp9VL2b4Y0QqYHwqLz3YbgtfAcat2Dl6Y1o4e22S/OVE6Ebl9m7wWiMT2lSbAs1wA==", - "deprecated": "This is a stub types definition. prettier provides its own type definitions, so you do not need this installed.", - "dev": true, - "dependencies": { - "prettier": "*" - } - }, "node_modules/@types/qs": { "version": "6.9.14", "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.14.tgz", @@ -4458,15 +4448,6 @@ "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true }, - "node_modules/diff": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz", - "integrity": "sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==", - "dev": true, - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/diff-sequences": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", @@ -7194,30 +7175,12 @@ "integrity": "sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==", "dev": true }, - "node_modules/lodash.hasin": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/lodash.hasin/-/lodash.hasin-4.5.2.tgz", - "integrity": "sha512-AFAitwTSq1Ka/1J9uBaVxpLBP5OI3INQvkl4wKcgIYxoA0S3aqO1QWXHR9aCcOrWtPFqP7GzlFncZfe0Jz0kNw==", - "dev": true - }, - "node_modules/lodash.isempty": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz", - "integrity": "sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==", - "dev": true - }, "node_modules/lodash.ismatch": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", "dev": true }, - "node_modules/lodash.isnil": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lodash.isnil/-/lodash.isnil-4.0.0.tgz", - "integrity": "sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==", - "dev": true - }, "node_modules/lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", @@ -7236,12 +7199,6 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "node_modules/lodash.omitby": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/lodash.omitby/-/lodash.omitby-4.6.0.tgz", - "integrity": "sha512-5OrRcIVR75M288p4nbI2WLAf3ndw2GD9fyNv3Bc15+WCxJDdZ4lYndSxGd7hnG6PVjiJTeJE2dHEGhIuKGicIQ==", - "dev": true - }, "node_modules/lodash.uniqby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz", @@ -12501,40 +12458,6 @@ "resolved": "packages/rollup-plugin-module-federation", "link": true }, - "node_modules/rollup-plugin-prettier": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-prettier/-/rollup-plugin-prettier-4.1.1.tgz", - "integrity": "sha512-ugpi/EqW12yJa4NO3o4f/wt/YHwiQovVGC2jxZgxuKO9osjt4lVxVA427+itl87XmQc6089ZkpDc6OpaOZKWgQ==", - "dev": true, - "dependencies": { - "@types/prettier": "^1.0.0 || ^2.0.0 || ^3.0.0", - "diff": "5.1.0", - "lodash.hasin": "4.5.2", - "lodash.isempty": "4.4.0", - "lodash.isnil": "4.0.0", - "lodash.omitby": "4.6.0", - "magic-string": "0.30.5" - }, - "engines": { - "node": ">=6.0.0" - }, - "peerDependencies": { - "prettier": "^1.0.0 || ^2.0.0 || ^3.0.0", - "rollup": "^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0" - } - }, - "node_modules/rollup-plugin-prettier/node_modules/magic-string": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", - "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", - "dev": true, - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -15405,7 +15328,6 @@ "rollup": "3.23.0", "rollup-plugin-copy": "3.5.0", "rollup-plugin-module-federation": "*", - "rollup-plugin-prettier": "4.1.1", "webpack": "5.84.1", "webpack-cli": "5.1.1" } @@ -15445,7 +15367,6 @@ "rollup": "3.23.0", "rollup-plugin-copy": "3.5.0", "rollup-plugin-module-federation": "*", - "rollup-plugin-prettier": "4.1.1", "webpack": "5.84.1", "webpack-cli": "5.1.1" } diff --git a/packages/examples/project-a/package.json b/packages/examples/project-a/package.json index 6c88f2a..f46884f 100644 --- a/packages/examples/project-a/package.json +++ b/packages/examples/project-a/package.json @@ -34,7 +34,6 @@ "rollup": "3.23.0", "rollup-plugin-copy": "3.5.0", "rollup-plugin-module-federation": "*", - "rollup-plugin-prettier": "4.1.1", "webpack": "5.84.1", "webpack-cli": "5.1.1", "@rspack/cli": "0.5.9", diff --git a/packages/examples/project-a/rollup.config.mjs b/packages/examples/project-a/rollup.config.mjs index 9e228e0..9c6075b 100644 --- a/packages/examples/project-a/rollup.config.mjs +++ b/packages/examples/project-a/rollup.config.mjs @@ -3,7 +3,6 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'; import replace from '@rollup/plugin-replace'; import copy from 'rollup-plugin-copy'; import json from '@rollup/plugin-json'; -import prettier from 'rollup-plugin-prettier'; import federation from 'rollup-plugin-module-federation'; @@ -13,6 +12,7 @@ const config = async ({ outputFormat }) => ({ output: { dir: `dist/rollup/${outputFormat}`, format: outputFormat, + sourcemap: true, }, plugins: [ replace({ @@ -25,9 +25,6 @@ const config = async ({ outputFormat }) => ({ }), json(), commonjs(), - prettier({ - parser: 'babel', - }), copy({ targets: [ { diff --git a/packages/examples/project-b/package.json b/packages/examples/project-b/package.json index 3c900c0..86f8fb4 100644 --- a/packages/examples/project-b/package.json +++ b/packages/examples/project-b/package.json @@ -28,7 +28,6 @@ "rollup": "3.23.0", "rollup-plugin-copy": "3.5.0", "rollup-plugin-module-federation": "*", - "rollup-plugin-prettier": "4.1.1", "webpack": "5.84.1", "webpack-cli": "5.1.1", "@rspack/cli": "0.5.9", diff --git a/packages/examples/project-b/rollup.config.mjs b/packages/examples/project-b/rollup.config.mjs index 1405fbb..b62d90d 100644 --- a/packages/examples/project-b/rollup.config.mjs +++ b/packages/examples/project-b/rollup.config.mjs @@ -3,7 +3,6 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'; import replace from '@rollup/plugin-replace'; import copy from 'rollup-plugin-copy'; import json from '@rollup/plugin-json'; -import prettier from 'rollup-plugin-prettier'; import federation from 'rollup-plugin-module-federation'; @@ -13,6 +12,7 @@ const config = ({ outputFormat }) => ({ output: { dir: `dist/rollup/${outputFormat}`, format: outputFormat, + sourcemap: true, }, plugins: [ replace({ @@ -25,9 +25,6 @@ const config = ({ outputFormat }) => ({ }), json(), commonjs(), - prettier({ - parser: 'babel', - }), copy({ targets: [ { diff --git a/packages/rollup-plugin-module-federation/src/index.ts b/packages/rollup-plugin-module-federation/src/index.ts index c726a30..61c986a 100644 --- a/packages/rollup-plugin-module-federation/src/index.ts +++ b/packages/rollup-plugin-module-federation/src/index.ts @@ -566,7 +566,10 @@ export default function federation( /** * TODO: We need human readable good code. Atleast until the terser plugin minifies it :p */ - return remoteEntryCode.toString(); + return { + code: remoteEntryCode.toString(), + map: remoteEntryCode.generateMap(), + }; } return null; }, @@ -680,6 +683,7 @@ export default function federation( } return { code: magicString.toString(), + map: magicString.generateMap(), }; }, },