From 2bf04b4a8c770692eea750c641b631ea2d2ad3bd Mon Sep 17 00:00:00 2001 From: Zach Schneider Date: Wed, 21 Feb 2018 22:35:27 -0500 Subject: [PATCH] Use source-map-loader for more fine-grained sourcemaps. (#1666) --- package.json | 1 + support/rollup/factory.js | 5 ++--- support/webpack/config.js | 5 +++++ yarn.lock | 47 ++++++++++++--------------------------- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 7ffd49783..6a945fa89 100644 --- a/package.json +++ b/package.json @@ -68,6 +68,7 @@ "slate-collapse-on-escape": "^0.6.0", "slate-soft-break": "^0.6.0", "slate-sugar": "^0.6.1", + "source-map-loader": "^0.2.3", "source-map-support": "^0.4.0", "style-loader": "^0.20.2", "to-camel-case": "^1.0.0", diff --git a/support/rollup/factory.js b/support/rollup/factory.js index 3ca711b22..3b011c7e8 100644 --- a/support/rollup/factory.js +++ b/support/rollup/factory.js @@ -18,7 +18,6 @@ import { startCase } from 'lodash' */ function configure(pkg, env, target) { - const isDev = env === 'development' const isProd = env === 'production' const isUmd = target === 'umd' const isModule = target === 'module' @@ -106,13 +105,13 @@ function configure(pkg, env, target) { { file: `packages/${pkg.name}/${pkg.module}`, format: 'es', - sourcemap: isDev, + sourcemap: true, }, { file: `packages/${pkg.name}/${pkg.main}`, format: 'cjs', exports: 'named', - sourcemap: isDev, + sourcemap: true, }, ], // We need to explicitly state which modules are external, meaning that diff --git a/support/webpack/config.js b/support/webpack/config.js index 92bff167e..f56db5bcd 100644 --- a/support/webpack/config.js +++ b/support/webpack/config.js @@ -25,6 +25,11 @@ const config = { }, module: { rules: [ + { + test: /\.js?$/, + use: 'source-map-loader', + enforce: 'pre', + }, { test: /\.js?$/, use: { diff --git a/yarn.lock b/yarn.lock index 2932b48f7..6526cc847 100644 --- a/yarn.lock +++ b/yarn.lock @@ -362,7 +362,7 @@ async@1.5.2, async@^1.4.0, async@^1.5.0, async@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" -async@^2.1.2, async@^2.4.1: +async@^2.1.2, async@^2.4.1, async@^2.5.0: version "2.6.0" resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" dependencies: @@ -2732,7 +2732,7 @@ errno@^0.1.1, errno@~0.1.1: dependencies: prr "~1.0.1" -errno@^0.1.3, errno@^0.1.4: +errno@^0.1.3: version "0.1.7" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" dependencies: @@ -4925,7 +4925,7 @@ loader-runner@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2" -loader-utils@^0.2.15, loader-utils@^0.2.16: +loader-utils@^0.2.15, loader-utils@^0.2.16, loader-utils@~0.2.2: version "0.2.17" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" dependencies: @@ -7117,7 +7117,7 @@ schema-utils@^0.3.0: dependencies: ajv "^5.0.0" -schema-utils@^0.4.2, schema-utils@^0.4.3: +schema-utils@^0.4.3: version "0.4.5" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e" dependencies: @@ -7372,6 +7372,14 @@ source-list-map@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085" +source-map-loader@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-0.2.3.tgz#d4b0c8cd47d54edce3e6bfa0f523f452b5b0e521" + dependencies: + async "^2.5.0" + loader-utils "~0.2.2" + source-map "~0.6.1" + source-map-resolve@^0.5.0: version "0.5.1" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" @@ -7993,13 +8001,6 @@ ua-parser-js@^0.7.9: version "0.7.12" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb" -uglify-es@^3.3.4: - version "3.3.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" - dependencies: - commander "~2.13.0" - source-map "~0.6.1" - uglify-es@^3.3.7: version "3.3.8" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.8.tgz#f2c68e6cff0d0f9dc9577e4da207151c2e753b7e" @@ -8035,19 +8036,6 @@ uglifyjs-webpack-plugin@^0.4.6: uglify-js "^2.8.29" webpack-sources "^1.0.1" -uglifyjs-webpack-plugin@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz#1302fb9471a7daf3d0a5174da6d65f0f415e75ad" - dependencies: - cacache "^10.0.1" - find-cache-dir "^1.0.0" - schema-utils "^0.4.2" - serialize-javascript "^1.4.0" - source-map "^0.6.1" - uglify-es "^3.3.4" - webpack-sources "^1.1.0" - worker-farm "^1.5.2" - uid-number@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -8327,7 +8315,7 @@ webpack-dev-server@^2.11.1: webpack-dev-middleware "1.12.2" yargs "6.6.0" -webpack-sources@^1.0.1, webpack-sources@^1.1.0: +webpack-sources@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54" dependencies: @@ -8430,13 +8418,6 @@ wordwrap@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" -worker-farm@^1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.5.2.tgz#32b312e5dc3d5d45d79ef44acc2587491cd729ae" - dependencies: - errno "^0.1.4" - xtend "^4.0.1" - wrap-ansi@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" @@ -8496,7 +8477,7 @@ xtend@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9" -xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: +xtend@^4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"