Angular: Use Nx function to read non-angularCli configs

[mandarini]

Issue: #12232

What I did

This is a fix for a behavior described here and here.

A new function is created in the @nrwl/workspace package, which will take care of reading/parsing the workspace configuration, and returning it to Storybook in the angularCli format, which it expects.

The new functionality will work after this Nx PR is successfully merged.

[shilman]

@ThibaudAV @Marklb can you guys do a quick sanity check. LGTM

@gaetanmaisse @merceyz should @nrwl/workspace be an optional peer dependency for yarn2 compat?

[shilman]

LGTM @mandarini and thanks so much for the contribution. i'm OK with it except for the comments above. will get a few more eyes on it and then merge/release if nobody objects. after you've tested the alpha, we can patch it back into 6.1.x!

[merceyz]

@gaetanmaisse @merceyz should @nrwl/workspace be an optional peer dependency for yarn2 compat?

Based on its usage, yes, though not just for Yarn PnP (Yarn 2 != pnp as Yarn 2 also supports node_modules) it must be declared so package managers can account for it when they do hoisting

[mandarini]

I just updated my PR, added @nrwl/workspace as an optional peer dependency!

[gaetanmaisse]

The failing unit test looks related to a caching/hoisting issue in the node_modules, I did an ssh connection to the CI container, yarn install, reran the tests and everything was ok. Maybe updating the yarn.lock will fix that.

[ThibaudAV]

I don't know if it's better (or if it's possible)🙈 . but an alternative without try/catch would be to let storybook choose if it should use nx or not 🤷‍♂️

Something like this:
const isNxWorkspace = fs.existsSync(path.join(dirToSearch, 'nx.json'))

[mandarini]

The thing is that it will need to access the readWorkspaceConfig() from @nrwl/workspace, so I apologized for using the eslint-disable to let me require it... :)

[Hasbiallah210012]

Done

[ThibaudAV]

okay,
my point is more about the try/catch. I find the way we handle the nominal case (without nx) in a Catch is not pretty. :/
and I propose this solution if it works and suits you of course :)

const isNxWorkspace = fs.existsSync(path.join(dirToSearch, 'nx.json'))
if(isNxWorkspace) {
 return require('@nrwl/workspace').readWorkspaceConfig({
      format: 'angularCli',
    });
}
... 

[gaetanmaisse]

@ThibaudAV are you ok to go with the current state?

[ThibaudAV]

Yes 🚀 , I have plans to improve this part. I will do it with a dedicated PR ;)

[Hasbiallah210012]

[mandarini]

Hi @gaetanmaisse ! Let me know if I need to make any further changes! I see that the tests are still failing :(

[gaetanmaisse]

We are currently working on fixing the tests (they are failing on next too), I will update your branch as soon as the fix will be merged 😉

[mandarini]

Thank you very much! :)