miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(storybook): support secondary entry points for angular #11446 (#11798)

Browse Source
This commit is contained in:
Colum Ferry 2022-09-01 10:23:17 +01:00 committed by GitHub
parent 6c3ef9d417
commit a2647549d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 73 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/angular/src/generators/storybook-configuration/__snapshots__/storybook-configuration.spec.ts.snap
View File

@ -12,9 +12,8 @@ module.exports = {
stories: [ stories: [
...rootMain.stories, ...rootMain.stories,
'../src/lib/**/*.stories.mdx', '../**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)' '../**/*.stories.@(js|jsx|ts|tsx)' ],
],
addons: [...rootMain.addons addons: [...rootMain.addons

10
packages/storybook/src/generators/configuration/__snapshots__/configuration.spec.ts.snap
View File

@ -12,9 +12,8 @@ module.exports = {
stories: [ stories: [
...rootMain.stories, ...rootMain.stories,
'../src/lib/**/*.stories.mdx', '../**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)' '../**/*.stories.@(js|jsx|ts|tsx)' ],
],
addons: [...rootMain.addons addons: [...rootMain.addons
@ -78,9 +77,8 @@ module.exports = {
stories: [ stories: [
...rootMain.stories, ...rootMain.stories,
'../src/lib/**/*.stories.mdx', '../**/*.stories.mdx',
'../src/lib/**/*.stories.@(js|jsx|ts|tsx)' '../**/*.stories.@(js|jsx|ts|tsx)' ],
],
addons: [...rootMain.addons addons: [...rootMain.addons

6
packages/storybook/src/generators/configuration/project-files-ts/.storybook/main.ts__tmpl__
View File

@ -9,10 +9,12 @@ const config: StorybookConfig = {
<% } %> <% } %>
stories: [ stories: [
...rootMain.stories, ...rootMain.stories,<% if(uiFramework === '@storybook/angular' && projectType === 'library') { %>
'../**/*.stories.mdx',
'../**/*.stories.@(js|jsx|ts|tsx)' <% } else { %>
'../<%= projectDirectory %>/**/*.stories.mdx', '../<%= projectDirectory %>/**/*.stories.mdx',
'../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx)' '../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx)'
], <% } %>],
addons: [...(rootMain.addons || []) <% if(uiFramework === '@storybook/react') { %>, '@nrwl/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions', '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes' <% } %> addons: [...(rootMain.addons || []) <% if(uiFramework === '@storybook/react') { %>, '@nrwl/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions', '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes' <% } %>
<% if(usesSwc && !isNextJs) { %>, 'storybook-addon-swc' <% } %> <% if(usesSwc && !isNextJs) { %>, 'storybook-addon-swc' <% } %>
<% if(isNextJs) { %>, 'storybook-addon-swc', <% if(isNextJs) { %>, 'storybook-addon-swc',

11
packages/storybook/src/generators/configuration/project-files-ts/.storybook/tsconfig.json__tmpl__
View File

@ -11,12 +11,19 @@
],<% } %> ],<% } %>
<% if(uiFramework === '@storybook/angular' && projectType === 'application') { %>"files": ["../src/polyfills.ts"],<% } %> <% if(uiFramework === '@storybook/angular' && projectType === 'application') { %>"files": ["../src/polyfills.ts"],<% } %>
"exclude": ["../**/*.spec.ts" <% if(uiFramework === '@storybook/react') { %>, "../**/*.spec.js", "../**/*.spec.tsx", "../**/*.spec.jsx"<% } %>], "exclude": ["../**/*.spec.ts" <% if(uiFramework === '@storybook/react') { %>, "../**/*.spec.js", "../**/*.spec.tsx", "../**/*.spec.jsx"<% } %>],
"include": [ "include": [<% if(uiFramework === '@storybook/angular' && projectType === 'library') { %>
"../**/*.stories.ts",
"../**/*.stories.js",
"../**/*.stories.jsx",
"../**/*.stories.tsx",
"../**/*.stories.mdx",
"*.ts",
"*.js"<% } else { %>
"../<%= mainDir %>/**/*.stories.ts", "../<%= mainDir %>/**/*.stories.ts",
"../<%= mainDir %>/**/*.stories.js", "../<%= mainDir %>/**/*.stories.js",
"../<%= mainDir %>/**/*.stories.jsx", "../<%= mainDir %>/**/*.stories.jsx",
"../<%= mainDir %>/**/*.stories.tsx", "../<%= mainDir %>/**/*.stories.tsx",
"../<%= mainDir %>/**/*.stories.mdx", "../<%= mainDir %>/**/*.stories.mdx",
"*.ts", "*.ts",
"*.js"<% if(uiFramework === '@storybook/react-native') { %>, "*.tsx"<% } %>] "*.js"<% if(uiFramework === '@storybook/react-native') { %>, *.tsx"<% } %><% } %>]
} }

6
packages/storybook/src/generators/configuration/project-files/.storybook/main.js__tmpl__
View File

@ -8,10 +8,12 @@ module.exports = {
core: { ...rootMain.core, builder: 'webpack5' }, core: { ...rootMain.core, builder: 'webpack5' },
<% } %> <% } %>
stories: [ stories: [
...rootMain.stories, ...rootMain.stories,<% if(uiFramework === '@storybook/angular' && projectType === 'library') { %>
'../**/*.stories.mdx',
'../**/*.stories.@(js|jsx|ts|tsx)' <% } else { %>
'../<%= projectDirectory %>/**/*.stories.mdx', '../<%= projectDirectory %>/**/*.stories.mdx',
'../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx)' '../<%= projectDirectory %>/**/*.stories.@(js|jsx|ts|tsx)'
], <% } %>],
addons: [...rootMain.addons <% if(uiFramework === '@storybook/react') { %>, '@nrwl/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions', '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes' <% } %> addons: [...rootMain.addons <% if(uiFramework === '@storybook/react') { %>, '@nrwl/react/plugins/storybook' <% } %><% if(uiFramework === '@storybook/react-native') { %>, '@storybook/addon-ondevice-actions', '@storybook/addon-ondevice-backgrounds', '@storybook/addon-ondevice-controls', '@storybook/addon-ondevice-notes' <% } %>
<% if(usesSwc && !isNextJs) { %>, 'storybook-addon-swc' <% } %> <% if(usesSwc && !isNextJs) { %>, 'storybook-addon-swc' <% } %>
<% if(isNextJs) { %>, 'storybook-addon-swc', <% if(isNextJs) { %>, 'storybook-addon-swc',

10
packages/storybook/src/generators/configuration/project-files/.storybook/tsconfig.json__tmpl__
View File

@ -11,11 +11,17 @@
],<% } %> ],<% } %>
<% if(uiFramework === '@storybook/angular' && projectType === 'application') { %>"files": ["../src/polyfills.ts"],<% } %> <% if(uiFramework === '@storybook/angular' && projectType === 'application') { %>"files": ["../src/polyfills.ts"],<% } %>
"exclude": ["../**/*.spec.ts" <% if(uiFramework === '@storybook/react') { %>, "../**/*.spec.js", "../**/*.spec.tsx", "../**/*.spec.jsx"<% } %>], "exclude": ["../**/*.spec.ts" <% if(uiFramework === '@storybook/react') { %>, "../**/*.spec.js", "../**/*.spec.tsx", "../**/*.spec.jsx"<% } %>],
"include": [ "include": [<% if(uiFramework === '@storybook/angular' && projectType === 'library') { %>
"../**/*.stories.ts",
"../**/*.stories.js",
"../**/*.stories.jsx",
"../**/*.stories.tsx",
"../**/*.stories.mdx",
"*.js"<% } else { %>
"../<%= mainDir %>/**/*.stories.ts", "../<%= mainDir %>/**/*.stories.ts",
"../<%= mainDir %>/**/*.stories.js", "../<%= mainDir %>/**/*.stories.js",
"../<%= mainDir %>/**/*.stories.jsx", "../<%= mainDir %>/**/*.stories.jsx",
"../<%= mainDir %>/**/*.stories.tsx", "../<%= mainDir %>/**/*.stories.tsx",
"../<%= mainDir %>/**/*.stories.mdx", "../<%= mainDir %>/**/*.stories.mdx",
"*.js"<% if(uiFramework === '@storybook/react-native') { %>, "*.ts", "*.tsx"<% } %>] "*.js"<% if(uiFramework === '@storybook/react-native') { %>, "*.ts", "*.tsx"<% } %><% } %>]
} }