Skip to content

Commit 8e9eac4

Browse files
authored
Merge branch 'v1/contrib' into v1/feature/no-outline-on-focus-locked-modals
2 parents d117b80 + d82b5e0 commit 8e9eac4

File tree

16 files changed

+653
-672
lines changed

16 files changed

+653
-672
lines changed

.github/workflows/azure-static-web-apps-delightful-beach-055ecb503.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@ on:
1717
- 'v*/dev'
1818
- 'v*/contrib'
1919
- 'release/*'
20-
- '!dependabot/**'
2120

2221
env:
2322
NODE_OPTIONS: --max_old_space_size=16384
2423

2524
jobs:
2625
build_and_deploy_job:
27-
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
26+
if: github.actor != 'dependabot[bot]' && (github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed'))
2827
runs-on: ubuntu-latest
2928
name: Build and Deploy Job
3029
steps:

.storybook/main.ts

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
import type { StorybookConfig } from '@storybook/web-components-vite';
2-
import { join, dirname } from 'path';
3-
4-
/**
5-
* This function is used to resolve the absolute path of a package.
6-
* It is needed in projects that use Yarn PnP or are set up within a monorepo.
7-
*/
8-
function getAbsolutePath(value: string): any {
9-
return dirname(require.resolve(join(value, 'package.json')));
10-
}
2+
import remarkGfm from 'remark-gfm';
113

124
const config: StorybookConfig = {
135
stories: [
@@ -19,18 +11,30 @@ const config: StorybookConfig = {
1911
staticDirs: ['./images'],
2012

2113
addons: [
22-
getAbsolutePath('@storybook/addon-links'),
23-
getAbsolutePath('@storybook/addon-essentials'),
24-
getAbsolutePath('@chromatic-com/storybook'),
25-
getAbsolutePath('@storybook/addon-a11y'),
14+
{
15+
name: '@storybook/addon-docs',
16+
options: {
17+
mdxPluginOptions: {
18+
mdxCompileOptions: {
19+
remarkPlugins: [remarkGfm],
20+
},
21+
},
22+
},
23+
},
24+
'@storybook/addon-links',
25+
'@storybook/addon-essentials',
26+
'@chromatic-com/storybook',
27+
'@storybook/addon-a11y',
2628
'../storyhelpers/storybook-readme',
2729
],
2830

2931
framework: {
30-
name: getAbsolutePath('@storybook/web-components-vite'),
32+
name: '@storybook/web-components-vite',
3133
options: {},
3234
},
3335

34-
docs: {},
36+
docs: {
37+
autodocs: true,
38+
},
3539
};
3640
export default config;

.storybook/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
setCustomElementsManifest,
33
type Preview,
44
} from '@storybook/web-components';
5-
import '../packages/uui-css/lib/uui-css.css';
5+
import '../packages/uui-css/dist/uui-css.css';
66
import customElements from '../custom-elements.json';
77
import { html } from 'lit';
88

eslint.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import globals from 'globals';
22
import pluginJs from '@eslint/js';
33
import tseslint from 'typescript-eslint';
44
import localRules from 'eslint-plugin-local-rules';
5-
import wcPlugin from 'eslint-plugin-wc';
6-
import litPlugin from 'eslint-plugin-lit';
5+
import * as wcPlugin from 'eslint-plugin-wc';
6+
import * as litPlugin from 'eslint-plugin-lit';
77
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
88

99
import { includeIgnoreFile } from '@eslint/compat';

0 commit comments

Comments
 (0)