Skip to content

Commit 1770ae0

Browse files
authored
Merge branch 'v1/contrib' into v1/bug-fix/color-picker-opacity
2 parents a9c6ca9 + 23dab5e commit 1770ae0

File tree

14 files changed

+388
-414
lines changed

14 files changed

+388
-414
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/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)