@atlaspack/core 2.12.1-canary.3452 → 2.12.1-canary.3453

package/lib/projectPath.js

@@ -27,14 +27,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * A path that's relative to the project root.
  */
 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 is outside the project root, store an absolute path rather
-  // than a relative one. This way if the project root is moved, the file
-  // references still work. Accessing files outside the project root is not
-  // portable anyway.
+  // 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.
+  if (p[0] !== '.' && !_path().default.isAbsolute(p)) {
+    return p;
+  }
+
+  // If the file is outside the project root, store an absolute path rather than a relative one.
+  // This way if the project root is moved, the file references still work. Accessing files outside
+  // the project root is not portable anyway.
   let relative = (0, _utils().relativePath)(projectRoot, p, false);
   if (relative.startsWith('..')) {
     return process.platform === 'win32' ? (0, _utils().normalizeSeparators)(p) : p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3452+2005ceb39",
+  "version": "2.12.1-canary.3453+2e948732f",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,20 +20,20 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/cache": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/diagnostic": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/events": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/feature-flags": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/fs": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/graph": "3.2.1-canary.3452+2005ceb39",
-    "@atlaspack/logger": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/package-manager": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/plugin": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/profiler": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/rust": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/types": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/utils": "2.12.1-canary.3452+2005ceb39",
-    "@atlaspack/workers": "2.12.1-canary.3452+2005ceb39",
+    "@atlaspack/cache": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/diagnostic": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/events": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/feature-flags": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/fs": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/graph": "3.2.1-canary.3453+2e948732f",
+    "@atlaspack/logger": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/package-manager": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/plugin": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/profiler": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/rust": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/types": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/utils": "2.12.1-canary.3453+2e948732f",
+    "@atlaspack/workers": "2.12.1-canary.3453+2e948732f",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -57,5 +57,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "2005ceb391fdbf7ed5eb20d1549d3b721ccb6d95"
+  "gitHead": "2e948732f6d21e3b940160b8f6b4d56f198fca1c"
 }

package/src/projectPath.js

@@ -9,14 +9,22 @@ import {relativePath, normalizeSeparators} from '@atlaspack/utils';
 export opaque type ProjectPath = string;
 
 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 is outside the project root, store an absolute path rather
-  // than a relative one. This way if the project root is moved, the file
-  // references still work. Accessing files outside the project root is not
-  // portable anyway.
+  // 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.
+  if (p[0] !== '.' && !path.isAbsolute(p)) {
+    return p;
+  }
+
+  // If the file is outside the project root, store an absolute path rather than a relative one.
+  // This way if the project root is moved, the file references still work. Accessing files outside
+  // the project root is not portable anyway.
   let relative = relativePath(projectRoot, p, false);
   if (relative.startsWith('..')) {
     return process.platform === 'win32' ? normalizeSeparators(p) : p;

package/test/requests/ConfigRequest.test.js

@@ -229,10 +229,7 @@ describe('ConfigRequest tests', () => {
       invalidateOnConfigKeyChange: [
         {
           configKey: 'key1',
-          filePath: toProjectPath(
-            projectRoot,
-            path.join('project_root', 'config.json'),
-          ),
+          filePath: toProjectPath(projectRoot, 'config.json'),
         },
       ],
     });