Skip to content

Commit 5991baf

Browse files
committed
Merge remote-tracking branch 'origin/dev' into feature/skypack-to-local
# Conflicts: # package-lock.json
2 parents 927adb7 + 936adad commit 5991baf

File tree

316 files changed

+820
-934
lines changed

Some content is hidden

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

316 files changed

+820
-934
lines changed

package-lock.json

Lines changed: 30 additions & 399 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@
3030
"storybook:analyze": "web-component-analyzer **/*.element.ts --outFile custom-elements.json",
3131
"test": "web-test-runner --coverage",
3232
"test:watch": "web-test-runner --watch",
33+
"test:coverage": "web-test-runner --node-resolve --coverage",
34+
"test:coverage-for": "node ./scripts/test-coverage-package.js",
3335
"dev": "npm run clean && npm run storybook",
3436
"build": "lerna run --scope @umbraco-ui/uui-css build && lerna run build",
3537
"build:prod": "npm run clean && npm run build && npm run test",
36-
"clean": "lerna run clean",
38+
"clean": "lerna run clean --parallel",
3739
"lerna:publish": "npm run build:prod && npm whoami && lerna publish from-package --yes && npm run lerna-fix",
3840
"lerna:version": "lerna version --no-push --exact --no-git-tag-version && rimraf package-lock.json && npm i",
3941
"lerna:diff": "lerna diff",
@@ -96,12 +98,10 @@
9698
"prettier": "2.4.0",
9799
"rimraf": "3.0.2",
98100
"rollup": "2.56.3",
99-
"rollup-plugin-dts": "4.0.0",
100101
"rollup-plugin-esbuild": "4.8.2",
101102
"rollup-plugin-import-css": "3.0.2",
102103
"rollup-plugin-minify-html-literals": "1.2.6",
103104
"rollup-plugin-postcss": "4.0.2",
104-
"rollup-plugin-typescript2": "0.30.0",
105105
"storybook-builder-vite": "0.1.13",
106106
"tsc-files": "1.1.2",
107107
"typescript": "4.5.2",

packages/rollup-package.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export const UUIProdConfig = ({
8383
entryPoints = [],
8484
cssFiles = [],
8585
bundle,
86-
namespace = '',
86+
namespace = 'uui',
8787
}) => {
8888
const cssFilesConfig = createCSSFilesConfig(cssFiles);
8989
const esModulesConfig = createEsModulesConfig(entryPoints);

packages/uui-action-bar/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ npm i @umbraco-ui/uui-action-bar
1515
Import the registration of `<uui-action-bar>` via:
1616

1717
```javascript
18-
import '@umbraco-ui/uui-action-bar/lib';
18+
import '@umbraco-ui/uui-action-bar';
1919
```
2020

2121
When looking to leverage the `UUIActionBarElement` base class as a type and/or for extension purposes, do so via:
2222

2323
```javascript
24-
import { UUIActionBarElement } from '@umbraco-ui/uui-action-bar/lib/uui-action-bar.element';
24+
import { UUIActionBarElement } from '@umbraco-ui/uui-action-bar';
2525
```
2626

2727
### CDN

packages/uui-action-bar/lib/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import { UUIActionBarElement } from './uui-action-bar.element';
22
import { defineElement } from '@umbraco-ui/uui-base/lib/registration';
33

4-
defineElement('uui-action-bar', UUIActionBarElement as any);
4+
defineElement('uui-action-bar', UUIActionBarElement);
5+
6+
export * from './uui-action-bar.element';

packages/uui-action-bar/lib/uui-action-bar.element.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1+
import { UUIButtonGroupElement } from '@umbraco-ui/uui-button-group/lib';
12
import { css } from 'lit';
2-
import { UUIButtonGroupElement } from '@umbraco-ui/uui-button-group/lib/uui-button-group.element';
33

44
/**
55
* @element uui-action-bar

packages/uui-action-bar/lib/uui-action-bar.story.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
import '@umbraco-ui/uui-action-bar/lib';
2+
import '@umbraco-ui/uui-button/lib';
3+
import '@umbraco-ui/uui-icon/lib';
4+
import '@umbraco-ui/uui-icon-registry-essential/lib';
5+
16
import { html } from 'lit-html';
2-
import '@umbraco-ui/uui-action-bar/lib/index';
3-
import '@umbraco-ui/uui-button/lib/index';
4-
import '@umbraco-ui/uui-icon/lib/index';
5-
import '@umbraco-ui/uui-icon-registry-essential/lib/index';
7+
68
import {
79
InterfaceLookNames,
810
InterfaceLookType,

packages/uui-action-bar/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"main": "./dist/uui-action-bar.min.js",
2323
"module": "./lib/index.js",
24+
"types": "./lib/index.d.ts",
2425
"customElements": "custom-elements.json",
2526
"files": [
2627
"dist",
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { UUIProdConfig } from '../rollup-package.config';
22

33
export default UUIProdConfig({
4-
entryPoints: ['index', 'uui-action-bar.element'],
4+
entryPoints: ['index'],
55
bundle: 'index',
66
});

packages/uui-avatar-group/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ npm i @umbraco-ui/uui-avatar-group
1313
Import the registration of `<uui-avatar-group>` via:
1414

1515
```javascript
16-
import '@umbraco-ui/uui-avatar-group/lib';
16+
import '@umbraco-ui/uui-avatar-group';
1717
```
1818

1919
When looking to leverage the `UUIAvatarGroupElement` base class as a type and/or for extension purposes, do so via:
2020

2121
```javascript
22-
import { UUIAvatarGroupElement } from '@umbraco-ui/uui-avatar-group/lib/uui-avatar-group.element';
22+
import { UUIAvatarGroupElement } from '@umbraco-ui/uui-avatar-group';
2323
```
2424

2525
### CDN

0 commit comments

Comments
 (0)