From b743a1317f48ac53fa8011c61902bb00cc024241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?=
 =?UTF-8?q?arcadier-Muller?= <rmuller@amazon.com>
Date: Thu, 27 Sep 2018 10:55:54 +0200
Subject: [PATCH] Allow webpack to be aware of existing source-maps

---
 packages/jsii-runtime/package-lock.json | 47 +++++++++++++++++++++++++
 packages/jsii-runtime/package.json      |  1 +
 packages/jsii-runtime/webpack.config.js |  9 ++++-
 3 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/packages/jsii-runtime/package-lock.json b/packages/jsii-runtime/package-lock.json
index 2ff60df500..1d06a2a3b4 100644
--- a/packages/jsii-runtime/package-lock.json
+++ b/packages/jsii-runtime/package-lock.json
@@ -44,6 +44,14 @@
 			"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
 			"integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
 		},
+		"async": {
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+			"integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+			"requires": {
+				"lodash": "^4.17.10"
+			}
+		},
 		"asynckit": {
 			"version": "0.4.0",
 			"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -73,6 +81,11 @@
 				"tweetnacl": "^0.14.3"
 			}
 		},
+		"big.js": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz",
+			"integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q=="
+		},
 		"bind-obj-methods": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/bind-obj-methods/-/bind-obj-methods-2.0.0.tgz",
@@ -198,6 +211,11 @@
 			"resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz",
 			"integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ=="
 		},
+		"emojis-list": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+			"integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -397,6 +415,11 @@
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
 		},
+		"json5": {
+			"version": "0.5.1",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+			"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+		},
 		"jsprim": {
 			"version": "1.4.1",
 			"resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@@ -413,6 +436,21 @@
 			"resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
 			"integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM="
 		},
+		"loader-utils": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz",
+			"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
+			"requires": {
+				"big.js": "^3.1.3",
+				"emojis-list": "^2.0.0",
+				"json5": "^0.5.0"
+			}
+		},
+		"lodash": {
+			"version": "4.17.11",
+			"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+			"integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg=="
+		},
 		"log-driver": {
 			"version": "1.2.7",
 			"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
@@ -2943,6 +2981,15 @@
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
 			"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
 		},
+		"source-map-loader": {
+			"version": "0.2.4",
+			"resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz",
+			"integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==",
+			"requires": {
+				"async": "^2.5.0",
+				"loader-utils": "^1.1.0"
+			}
+		},
 		"source-map-support": {
 			"version": "0.5.9",
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
diff --git a/packages/jsii-runtime/package.json b/packages/jsii-runtime/package.json
index 7f5aefc78a..d4c78ad963 100644
--- a/packages/jsii-runtime/package.json
+++ b/packages/jsii-runtime/package.json
@@ -20,6 +20,7 @@
     "jsii-build-tools": "^0.7.6",
     "jsii-calc": "^0.7.6",
     "nodeunit": "^0.11.3",
+    "source-map-loader": "^0.2.4",
     "typescript": "^3.0.1",
     "wasm-loader": "^1.3.0",
     "webpack": "^4.12.0",
diff --git a/packages/jsii-runtime/webpack.config.js b/packages/jsii-runtime/webpack.config.js
index d78c3f29cc..d66a6a155a 100644
--- a/packages/jsii-runtime/webpack.config.js
+++ b/packages/jsii-runtime/webpack.config.js
@@ -6,7 +6,7 @@ module.exports = {
         path: __dirname + '/webpack',
         filename: 'jsii-runtime.js'
     },
-    devtool: 'source-maps',
+    devtool: 'inline-source-map',
     target: 'node',
     node: {
         console: false,
@@ -16,5 +16,12 @@ module.exports = {
         __dirname: false,
         Buffer: false,
         setImmediate: false,
+    },
+    module: {
+        rules: [{
+            test: /\.js$/,
+            use: ['source-map-loader'],
+            enforce: 'pre'
+        }]
     }
 }