Merge branch 'main' into release

telekom · Jun 27, 2023 · f9a1dee · f9a1dee
2 parents 8a5e795 + 6a40c71
commit f9a1dee
Show file tree

Hide file tree

Showing 27 changed files with 285 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+
+### Bug Fixes
+
+* add missing fonts ([#2041](https://github.com/telekom/scale/issues/2041)) ([0d091c7](https://github.com/telekom/scale/commit/0d091c7e9fa40c628107948db9e98b57052edc41))
+* add umd out for react wrapper ([#2018](https://github.com/telekom/scale/issues/2018)) ([1286756](https://github.com/telekom/scale/commit/12867561fb87e351c557bac017b32ae9aacc04e8)), closes [#2039](https://github.com/telekom/scale/issues/2039) [#2005](https://github.com/telekom/scale/issues/2005) [#2006](https://github.com/telekom/scale/issues/2006) [#2012](https://github.com/telekom/scale/issues/2012)
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 

diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,7 @@
     "--pure-lockfile"
   ],
   "useWorkspaces": true,
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "command": {
     "version": {
       "allowBranch": "main"

diff --git a/packages/components-angular/CHANGELOG.md b/packages/components-angular/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+**Note:** Version bump only for package @telekom/scale-components-angular
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 **Note:** Version bump only for package @telekom/scale-components-angular

diff --git a/packages/components-angular/package.json b/packages/components-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-components-angular",
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "description": "Angular specific wrapper for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",

diff --git a/packages/components-react/.gitignore b/packages/components-react/.gitignore
@@ -1,3 +1,3 @@
 node_modules/
 coverage/
-src/components.ts
+src/components.ts
diff --git a/packages/components-react/CHANGELOG.md b/packages/components-react/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+
+### Bug Fixes
+
+* add umd out for react wrapper ([#2018](https://github.com/telekom/scale/issues/2018)) ([1286756](https://github.com/telekom/scale/commit/12867561fb87e351c557bac017b32ae9aacc04e8)), closes [#2039](https://github.com/telekom/scale/issues/2039) [#2005](https://github.com/telekom/scale/issues/2005) [#2006](https://github.com/telekom/scale/issues/2006) [#2012](https://github.com/telekom/scale/issues/2012)
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 **Note:** Version bump only for package @telekom/scale-components-react

diff --git a/packages/components-react/package.json b/packages/components-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telekom/scale-components-react",
   "sideEffects": false,
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "description": "React proxy for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",
@@ -13,11 +13,10 @@
     "access": "public"
   },
   "scripts": {
-    "build": "yarn clean && yarn compile",
+    "build": "yarn clean && yarn rollup",
     "clean": "rimraf dist",
-    "compile": "yarn tsc",
-    "tsc": "tsc -p .",
-    "format": "prettier --write \"package.json\""
+    "format": "prettier --write \"package.json\"",
+    "rollup": "rollup -c"
   },
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -26,8 +25,13 @@
     "dist/"
   ],
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "^15.1.0",
+    "@rollup/plugin-typescript": "^11.1.1",
     "rimraf": "^3.0.2",
-    "typescript": "^3.3.4000"
+    "rollup": "2.79.1",
+    "rollup-plugin-commonjs": "^10.1.0",
+    "rollup-plugin-peer-deps-external": "^2.2.4",
+    "typescript": "^5.1.3"
   },
   "dependencies": {
     "@types/react-dom": "^16.9.6",

diff --git a/packages/components-react/rollup.config.js b/packages/components-react/rollup.config.js
@@ -0,0 +1,43 @@
+import externalDeps from 'rollup-plugin-peer-deps-external';
+import typescript from '@rollup/plugin-typescript';
+import resolve from '@rollup/plugin-node-resolve';
+import commonJS from 'rollup-plugin-commonjs';
+
+const globals = {
+    react: 'React',
+    'react-dom': 'ReactDOM',
+    'react-query': 'ReactQuery',
+};
+
+const plugins = [
+    externalDeps(), // Prevents packages listed in peerDependencies from being bundled with our component library.
+    commonJS(), // Convert common js modules to es6.
+    resolve(), // Locate and bundle third-party dependencies in node_modules.
+    typescript() // Transpiles our TypeScript code into JavaScript.
+];
+
+export default {
+    input: `./src/index.ts`,
+    output: [
+        {
+            name: 'index',
+            file: `dist/index.js`,
+            format: 'cjs',
+            sourcemap: true,
+        },
+        {
+            name: 'index',
+            file: `dist/index.es.js`,
+            format: 'esm',
+            sourcemap: true,
+        },
+        {
+            name: 'index',
+            file: `dist/index.umd.js`,
+            format: 'umd',
+            sourcemap: true,
+            globals,
+        },
+    ],
+    plugins
+};
diff --git a/packages/components-react/tsconfig.json b/packages/components-react/tsconfig.json
@@ -2,18 +2,19 @@
   "compilerOptions": {
     "allowUnreachableCode": false,
     "allowSyntheticDefaultImports": true,
+    "rootDir": "src",
     "declaration": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "esModuleInterop": true,
     "lib": ["dom", "es2015"],
-    "module": "CommonJS",
+    "module": "esnext",
     "moduleResolution": "node",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
-    "outDir": "dist",
+    "outDir": ".",
     "removeComments": false,
     "sourceMap": true,
     "jsx": "react",

diff --git a/packages/components-vue/CHANGELOG.md b/packages/components-vue/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+**Note:** Version bump only for package @telekom/scale-components-vue
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 **Note:** Version bump only for package @telekom/scale-components-vue

diff --git a/packages/components-vue/package.json b/packages/components-vue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telekom/scale-components-vue",
   "sideEffects": false,
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "description": "Vue specific wrapper for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+
+### Bug Fixes
+
+* add missing fonts ([#2041](https://github.com/telekom/scale/issues/2041)) ([0d091c7](https://github.com/telekom/scale/commit/0d091c7e9fa40c628107948db9e98b57052edc41))
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-components",
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "description": "Scale is the digital design system for Telekom products and experiences.",
   "homepage": "https://github.com/telekom/scale",
   "repository": {
@@ -72,7 +72,7 @@
     "@floating-ui/dom": "^0.5.4",
     "@stencil/core": "^2.17.0",
     "@telekom/design-tokens": "^1.0.0-beta.7",
-    "@telekom/scale-design-tokens": "^3.0.0-beta.135",
+    "@telekom/scale-design-tokens": "^3.0.0-beta.136",
     "classnames": "^2.2.6",
     "stencil-inline-svg": "^1.0.1"
   }

diff --git a/packages/components/src/components/dropdown-select/dropdown-select.tsx b/packages/components/src/components/dropdown-select/dropdown-select.tsx
@@ -399,6 +399,14 @@ export class DropdownSelect {
       readOptions(this.hostElement).find(({ value }) => value === this.value) ||
       ({} as any)
     ).ItemElement;
+    const hasEmptyValueElement =
+      (
+        readOptions(this.hostElement).find(
+          ({ value }) => value === this.value
+        ) || ({} as any)
+      ).value === ''
+        ? true
+        : false;
     const helperTextId = `helper-message-${generateUniqueId()}`;
     const ariaDescribedByAttr = { 'aria-describedBy': helperTextId };
 
@@ -434,7 +442,9 @@ export class DropdownSelect {
               {...(this.helperText ? ariaDescribedByAttr : {})}
               {...(this.invalid ? { 'aria-invalid': 'true' } : {})}
             >
-              <span part="combobox-value">{ValueElement}</span>
+              <span part="combobox-value">
+                {hasEmptyValueElement ? '' : ValueElement}
+              </span>
             </div>
             <div part="listbox-pad" ref={(el) => (this.listboxPadEl = el)}>
               <div part="listbox-scroll-container">

diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.eot b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.eot
diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.woff b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.woff
diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.woff2 b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-Ultra.woff2
diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.eot b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.eot
diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.woff b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.woff
diff --git a/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.woff2 b/packages/components/src/telekom/fonts/TeleNeoWeb/TeleNeoWeb-UltraItalic.woff2
diff --git a/packages/design-tokens/CHANGELOG.md b/packages/design-tokens/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+**Note:** Version bump only for package @telekom/scale-design-tokens
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 **Note:** Version bump only for package @telekom/scale-design-tokens

diff --git a/packages/design-tokens/package.json b/packages/design-tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-design-tokens",
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "type": "module",
   "description": "Design Tokens for the Scale Design System",
   "homepage": "https://github.com/telekom/scale",

diff --git a/packages/storybook-vue/CHANGELOG.md b/packages/storybook-vue/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+**Note:** Version bump only for package @telekom/scale-storybook-vue
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 

diff --git a/packages/storybook-vue/package.json b/packages/storybook-vue/package.json
@@ -2,7 +2,7 @@
   "homepage": "https://telekom.github.io/scale",
   "name": "@telekom/scale-storybook-vue",
   "private": true,
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "main": "index.js",
   "license": "MPL-2.0",
   "devDependencies": {
@@ -32,8 +32,8 @@
   "dependencies": {
     "@storybook/addon-viewport": "^6.4.22",
     "@telekom/design-tokens": "^1.0.0-beta.2",
-    "@telekom/scale-components": "^3.0.0-beta.135",
-    "@telekom/scale-components-vue": "^3.0.0-beta.135"
+    "@telekom/scale-components": "^3.0.0-beta.136",
+    "@telekom/scale-components-vue": "^3.0.0-beta.136"
   },
   "scripts": {
     "prestart": "rm -rf node_modules/.cache/ && yes | cp -a ../components/dist/scale-components/fonts/* public/fonts/ && yes | cp -a ../components/dist/scale-components/scale-components.css public/",

diff --git a/packages/visual-tests/CHANGELOG.md b/packages/visual-tests/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.136](https://github.com/telekom/scale/compare/v3.0.0-beta.135...v3.0.0-beta.136) (2023-06-27)
+
+**Note:** Version bump only for package @telekom/scale-visual-tests
+
+
+
+
+
 # [3.0.0-beta.135](https://github.com/telekom/scale/compare/v3.0.0-beta.134...v3.0.0-beta.135) (2023-06-21)
 
 

diff --git a/packages/visual-tests/package.json b/packages/visual-tests/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telekom/scale-visual-tests",
   "private": true,
-  "version": "3.0.0-beta.135",
+  "version": "3.0.0-beta.136",
   "main": "index.js",
   "license": "MPL-2.0",
   "scripts": {