berry

.gitignore

@@ -39,3 +39,7 @@ yarn-error.log*
 junit.xml
 
 *.tsbuildinfo
+
+/.pnp.js
+/.yarn/unplugged/
+/.yarn/build-state.yml

.yarnrc

@@ -3,4 +3,3 @@
 
 
 lastUpdateCheck 1576854265612
-yarn-path ".yarn/releases/yarn-1.22.0.js"

.yarnrc.yml

@@ -0,0 +1,8 @@
+enableGlobalCache: true
+
+packageExtensions:
+  "@babel/parser@*":
+    dependencies:
+      "@babel/types": "*"
+
+yarnPath: .yarn/releases/yarn-sources.js

package.json

@@ -67,6 +67,7 @@
     "mocha": "^7.0.0",
     "mock-fs": "^4.4.1",
     "opencollective": "^1.0.3",
+    "pnp-webpack-plugin": "^1.6.0",
     "prettier": "^1.19.0",
     "prettylint": "^1.0.0",
     "progress": "^2.0.0",
@@ -82,12 +83,12 @@
     "which": "^2.0.1"
   },
   "scripts": {
-    "build-clean": "rm -rf ./packages/*/build ./packages/*/build-es5 ./packages/*/tsconfig.tsbuildinfo",
+    "build-clean": "rimraf ./packages/*/build ./packages/*/build-es5 ./packages/*/tsconfig.tsbuildinfo",
     "prebuild": "yarn build:ts",
     "build": "node ./scripts/build.js",
     "build:ts": "node scripts/buildTs.js",
     "check-copyright-headers": "node ./scripts/checkCopyrightHeaders.js",
-    "clean-all": "rm -rf ./node_modules && rm -rf ./packages/*/node_modules && yarn clean-e2e && yarn build-clean",
+    "clean-all": "rimraf ./node_modules && rimraf ./packages/*/node_modules && yarn clean-e2e && yarn build-clean",
     "clean-e2e": "find ./e2e -not \\( -path ./e2e/presets/js -prune \\) -not \\( -path ./e2e/presets/json -prune \\) -not \\( -path ./e2e/global-setup-node-modules -prune \\) -mindepth 1 -type d \\( -name node_modules -prune \\) -exec rm -r '{}' +",
     "jest": "node ./packages/jest-cli/bin/jest.js",
     "jest-coverage": "yarn jest --coverage",

scripts/browserBuild.js

@@ -10,6 +10,7 @@ const path = require('path');
 const webpack = require('webpack');
 const camelCase = require('camelcase');
 const rimraf = require('rimraf');
+const PnpWebpackPlugin = require('pnp-webpack-plugin');
 
 const transformOptions = require('../babel.config.js');
 
@@ -65,11 +66,15 @@ function browserBuild(pkgName, entryPath, destination) {
               '../packages/expect/build/fakeChalk.js'
             ),
           },
+          plugins: [PnpWebpackPlugin],
           extensions: ['.js', '.json', '.ts'],
         },
         node: {
           fs: 'empty',
         },
+        resolveLoader: {
+          plugins: [PnpWebpackPlugin.moduleLoader(module)],
+        },
       },
       /* eslint-enable */
       (err, stats) => {