From 49ceba698ce1a51564c95d5f9e9d934dde25fb35 Mon Sep 17 00:00:00 2001
From: Pooya Parsa <pyapar@gmail.com>
Date: Tue, 22 Dec 2020 21:05:25 +0100
Subject: [PATCH] chore: fix issues with pnp [release]

---
 package.json                  |  2 +-
 packages/config/package.json  |  2 +-
 packages/utils/src/cjs.js     | 12 +++++++-----
 packages/webpack/package.js   |  1 +
 packages/webpack/package.json |  1 +
 yarn.lock                     |  7 ++++++-
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 55d061c78b..82c8aa8b0d 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "improved-yarn-audit": "^2.3.2",
     "is-wsl": "^2.2.0",
     "jest": "^26.6.3",
-    "jiti": "^0.1.17",
+    "jiti": "^0.1.18",
     "jsdom": "^16.4.0",
     "jsonfile": "^6.1.0",
     "klaw-sync": "^6.0.0",
diff --git a/packages/config/package.json b/packages/config/package.json
index 3afc234569..eafaeb87e5 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -16,7 +16,7 @@
     "defu": "^3.2.2",
     "destr": "^1.0.1",
     "dotenv": "^8.2.0",
-    "jiti": "^0.1.17",
+    "jiti": "^0.1.18",
     "lodash": "^4.17.20",
     "rc9": "^1.2.0",
     "std-env": "^2.2.1",
diff --git a/packages/utils/src/cjs.js b/packages/utils/src/cjs.js
index beb45c5b31..750030e353 100644
--- a/packages/utils/src/cjs.js
+++ b/packages/utils/src/cjs.js
@@ -67,11 +67,13 @@ export function resolveModule (id, paths) {
   if (typeof paths === 'string') {
     paths = [paths]
   }
-  return _require.resolve(id, [
-    process.cwd(),
-    ...(paths || []),
-    ...(global.__NUXT_PATHS__ || [])
-  ])
+  return _require.resolve(id, {
+    paths: [
+      process.cwd(),
+      ...(paths || []),
+      ...(global.__NUXT_PATHS__ || [])
+    ]
+  })
 }
 
 export function requireModule (id, paths) {
diff --git a/packages/webpack/package.js b/packages/webpack/package.js
index 3699342f92..6d0ff56e01 100644
--- a/packages/webpack/package.js
+++ b/packages/webpack/package.js
@@ -2,6 +2,7 @@ export default {
   build: true,
   ignoreUnused: [
     '@nuxt/babel-preset-app',
+    '@babel/core', // peerDependency of babel-loader
     'babel-loader',
     'cache-loader',
     'caniuse-lite',
diff --git a/packages/webpack/package.json b/packages/webpack/package.json
index 41ea8671ea..3c868d2d74 100644
--- a/packages/webpack/package.json
+++ b/packages/webpack/package.json
@@ -8,6 +8,7 @@
     "dist"
   ],
   "dependencies": {
+    "@babel/core": "^7.12.10",
     "@nuxt/babel-preset-app": "2.14.12",
     "@nuxt/friendly-errors-webpack-plugin": "^2.5.0",
     "@nuxt/utils": "2.14.12",
diff --git a/yarn.lock b/yarn.lock
index 03fca1c2ce..de0780a557 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8100,11 +8100,16 @@ jest@^26.6.3:
     import-local "^3.0.2"
     jest-cli "^26.6.3"
 
-jiti@^0.1.16, jiti@^0.1.17:
+jiti@^0.1.16:
   version "0.1.17"
   resolved "https://registry.npmjs.org/jiti/-/jiti-0.1.17.tgz#b693a29c94d0ca4f82a4624b40dd9915527416be"
   integrity sha512-IlUGuEHKA44dqJoSqpv1poIRyyi31ciEmpLlRZCmo9TasVSZhwfmaVUuQVs26EHuwYdx+NirOm41+wbykH/+9Q==
 
+jiti@^0.1.18:
+  version "0.1.18"
+  resolved "https://registry.npmjs.org/jiti/-/jiti-0.1.18.tgz#1120c59f538667ab128ae9d7edde96ab837d8f33"
+  integrity sha512-UUoooMMbuKJivBJL8tH+Tkf4gdF4CcwdaswrBW+HJxme0L1NWjXEV8A4wxgHW2s5rJnDM5NoVmuUYT6PNSgKmw==
+
 js-beautify@^1.6.12:
   version "1.13.0"
   resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz#a056d5d3acfd4918549aae3ab039f9f3c51eebb2"