Merge branch 'v2' into mszczepanski/use-parking_lot-locks

Author: marcins

crates/node-bindings/src/init_sentry/sentry.rs

@@ -18,6 +18,13 @@ static SENTRY_GUARD: Lazy<Arc<Mutex<Option<ClientInitGuard>>>> =
   Lazy::new(|| Arc::new(Mutex::new(None)));
 const TIMEOUT: Duration = Duration::from_secs(2);
 
+fn value_to_string(value: &serde_json::Value) -> String {
+  match value {
+    serde_json::Value::String(inner) => inner.clone(),
+    other => other.to_string(),
+  }
+}
+
 #[napi]
 fn init_sentry() -> Result<(), Status> {
   if std::env::var("PARCEL_ENABLE_SENTRY").is_err() {
@@ -51,6 +58,11 @@ fn init_sentry() -> Result<(), Status> {
     ..Default::default()
   };
 
+  let sentry_tags: HashMap<String, String> = sentry_tags
+    .iter()
+    .map(|(k, v)| (k.clone(), value_to_string(v)))
+    .collect::<HashMap<String, String>>();
+
   if let Some(release) = sentry_tags.get("release") {
     sentry_client_options.release = Some(release.to_string().into());
   }

packages/bundlers/default/src/DefaultBundler.js

@@ -476,9 +476,9 @@ function createIdealGraph(
           node.type === 'asset' &&
           (!Array.isArray(c.types) || c.types.includes(node.value.type))
         ) {
-          // +1 accounts for leading slash
-          let projectRelativePath = node.value.filePath.slice(
-            config.projectRoot.length + 1,
+          let projectRelativePath = path.relative(
+            config.projectRoot,
+            node.value.filePath,
           );
           if (!assetRegexes.some(regex => regex.test(projectRelativePath))) {
             return;

packages/core/core/src/requests/WriteBundlesRequest.js

@@ -67,7 +67,10 @@ async function run({input, api, farm, options}) {
     if (bundle.isPlaceholder) {
       let hash = bundle.id.slice(-8);
       hashRefToNameHash.set(bundle.hashReference, hash);
-      let name = nullthrows(bundle.name).replace(bundle.hashReference, hash);
+      let name = nullthrows(
+        bundle.name,
+        `Expected ${bundle.type} bundle to have a name`,
+      ).replace(bundle.hashReference, hash);
       res.set(bundle.id, {
         filePath: joinProjectPath(bundle.target.distDir, name),
         type: bundle.type, // FIXME: this is wrong if the packager changes the type...

packages/core/integration-tests/test/bundler.js

@@ -1769,6 +1769,64 @@ describe('bundler', function () {
         },
       ]);
     });
+
+    it('should support globs matching outside of the project root', async function () {
+      const rootDir = path.join(dir, 'root');
+      overlayFS.mkdirp(rootDir);
+      await fsFixture(overlayFS, rootDir)`
+      yarn.lock:
+        // Required for config loading
+
+      package.json:
+        {
+          "@parcel/bundler-default": {
+            "minBundleSize": 0,
+            "manualSharedBundles": [{
+              "name": "vendor",
+              "root": "vendor.js",
+              "assets": [
+                "in-project.js",
+                "../outside-project.js"
+              ]
+            }]
+          }
+        }
+
+      index.html:
+        <script type="module" src="./index.js"></script>
+
+      in-project.js:
+        export default 'in-project';
+
+      vendor.js:
+        export * from './in-project';
+        export * from '../outside-project';
+
+      index.js:
+        import * as vendor from './vendor';
+
+        console.log(vendor.inProj);
+        console.log(vendor.outProj);`;
+
+      await fsFixture(overlayFS, dir)`
+      outside-project.js:
+        export default 'outside-project';`;
+
+      let b = await bundle(path.join(rootDir, 'index.html'), {
+        defaultTargetOptions: {
+          shouldScopeHoist: false,
+          shouldOptimize: false,
+          sourceMaps: false,
+        },
+        inputFS: overlayFS,
+      });
+
+      assertBundles(b, [
+        {assets: ['index.html']},
+        {assets: ['in-project.js', 'outside-project.js']},
+        {assets: ['esmodule-helpers.js', 'index.js', 'vendor.js']},
+      ]);
+    });
   });
 
   it('should reuse type change bundles from parent bundle groups', async function () {