Skip to content

Commit a283691

Browse files
committed
Merge branch 'dev' into v0/feature-uui-pagination
2 parents 360156e + e39988e commit a283691

File tree

224 files changed

+20109
-8763
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

224 files changed

+20109
-8763
lines changed

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
module.exports = {
2+
ignorePatterns: ['vite.*.js'],
23
root: true,
34
parser: '@typescript-eslint/parser',
45
plugins: ['@typescript-eslint', 'html', 'import'],

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ tsconfig.tsbuildinfo
2727

2828

2929
custom-elements.json
30+
/packages/uui-css/custom-properties.js
31+
/packages/uui-css/custom-properties.module.js
3032
storybook-static
3133
debug.log
3234
out-css
3335
*.log
3436
.eslintcache
35-
custom-properties.js

.storybook/main.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
const tsconfigPaths = require('vite-tsconfig-paths').default;
2+
const processLitCSSPlugin =
3+
require('../scripts/vite.processLitCSSPlugin').default;
24

35
module.exports = {
46
stories: ['../packages/**/*.story.ts'],
@@ -11,6 +13,8 @@ module.exports = {
1113
async viteFinal(config, { configType }) {
1214
// customize the Vite config here
1315

16+
config.plugins.push(processLitCSSPlugin());
17+
1418
if (configType === 'DEVELOPMENT') {
1519
// add plugins
1620
config.plugins.push(tsconfigPaths());
@@ -22,6 +26,8 @@ module.exports = {
2226
config.optimizeDeps.include.push('lit');
2327
config.optimizeDeps.include.push('lit/decorators.js');
2428
config.optimizeDeps.include.push('lit/directives/style-map.js');
29+
config.optimizeDeps.include.push('lit/directives/if-defined.js');
30+
config.optimizeDeps.include.push('lit/directives/unsafe-html.js');
2531
}
2632

2733
return config;

.storybook/preview-head.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
repeat top left;
1818
}
1919
</style>
20+
2021
<script>
2122
(function () {
2223
window.addEventListener('load', () => {

.storybook/preview.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { setCustomElements } from '@storybook/web-components';
22
import customElements from '../custom-elements.json';
3-
import '../src/styles/index.css';
3+
import '../packages/uui-css/lib/root.css';
44
import 'https://cdn.skypack.dev/element-internals-polyfill';
55

66
const sort = (a, b) => {

0 commit comments

Comments
 (0)