fix: set rootDir token to workspace root

researchgate · Nov 13, 2019 · 1806570 · 1806570
1 parent ff54966
commit 1806570
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/packages/spire/lib/create-resolver.js b/packages/spire/lib/create-resolver.js
@@ -9,7 +9,13 @@ function createResolver(context, core) {
       typeof entryPathOrFn === 'string'
         ? requireFrom(
             context.cwd,
-            entryPathOrFn.replace(/<rootDir>/g, context.cwd)
+            entryPathOrFn.replace(
+              /<rootDir>/g,
+              // `INIT_CWD` is set by both npm and yarn, which represent an actual path
+              // where the command was executed from. We'll use it if set to properly
+              // resolve workspace root.
+              context.env.INIT_CWD || context.cwd
+            )
           )
         : entryPathOrFn;
     validatePlugin(createEntry);

diff --git a/packages/spire/tests/config.spec.js b/packages/spire/tests/config.spec.js
@@ -38,7 +38,7 @@ describe('spire', () => {
       'package.json': JSON.stringify({
         name: 'spire-test-config',
         spire: {
-          extends: '<rootDir>/spire-config-baz.js',
+          extends: './spire-config-baz.js',
         },
       }),
     });

diff --git a/packages/spire/tests/hooks.spec.js b/packages/spire/tests/hooks.spec.js
@@ -34,7 +34,7 @@ describe('spire', () => {
       'package.json': JSON.stringify({
         name: 'spire-test-hooks',
         spire: {
-          extends: '<rootDir>/spire-config.js',
+          extends: './spire-config.js',
         },
       }),
     });