Fixed storybook with migration to WP5

This commit is contained in:
Vito Albano
2023-11-17 02:18:25 +00:00
parent 80f894eecd
commit dede5b4759
10 changed files with 65 additions and 40 deletions

View File

@@ -1,5 +1,6 @@
module.exports = { module.exports = {
root: true, root: true,
ignorePatterns: [ ignorePatterns: [
'projects/**/*', 'projects/**/*',
'**/node_modules/**/*', '**/node_modules/**/*',
@@ -10,7 +11,9 @@ module.exports = {
'**/scripts', '**/scripts',
'**/docs' '**/docs'
], ],
plugins: ['@nrwl/nx'], plugins: ['@nrwl/nx'],
overrides: [ overrides: [
{ {
files: ['*.ts'], files: ['*.ts'],
@@ -184,5 +187,7 @@ module.exports = {
extends: ['plugin:@angular-eslint/template/recommended'], extends: ['plugin:@angular-eslint/template/recommended'],
rules: {} rules: {}
} }
] ],
extends: ['plugin:storybook/recommended']
}; };

View File

@@ -1,5 +1,12 @@
module.exports = { module.exports = {
framework: '@storybook/angular', framework: {
name: '@storybook/angular',
options: {}
},
staticDirs: [{ from: '../../../demo-shell/src/app.config.json', to: 'app.config.json' }], staticDirs: [{ from: '../../../demo-shell/src/app.config.json', to: 'app.config.json' }],
core: { builder: 'webpack5' } docs: {
autodocs: true
},
stories: [],
addons:[],
}; };

View File

@@ -2,8 +2,7 @@
overflow: auto; overflow: auto;
} }
/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ .app-cloud-layout-tab-body .mat-mdc-tab-body-content {
.app-cloud-layout-tab-body .mat-tab-body-wrapper {
height: 100%; height: 100%;
} }

View File

@@ -1,16 +1,6 @@
@use '@angular/material' as mat; @use '@angular/material' as mat;
@import '../../lib/core/src/lib/styles/index'; @import '../../lib/core/src/lib/styles/index';
@import '../../lib/core/src/lib/styles/typography'; @import '../../lib/core/src/lib/styles/typography';
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds:
// 1. Default typography styles for all components
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
// If you specify typography styles for the components you use elsewhere, you should delete this line.
// If you don't need the default component typographies but still want the hierarchy styles,
// you can delete this line and instead use:
// `@include mat.legacy-typography-hierarchy(mat.define-typography-config());`
@include mat.all-component-typographies; @include mat.all-component-typographies;
@include mat.core; @include mat.core;

View File

@@ -1,15 +1,5 @@
@use '@angular/material' as mat; @use '@angular/material' as mat;
@import '~@alfresco/adf-core/theming'; @import '~@alfresco/adf-core/theming';
// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
// The following line adds:
// 1. Default typography styles for all components
// 2. Styles for typography hierarchy classes (e.g. .mat-headline-1)
// If you specify typography styles for the components you use elsewhere, you should delete this line.
// If you don't need the default component typographies but still want the hierarchy styles,
// you can delete this line and instead use:
// `@include mat.legacy-typography-hierarchy($alfresco-typography);`
@include mat.all-component-typographies($alfresco-typography); @include mat.all-component-typographies($alfresco-typography);
@include mat.core; @include mat.core;

View File

@@ -1,9 +1,27 @@
const rootMain = require('../../../.storybook/main'); var rootPath = require('../../../.storybook/main');
module.exports = { module.exports = {
...rootMain, rootMain: rootPath,
core: { ...rootMain.core, builder: 'webpack5' }, stories: [...rootPath.stories, '../**/*.stories.@(js|jsx|ts|tsx)'],
stories: [...rootMain.stories, '../**/*.stories.@(js|jsx|ts|tsx)'],
staticDirs: [...rootMain.staticDirs, { from: __dirname + '/../src/lib/i18n', to: 'assets/adf-content-services/i18n' }], staticDirs: [
addons: ['@storybook/addon-essentials', ...rootMain.addons] ...rootPath.staticDirs,
{ from: __dirname + '/../src/lib/i18n', to: 'assets/adf-core/i18n' },
{ from: __dirname + '/../src/lib/assets/images', to: 'assets/images' }
],
addons: ['@storybook/addon-essentials', ...rootPath.addons],
framework: {
name: '@storybook/angular',
options: {}
},
docs: {
autodocs: true
},
core: {
builder: '@storybook/builder-webpack5'
}
}; };

View File

@@ -40,7 +40,7 @@
padding-bottom: 10px; padding-bottom: 10px;
.mat-mdc-list-base .mat-mdc-list-item, .mat-mdc-list-base .mat-mdc-list-item,
.mat-list-base .mat-list-option { .mat-mdc-list-base .mat-mdc-list-option {
display: flex; display: flex;
height: 100%; height: 100%;
overflow-wrap: anywhere; overflow-wrap: anywhere;

View File

@@ -12,7 +12,7 @@ adf-search-facet-chip-tabbed {
adf-search-filter-tabbed { adf-search-filter-tabbed {
/* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */ /* TODO(mdc-migration): The following rule targets internal classes of tabs that may no longer apply for the MDC version. */
.mat-tab-body-wrapper { .mat-mdc-tab-body-content {
margin-top: 16px; margin-top: 16px;
} }
} }

View File

@@ -1,13 +1,27 @@
const rootMain = require('../../../.storybook/main'); var rootPath = require('../../../.storybook/main');
module.exports = { module.exports = {
...rootMain, rootMain: rootPath,
core: { ...rootMain.core, builder: 'webpack5' }, stories: [...rootPath.stories, '../src/lib/**/*.stories.@(js|jsx|ts|tsx)'],
stories: [...rootMain.stories, '../src/lib/**/*.stories.@(js|jsx|ts|tsx)'],
staticDirs: [ staticDirs: [
...rootMain.staticDirs, ...rootPath.staticDirs,
{ from: '../../core/src/lib/i18n', to: 'assets/adf-core/i18n' }, { from: '../../core/src/lib/i18n', to: 'assets/adf-core/i18n' },
{ from: __dirname + '/../src/lib/i18n', to: 'assets/adf-process-services-cloud/i18n' } { from: __dirname + '/../src/lib/i18n', to: 'assets/adf-process-services-cloud/i18n' }
], ],
addons: ['@storybook/addon-essentials', ...rootMain.addons]
addons: ['@storybook/addon-essentials', ...rootPath.addons],
framework: {
name: '@storybook/angular',
options: {}
},
docs: {
autodocs: true
},
core: {
builder: '@storybook/builder-webpack5'
}
}; };

View File

@@ -129,7 +129,7 @@
"@schematics/angular": "15.2.10", "@schematics/angular": "15.2.10",
"@storybook/addon-essentials": "6.5.16", "@storybook/addon-essentials": "6.5.16",
"@storybook/angular": "6.5.16", "@storybook/angular": "6.5.16",
"@storybook/builder-webpack5": "6.5.16", "@storybook/builder-webpack5": "^6.5.16",
"@storybook/core-server": "6.5.16", "@storybook/core-server": "6.5.16",
"@storybook/manager-webpack5": "6.5.16", "@storybook/manager-webpack5": "6.5.16",
"@types/ejs": "^3.1.5", "@types/ejs": "^3.1.5",
@@ -196,6 +196,8 @@
"protractor-retry-angular-cli": "^2.0.3", "protractor-retry-angular-cli": "^2.0.3",
"protractor-screenshoter-plugin": "0.10.3", "protractor-screenshoter-plugin": "0.10.3",
"protractor-smartrunner": "^2.0.0-beta6", "protractor-smartrunner": "^2.0.0-beta6",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rimraf": "^5.0.5", "rimraf": "^5.0.5",
"sass-loader": "13.3.2", "sass-loader": "13.3.2",
"selenium-webdriver": "4.1.0", "selenium-webdriver": "4.1.0",