Merge pull request #1222 from lowdefy/upgrade-yarn

chore: Update yarn version.

.pnp.loader.mjs

@@ -38,7 +38,7 @@ npath.toPortablePath = toPortablePath;
 npath.contains = (from, to) => contains(npath, from, to);
 ppath.contains = (from, to) => contains(ppath, from, to);
 const WINDOWS_PATH_REGEXP = /^([a-zA-Z]:.*)$/;
-const UNC_WINDOWS_PATH_REGEXP = /^\\\\(\.\\)?(.*)$/;
+const UNC_WINDOWS_PATH_REGEXP = /^\/\/(\.\/)?(.*)$/;
 const PORTABLE_PATH_REGEXP = /^\/([a-zA-Z]:.*)$/;
 const UNC_PORTABLE_PATH_REGEXP = /^\/unc\/(\.dot\/)?(.*)$/;
 function fromPortablePath(p) {
@@ -56,12 +56,13 @@ function fromPortablePath(p) {
 function toPortablePath(p) {
   if (process.platform !== `win32`)
     return p;
+  p = p.replace(/\\/g, `/`);
   let windowsPathMatch, uncWindowsPathMatch;
   if (windowsPathMatch = p.match(WINDOWS_PATH_REGEXP))
     p = `/${windowsPathMatch[1]}`;
   else if (uncWindowsPathMatch = p.match(UNC_WINDOWS_PATH_REGEXP))
     p = `/unc/${uncWindowsPathMatch[1] ? `.dot/` : ``}${uncWindowsPathMatch[2]}`;
-  return p.replace(/\\/g, `/`);
+  return p;
 }
 
 const builtinModules = new Set(Module.builtinModules || Object.keys(process.binding(`natives`)));
@@ -100,15 +101,19 @@ async function tryReadFile(path2) {
     throw error;
   }
 }
-function tryParseURL(str) {
+function tryParseURL(str, base) {
   try {
-    return new URL(str);
+    return new URL(str, base);
   } catch {
     return null;
   }
 }
+let entrypointPath = null;
+function setEntrypointPath(file) {
+  entrypointPath = file;
+}
 function getFileFormat(filepath) {
-  var _a;
+  var _a, _b;
   const ext = path.extname(filepath);
   switch (ext) {
     case `.mjs`: {
@@ -125,12 +130,21 @@ function getFileFormat(filepath) {
     }
     case `.js`: {
       const pkg = readPackageScope(filepath);
-      if (pkg) {
-        return (_a = pkg.data.type) != null ? _a : `commonjs`;
-      }
+      if (!pkg)
+        return `commonjs`;
+      return (_a = pkg.data.type) != null ? _a : `commonjs`;
+    }
+    default: {
+      if (entrypointPath !== filepath)
+        return null;
+      const pkg = readPackageScope(filepath);
+      if (!pkg)
+        return `commonjs`;
+      if (pkg.data.type === `module`)
+        return null;
+      return (_b = pkg.data.type) != null ? _b : `commonjs`;
     }
   }
-  return null;
 }
 
 async function getFormat$1(resolved, context, defaultGetFormat) {
@@ -170,17 +184,18 @@ async function load$1(urlString, context, defaultLoad) {
 }
 
 const pathRegExp = /^(?![a-zA-Z]:[\\/]|\\\\|\.{0,2}(?:\/|$))((?:node:)?(?:@[^/]+\/)?[^/]+)\/*(.*|)$/;
+const isRelativeRegexp = /^\.{0,2}\//;
 async function resolve$1(originalSpecifier, context, defaultResolver) {
   var _a;
   const {findPnpApi} = moduleExports;
   if (!findPnpApi || isBuiltinModule(originalSpecifier))
     return defaultResolver(originalSpecifier, context, defaultResolver);
   let specifier = originalSpecifier;
-  const url = tryParseURL(specifier);
+  const url = tryParseURL(specifier, isRelativeRegexp.test(specifier) ? context.parentURL : void 0);
   if (url) {
     if (url.protocol !== `file:`)
       return defaultResolver(originalSpecifier, context, defaultResolver);
-    specifier = fileURLToPath(specifier);
+    specifier = fileURLToPath(url);
   }
   const {parentURL, conditions = []} = context;
   const issuer = parentURL ? fileURLToPath(parentURL) : process.cwd();
@@ -208,8 +223,15 @@ async function resolve$1(originalSpecifier, context, defaultResolver) {
   });
   if (!result)
     throw new Error(`Resolving '${specifier}' from '${issuer}' failed`);
+  const resultURL = pathToFileURL(result);
+  if (url) {
+    resultURL.search = url.search;
+    resultURL.hash = url.hash;
+  }
+  if (!parentURL)
+    setEntrypointPath(fileURLToPath(resultURL));
   return {
-    url: pathToFileURL(result).href
+    url: resultURL.href
   };
 }
 

.yarnrc.yml

@@ -1,3 +1,5 @@
+nodeLinker: pnp
+
 packageExtensions:
   echarts-for-react@*:
     dependencies:
@@ -65,21 +67,19 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
+pnpEnableEsmLoader: true
+
+pnpMode: strict
+
 supportedArchitectures:
+  cpu:
+    - current
+    - x86
+    - arm64
   os:
     - current
     - darwin
     - linux
     - win32
-  cpu:
-    - current
-    - x86
-    - arm64
 
-nodeLinker: "pnp"
-
-pnpEnableEsmLoader: true
-
-pnpMode: "strict"
-
-yarnPath: .yarn/releases/yarn-3.1.0.cjs
+yarnPath: .yarn/releases/yarn-3.2.1.cjs

package.json

@@ -74,5 +74,5 @@
     "prettier": "2.6.2",
     "turbo": "1.2.14"
   },
-  "packageManager": "yarn@3.1.0"
+  "packageManager": "yarn@3.2.1"
 }

yarn.lock

@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 5
+  version: 6
   cacheKey: 8
 
 "@ampproject/remapping@npm:^2.1.0":
@@ -2937,28 +2937,28 @@ __metadata:
 "@next/swc-linux-arm64-gnu@npm:12.1.6":
   version: 12.1.6
   resolution: "@next/swc-linux-arm64-gnu@npm:12.1.6"
-  conditions: os=linux & cpu=arm64
+  conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
 "@next/swc-linux-arm64-musl@npm:12.1.6":
   version: 12.1.6
   resolution: "@next/swc-linux-arm64-musl@npm:12.1.6"
-  conditions: os=linux & cpu=arm64
+  conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
 "@next/swc-linux-x64-gnu@npm:12.1.6":
   version: 12.1.6
   resolution: "@next/swc-linux-x64-gnu@npm:12.1.6"
-  conditions: os=linux & cpu=x64
+  conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
 "@next/swc-linux-x64-musl@npm:12.1.6":
   version: 12.1.6
   resolution: "@next/swc-linux-x64-musl@npm:12.1.6"
-  conditions: os=linux & cpu=x64
+  conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
@@ -3547,28 +3547,28 @@ __metadata:
 "@swc/core-linux-arm64-gnu@npm:1.2.194":
   version: 1.2.194
   resolution: "@swc/core-linux-arm64-gnu@npm:1.2.194"
-  conditions: os=linux & cpu=arm64
+  conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
 "@swc/core-linux-arm64-musl@npm:1.2.194":
   version: 1.2.194
   resolution: "@swc/core-linux-arm64-musl@npm:1.2.194"
-  conditions: os=linux & cpu=arm64
+  conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
 "@swc/core-linux-x64-gnu@npm:1.2.194":
   version: 1.2.194
   resolution: "@swc/core-linux-x64-gnu@npm:1.2.194"
-  conditions: os=linux & cpu=x64
+  conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
 "@swc/core-linux-x64-musl@npm:1.2.194":
   version: 1.2.194
   resolution: "@swc/core-linux-x64-musl@npm:1.2.194"
-  conditions: os=linux & cpu=x64
+  conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard