Fix the rebase

adobe · Oct 14, 2024 · 3678490 · 3678490
1 parent 21642d2
commit 3678490
Show file tree

Hide file tree

Showing 3 changed files with 283 additions and 444 deletions.
diff --git a/.yarn/patches/@parcel-core-npm-2.0.0-dev.1599-d62d699a7e.patch b/.yarn/patches/@parcel-core-npm-2.0.0-dev.1599-d62d699a7e.patch
@@ -47,10 +47,10 @@ index 2401047d24ff79aa61c8139937623fd5531acf0f..4c232b9a417e7a18e4e985507c4bb3ba
 
        // Resolve from project root if not in the config's dependencies.
        resolveFrom = _path().default.join(options.projectRoot, 'index');
-diff --git a/node_modules/@parcel/core/lib/requests/EntryRequest.js b/node_modules/@parcel/core/lib/requests/EntryRequest.js
+diff --git a/lib/requests/EntryRequest.js b/lib/requests/EntryRequest.js
 index 9254caf..069cd1c 100644
---- a/node_modules/@parcel/core/lib/requests/EntryRequest.js
-+++ b/node_modules/@parcel/core/lib/requests/EntryRequest.js
+--- a/lib/requests/EntryRequest.js
++++ b/lib/requests/EntryRequest.js
 @@ -195,8 +195,8 @@ class EntryResolver {
                        ...(0, _diagnostic().getJSONSourceLocation)(pkg.map.pointers[keyPath], 'value')
                      }
@@ -70,4 +70,4 @@ index 9254caf..069cd1c 100644
 +            i++;
            }
          }
- 
+
diff --git a/packages/dev/parcel-transformer-mdx-docs/package.json b/packages/dev/parcel-transformer-mdx-docs/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@mdx-js/mdx": "next",
     "@mdx-js/react": "patch:@mdx-js/react@npm%3A2.0.0-rc.2#~/.yarn/patches/@mdx-js-react-npm-2.0.0-rc.2-c2f79f46aa.patch",
-    "@parcel/core": "patch:@parcel/core@npm:2.0.0-dev.1599#~/.yarn/patches/@parcel-core-npm-2.0.0-dev.1599-d62d699a7e.patch",
+    "@parcel/core": "patch:@parcel/core@npm%3A2.0.0-dev.1599#~/.yarn/patches/@parcel-core-npm-2.0.0-dev.1599-d62d699a7e.patch",
     "@parcel/plugin": "2.0.0-dev.1601",
     "dprint-node": "^1.0.7",
     "js-yaml": "^3.13.1",