diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a9e0f235..0e6a88e0 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -11635,6 +11635,15 @@
         "semver-compare": "^1.0.0"
       }
     },
+    "pnp-webpack-plugin": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz",
+      "integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
+      "dev": true,
+      "requires": {
+        "ts-pnp": "^1.1.6"
+      }
+    },
     "polished": {
       "version": "3.7.0",
       "resolved": "https://registry.npmjs.org/polished/-/polished-3.7.0.tgz",
@@ -14818,6 +14827,12 @@
         "yn": "3.1.1"
       }
     },
+    "ts-pnp": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ts-pnp/-/ts-pnp-1.2.0.tgz",
+      "integrity": "sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==",
+      "dev": true
+    },
     "tslib": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
diff --git a/package.json b/package.json
index 02185fed..d2fb112a 100644
--- a/package.json
+++ b/package.json
@@ -98,6 +98,7 @@
     "omit-deep-lodash": "1.1.4",
     "outdent": "^0.7.1",
     "path-is-inside": "^1.0.2",
+    "pnp-webpack-plugin": "^1.6.4",
     "pretty-bytes": "^5.3.0",
     "react": "^16.8.5",
     "react-dom": "^16.8.5",
diff --git a/typings/pnp-webpack-plugin/index.d.ts b/typings/pnp-webpack-plugin/index.d.ts
new file mode 100644
index 00000000..72019fa9
--- /dev/null
+++ b/typings/pnp-webpack-plugin/index.d.ts
@@ -0,0 +1 @@
+declare module 'pnp-webpack-plugin';
diff --git a/webpack.config.ts b/webpack.config.ts
index 8f880f12..4ba7cca0 100644
--- a/webpack.config.ts
+++ b/webpack.config.ts
@@ -24,6 +24,7 @@ import { env } from 'process';
 import * as SimpleProgressWebpackPlugin from 'simple-progress-webpack-plugin';
 import * as TerserPlugin from 'terser-webpack-plugin';
 import { BannerPlugin, NormalModuleReplacementPlugin } from 'webpack';
+import * as PnpWebpackPlugin from 'pnp-webpack-plugin';
 
 /**
  * Don't webpack package.json as mixpanel & sentry tokens
@@ -293,6 +294,7 @@ const commonConfig = {
 		extensions: ['.node', '.js', '.json', '.ts', '.tsx'],
 	},
 	plugins: [
+		PnpWebpackPlugin,
 		new SimpleProgressWebpackPlugin({
 			format: process.env.WEBPACK_PROGRESS || 'verbose',
 		}),
@@ -303,6 +305,9 @@ const commonConfig = {
 			'./http.js',
 		),
 	],
+	resolveLoader: {
+		plugins: [PnpWebpackPlugin.moduleLoader(module)],
+	},
 	output: {
 		path: path.join(__dirname, 'generated'),
 		filename: '[name].js',