@atlaspack/core 2.13.2-canary.3697 → 2.13.2-canary.3699

package/lib/projectPath.js

@@ -22,17 +22,31 @@ function _utils() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * A path that's relative to the project root.
  */
+/**
+ * Converts a file path to a project-relative path.
+ *
+ * @param projectRoot - The project root.
+ * @param p - The file path to convert.
+ * @returns The project path.
+ */
 function toProjectPath_(projectRoot, p) {
   // If the file path is not provided, then treat it as though it is already from the project root
   if (p == null) {
     return p;
   }
 
-  // If the file path is already relative and it does not begin with . then treat the path as if it
+  // If the file path is already relative and it does not begin with '.', then treat the path as if it
   // is already from the project root. This prevents relative paths from being processed twice,
   // most often within `toInternalSourceLocation` when handling loc types from symbols and asset
   // dependencies.
@@ -45,6 +59,10 @@ function toProjectPath_(projectRoot, p) {
   // the project root is not portable anyway.
   let relative = (0, _utils().relativePath)(projectRoot, p, false);
   if (relative.startsWith('..')) {
+    // e.g given projectRoot = '/Users/monorepo/project' and p = '/Users/monorepo/other-project/src/index.js' --> relative = '../other-project/src/index.js'
+    if ((0, _featureFlags().getFeatureFlagValue)('patchProjectPaths')) {
+      return relative;
+    }
     return process.platform === 'win32' ? (0, _utils().normalizeSeparators)(p) : p;
   }
   return relative;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.13.2-canary.3697+e5fa92de2",
+  "version": "2.13.2-canary.3699+be63a515a",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/cache": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/diagnostic": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/events": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/feature-flags": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/fs": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/graph": "3.3.2-canary.3697+e5fa92de2",
-    "@atlaspack/logger": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/package-manager": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/plugin": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/profiler": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/rust": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/types": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/utils": "2.13.2-canary.3697+e5fa92de2",
-    "@atlaspack/workers": "2.13.2-canary.3697+e5fa92de2",
+    "@atlaspack/build-cache": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/cache": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/diagnostic": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/events": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/feature-flags": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/fs": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/graph": "3.3.2-canary.3699+be63a515a",
+    "@atlaspack/logger": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/package-manager": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/plugin": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/profiler": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/rust": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/types": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/utils": "2.13.2-canary.3699+be63a515a",
+    "@atlaspack/workers": "2.13.2-canary.3699+be63a515a",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -67,5 +67,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "e5fa92de26c87fb5d4d681af1931451749ba970a"
+  "gitHead": "be63a515ad13dd5ec1e241843d9ef6fdae8699d5"
 }

package/src/projectPath.js

@@ -2,19 +2,27 @@
 import type {FilePath} from '@atlaspack/types';
 import path from 'path';
 import {relativePath, normalizeSeparators} from '@atlaspack/utils';
+import {getFeatureFlagValue} from '@atlaspack/feature-flags';
 
 /**
  * A path that's relative to the project root.
  */
 export opaque type ProjectPath = string;
 
+/**
+ * Converts a file path to a project-relative path.
+ *
+ * @param projectRoot - The project root.
+ * @param p - The file path to convert.
+ * @returns The project path.
+ */
 function toProjectPath_(projectRoot: FilePath, p: FilePath): ProjectPath {
   // If the file path is not provided, then treat it as though it is already from the project root
   if (p == null) {
     return p;
   }
 
-  // If the file path is already relative and it does not begin with . then treat the path as if it
+  // If the file path is already relative and it does not begin with '.', then treat the path as if it
   // is already from the project root. This prevents relative paths from being processed twice,
   // most often within `toInternalSourceLocation` when handling loc types from symbols and asset
   // dependencies.
@@ -27,6 +35,11 @@ function toProjectPath_(projectRoot: FilePath, p: FilePath): ProjectPath {
   // the project root is not portable anyway.
   let relative = relativePath(projectRoot, p, false);
   if (relative.startsWith('..')) {
+    // e.g given projectRoot = '/Users/monorepo/project' and p = '/Users/monorepo/other-project/src/index.js' --> relative = '../other-project/src/index.js'
+    if (getFeatureFlagValue('patchProjectPaths')) {
+      return relative;
+    }
+
     return process.platform === 'win32' ? normalizeSeparators(p) : p;
   }