feat(core): expand support for projectRoot token to include project.json #18302
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
AgentEnder
commented
Jul 25, 2023
packages/nx/src/config/workspaces.ts
Outdated
Comment on lines
614
to
434
| const workspaceRootMatch = /^(\{workspaceRoot\}\/?)/.exec(value); | ||
| if (workspaceRootMatch?.length) { | ||
| value = value.replace(workspaceRootMatch[0], ''); | ||
| } else if (value.includes('{workspaceRoot}')) { |
There was a problem hiding this comment.
The handling for this changed a bit as I noticed a potential bug when doing it. If an option represented a path to a directory, {workspaceRoot} may be a valid value for that, and this would throw as before we required it to have a / after it.
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
e4410ca to
67a5d78
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
67a5d78 to
8a9cdcc
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
8a9cdcc to
588a7cc
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
588a7cc to
32937fc
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
32937fc to
f5ffb28
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
f5ffb28 to
f035cb2
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
f035cb2 to
62407ab
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
62407ab to
ca37e30
Compare
FrozenPandaz
requested changes
Aug 1, 2023
packages/nx/src/config/workspaces.ts
Outdated
Comment on lines
406
to
425
| const result: T = { ...defaults }; | ||
| for (const key in options) { | ||
| // Deep merge options objects, but not arrays. | ||
| if ( | ||
| typeof options[key] === 'object' && | ||
| typeof defaults?.[key] === 'object' && | ||
| !Array.isArray(options[key]) && | ||
| !Array.isArray(defaults?.[key]) | ||
| ) { | ||
| result[key] = mergeOptions(defaults[key], options[key]); | ||
| } else { | ||
| // The types are either: | ||
| // - primitive (string, number, boolean, etc.) | ||
| // - arrays | ||
| // - different types (e.g. string vs array) | ||
| // In any case, we want to override the default with the options. | ||
| result[key] = options[key]; | ||
| } | ||
| } | ||
| return result; |
There was a problem hiding this comment.
We should not have deep-merging in this PR. It should be separate
packages/nx/src/config/workspaces.ts
Outdated
| const workspaceRootMatch = /^(\{workspaceRoot\}\/?)/.exec(value); | ||
| if (workspaceRootMatch?.length) { | ||
| value = value.replace(workspaceRootMatch[0], ''); | ||
| } else if (value.includes('{workspaceRoot}')) { |
There was a problem hiding this comment.
This needs to remain 2 if blocks
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
ca37e30 to
9feb37b
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
9feb37b to
f5e5b46
Compare
AgentEnder
force-pushed
the
feat/allow-tokens-in-project-json
branch
from
f5e5b46 to
c5bfeaa
Compare
FrozenPandaz
approved these changes
Aug 3, 2023
|
nice! thank you for your work on this. i was running into this exact challenge earlier in the day with |
|
This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Current Behavior
{projectRoot},{projectName}, and{workspaceRoot}only work inside options or configurations blocks as part oftargetDefaultsinnx.json, but works ininputs/outputsinproject.jsonalready.Expected Behavior
{projectRoot},{projectName}, and{workspaceRoot}only work insideinputs,outputs,options, andconfigurationseverywhere.Related Issue(s)
Fixes #13272