Merge branch 'refs/heads/master' into elements-#1075-ino-nav-menu

# Conflicts: # packages/elements/src/components/ino-snackbar/readme.md
inovex · Apr 5, 2024 · 92ef8de · 92ef8de
2 parents 8d05339 + e4d41ad
commit 92ef8de
Show file tree

Hide file tree

Showing 117 changed files with 3,957 additions and 5,218 deletions.
diff --git a/.github/workflows/deploy-prerelease.yml b/.github/workflows/deploy-prerelease.yml
@@ -8,6 +8,13 @@ on:
       - v*
     paths:
       - packages/elements/**
+      # ignore test specific files
+      - '!packages/elements/**/*.spec.ts'
+      - '!packages/elements/**/*.e2e.ts'
+      - '!packages/elements/src/util/e2etests-setup.ts'
+      - '!packages/elements/src/util/test-utils.ts'
+      - '!packages/elements/setupSpecTests.ts'
+      - '!packages/elements/scripts/**' # ignore changes to internal scripts
       - packages/elements-angular/**
       - packages/elements-react/**
       - packages/elements-vue/**

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,13 +39,15 @@ jobs:
       - name: Check format
         run: yarn format
       - name: Check lint
-        run: yarn lint
+        run: yarn lint:ci
         env:
           NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
       - name: Build all projects
         run: yarn build
         env:
           NX_REJECT_UNKNOWN_LOCAL_CACHE: 0
+      - name: Check if there are changes
+        uses: NathanielHill/[email protected]
       - name: Test all projects
         id: test_projects
         run: yarn test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 9.3.0 (2024-04-05)
+
+
+### 🚀 Features
+
+- **elements/ino-snackbar:** add open prop functionality ([#1320](https://github.com/inovex/elements/pull/1320))
+
+### ❤️  Thank You
+
+- Tobias Heim Galindo @TobiasHeimGalindo
+
 ## 9.2.0 (2024-03-15)
 
 

diff --git a/nx.json b/nx.json
@@ -24,7 +24,38 @@
         "^production",
         "{projectRoot}/.eslintrc.json",
         "{workspaceRoot}/.eslintrc.json"
-      ]
+      ],
+      "defaultConfiguration": "check",
+      "configurations": {
+        "check": {
+          "fix": false
+        },
+        "fix": {
+          "fix": true
+        },
+        "ci": {
+          "quiet": true
+        }
+      }
+    },
+    "clean": {
+      "executor": "nx:run-commands",
+      "options": {
+        "cwd": "{projectRoot}",
+        "parallel": false,
+        "commands": [
+          "nx run {projectName}:clean:dist",
+          "nx run {projectName}:clean:node"
+        ]
+      },
+      "configurations": {
+        "dist": {
+          "commands": ["shx rm -rf ./dist"]
+        },
+        "node": {
+          "commands": ["shx rm -rf ./node_modules"]
+        }
+      }
     },
     "@angular-devkit/build-angular:browser": {
       "cache": true,
@@ -35,6 +66,10 @@
       "cache": true,
       "dependsOn": ["^build"],
       "inputs": ["production", "^production"]
+    },
+    "@nx/vite:test": {
+      "cache": true,
+      "inputs": ["default", "^production"]
     }
   },
   "generators": {
@@ -86,6 +121,11 @@
       "{workspaceRoot}/tsconfig.json",
       "{workspaceRoot}/tsconfig.base.json"
     ],
-    "production": ["default", "!{projectRoot}/**/*.e2e.ts"]
+    "production": [
+      "default",
+      "!{projectRoot}/**/*.e2e.ts",
+      "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
+      "!{projectRoot}/tsconfig.spec.json"
+    ]
   }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "core",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "private": true,
   "description": "This is a Monorepo root package which is used to execute build scripts.",
   "engines": {
@@ -10,16 +10,22 @@
     "start:storybook": "nx run-many --target=start --projects=storybook,elements --output-style=stream",
     "start:landingpage": "nx run landingpage:start",
     "start:ui-patterns-playground": "nx run-many --target=start --projects=ui-patterns,ui-patterns-playground --output-style=stream",
-    "build": "nx run-many --target=build --output-style=stream --exclude workspace",
-    "test": "nx run-many --target=test --output-style=stream --configuration=ci --exclude workspace",
+    "build": "nx run-many --target=build --output-style=stream",
+    "test": "nx run-many --target=test --output-style=stream --configuration=ci",
     "test:core:watch": "nx run elements:test:watch",
-    "lint": "nx affected --target=lint --output-style=stream --exclude workspace",
-    "lint:fix": "nx affected --target=lint --configuration=fix --output-style=stream --exclude workspace",
-    "format": "nx format:check --exclude workspace",
-    "format:fix": "nx format:write --exclude workspace",
-    "qc": "yarn lint && yarn format && yarn build && yarn test",
-    "clean": "nx run-many --target=clean --exclude workspace && shx rm -rf dist",
-    "clean:node-modules": "nx run-many --target=clean --configuration=nodejs --exclude workspace && shx rm -rf node_modules"
+    "lint": "nx affected --target=lint --output-style=stream",
+    "lint:fix": "nx affected --target=lint --configuration=fix --output-style=stream",
+    "lint:ci": "nx affected --target=lint --configuration=ci --output-style=stream",
+    "format": "nx format:check",
+    "format:fix": "nx format:write",
+    "qc": "yarn lint:ci && yarn format && yarn build && yarn test",
+    "clean": "nx run-many --target=clean && yarn clean:nx && shx rm -rf node_modules .nx",
+    "clean:dist": "nx run-many --target=clean --configuration=dist && yarn clean:nx",
+    "clean:node": "nx run-many --target=clean --configuration=node && yarn clean:nx && shx rm -rf node_modules",
+    "clean:nx": "nx daemon --stop && nx reset"
+  },
+  "nx": {
+    "includedScripts": []
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~15.1.0",
@@ -36,6 +42,8 @@
     "@nx/js": "18.0.7",
     "@nx/playwright": "18.0.7",
     "@nx/storybook": "18.0.7",
+    "@nx/vite": "18.0.7",
+    "@nx/web": "18.0.7",
     "@playwright/test": "^1.36.0",
     "@swc-node/register": "~1.8.0",
     "@swc/core": "~1.3.85",
@@ -77,6 +85,7 @@
     "svgo": "^2.8.0",
     "ts-node": "^10.9.1",
     "typescript": "~5.3.2",
+    "vite": "~5.0.0",
     "yalc": "^1.0.0-pre.32"
   },
   "dependencies": {

diff --git a/packages/elements-angular-example/package.json b/packages/elements-angular-example/package.json
@@ -1,8 +1,8 @@
 {
   "name": "elements-angular-example",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "private": true,
   "dependencies": {
-    "@inovex.de/elements-angular": "^9.2.0"
+    "@inovex.de/elements-angular": "^9.3.0"
   }
 }
diff --git a/packages/elements-angular-example/project.json b/packages/elements-angular-example/project.json
@@ -76,7 +76,8 @@
           "packages/elements-angular-example/**/*.html"
         ]
       }
-    }
+    },
+    "clean": {}
   },
   "tags": []
 }
diff --git a/packages/elements-angular/package.json b/packages/elements-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@inovex.de/elements-angular",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "author": "Sven Lindauer <[email protected]>",
   "description": "Angular library for @inovex.de/elements to use the components in Angular projects",
   "contributors": [
@@ -20,7 +20,7 @@
     "rxjs": ">=7.5.0"
   },
   "dependencies": {
-    "@inovex.de/elements": "^9.2.0",
+    "@inovex.de/elements": "^9.3.0",
     "tslib": "^2.3.0"
   },
   "schematics": "./dist/schematics/collection.json",

diff --git a/packages/elements-angular/project.json b/packages/elements-angular/project.json
@@ -70,7 +70,8 @@
           "packages/elements-angular/src/**/*.html"
         ]
       }
-    }
+    },
+    "clean": {}
   },
   "tags": []
 }
diff --git a/packages/elements-angular/src/directives/proxies.ts b/packages/elements-angular/src/directives/proxies.ts
@@ -1167,14 +1167,14 @@ export declare interface InoSelect extends Components.InoSelect {
 
 
 @ProxyCmp({
-  inputs: ['a11yLabels', 'actionText', 'message', 'stayVisibleOnHover', 'timeout', 'type']
+  inputs: ['a11yLabels', 'actionText', 'message', 'open', 'stayVisibleOnHover', 'timeout', 'type']
 })
 @Component({
   selector: 'ino-snackbar',
   changeDetection: ChangeDetectionStrategy.OnPush,
   template: '<ng-content></ng-content>',
   // eslint-disable-next-line @angular-eslint/no-inputs-metadata-property
-  inputs: ['a11yLabels', 'actionText', 'message', 'stayVisibleOnHover', 'timeout', 'type'],
+  inputs: ['a11yLabels', 'actionText', 'message', 'open', 'stayVisibleOnHover', 'timeout', 'type'],
 })
 export class InoSnackbar {
   protected el: HTMLElement;

diff --git a/packages/elements-react-example/.eslintrc.json b/packages/elements-react-example/.eslintrc.json
@@ -0,0 +1,15 @@
+{
+  "extends": ["../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*", "node_modules/*", "dist/*", "vite.config.ts"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx"],
+      "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/recommended",
+        "plugin:react-hooks/recommended"
+      ],
+      "plugins": ["react-refresh"]
+    }
+  ]
+}
diff --git a/packages/elements-react-example/package.json b/packages/elements-react-example/package.json
@@ -1,11 +1,11 @@
 {
   "name": "elements-react-example",
   "description": "Example App for using elements react wrapper",
-  "version": "9.2.0",
+  "version": "9.3.0",
   "private": true,
   "license": "MIT",
   "dependencies": {
-    "@inovex.de/elements-react": "^9.2.0",
+    "@inovex.de/elements-react": "^9.3.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router-dom": "^6.16.0",
@@ -15,7 +15,6 @@
     "@types/react": "^18.2.24",
     "@types/react-dom": "^18.2.8",
     "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react": "^4.1.0",
-    "vite": "^4.4.9"
+    "@vitejs/plugin-react": "^4.2.1"
   }
 }
diff --git a/packages/elements-react-example/project.json b/packages/elements-react-example/project.json
@@ -6,39 +6,31 @@
   "tags": [],
   "targets": {
     "build": {
-      "executor": "nx:run-commands",
+      "executor": "@nx/vite:build",
       "outputs": ["{projectRoot}/dist"],
       "options": {
-        "cwd": "packages/elements-react-example",
-        "command": "vite build"
+        "outputPath": "{projectRoot}/dist",
+        "configFile": "{projectRoot}/vite.config.ts"
       }
     },
     "start": {
-      "executor": "nx:run-commands",
+      "executor": "@nx/vite:dev-server",
       "options": {
-        "cwd": "packages/elements-react-example"
-      },
-      "defaultConfiguration": "dev",
-      "configurations": {
-        "dev": {
-          "command": "vite --port 4300"
-        },
-        "prod": {
-          "command": "vite preview --port 4300"
-        }
+        "buildTarget": "elements-react-example:build",
+        "port": 4300
       }
     },
-    "clean": {
-      "executor": "nx:run-commands",
+    "preview": {
+      "executor": "@nx/vite:preview-server",
       "options": {
-        "cwd": "packages/elements-react-example",
-        "command": "shx rm -rf dist"
-      },
-      "configurations": {
-        "nodejs": {
-          "command": "shx rm -rf node_modules"
-        }
+        "buildTarget": "elements-react-example:build",
+        "port": 4300
       }
-    }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint",
+      "outputs": ["{options.outputFile}"]
+    },
+    "clean": {}
   }
 }
diff --git a/packages/elements-react-example/src/App.tsx b/packages/elements-react-example/src/App.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import {
   BrowserRouter as Router,
   Navigate,
@@ -21,7 +21,7 @@ import { LoginFormApp } from './login-form-app';
 type CustomRoute = {
   to: string;
   label: string;
-  component: any;
+  component: ReactNode;
 };
 
 const ROUTES: CustomRoute[] = [

diff --git a/packages/elements-react-example/src/ino-button/index.tsx b/packages/elements-react-example/src/ino-button/index.tsx
@@ -3,7 +3,7 @@ import { InoButton, InoIcon } from '../shared/InovexElements';
 
 export const Button = () => (
   <div className="App">
-    <InoButton dense={false} fill="solid" loading={false}>
+    <InoButton dense={false} variant="filled" loading={false}>
       <InoIcon slot="icon-leading" icon="info" />
       My Button
       <InoIcon slot="icon-trailing" icon="info" />

diff --git a/packages/elements-react-example/src/shared/components/NavItemLink.tsx b/packages/elements-react-example/src/shared/components/NavItemLink.tsx
@@ -3,7 +3,7 @@ import { InoIcon, InoNavItem } from '../InovexElements';
 import React from 'react';
 
 export const NavItemLink = ({ label, to }: { label: string; to: string }) => {
-  let match = useMatch(to);
+  const match = useMatch(to);
   return (
     <Link className={'router-link'} to={to}>
       <InoNavItem activated={Boolean(match)} text={label}>

diff --git a/packages/elements-react-example/vite.config.ts b/packages/elements-react-example/vite.config.ts
@@ -1,29 +1,10 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
 
-const baseConfig = {
+export default defineConfig({
+  base: '/example-projects/react/',
   plugins: [react()],
-  build: {
-    commonjsOptions: {
-      include: [/@inovex.de\/elements-react\//, /node_modules\//],
-    },
+  optimizeDeps: {
+    include: ['@inovex.de/elements-react'],
   },
-};
-// https://vitejs.dev/config/
-export default defineConfig(({ command }) => {
-  if (command === 'serve')
-    return {
-      ...baseConfig,
-      server: {
-        open: '/',
-      },
-    };
-
-  return {
-    ...baseConfig,
-    base: '/example-projects/react/',
-    optimizeDeps: {
-      include: ['@inovex.de/elements-react'],
-    },
-  };
 });