Merge branch 'main' into fix-scss

DSI-HUG · Jul 4, 2024 · b66d89d · b66d89d
2 parents c8ac2b4 + c4ea7ab
commit b66d89d
Show file tree

Hide file tree

Showing 22 changed files with 376 additions and 262 deletions.
diff --git a/.github/workflows/ci_release.yml b/.github/workflows/ci_release.yml
@@ -46,54 +46,3 @@ jobs:
       working-directory: 'projects/${{ inputs.package }}'
       dry-run: ${{ inputs.dry-run }}
       release: true
-
-  ci_sync_peer_deps:
-    needs: ci_release
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }} # https://github.com/actions/checkout/issues/1327
-          persist-credentials: false # https://github.com/semantic-release/semantic-release/issues/2636
-
-      - name: Synchronize peer dependencies
-        working-directory: 'scripts'
-        env:
-          GITHUB_TOKEN: ${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}
-        run: |
-          git config user.name 'dsi-hug-bot'
-          git config user.email '[email protected]'
-          git remote set-url origin https://x-access-token:${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          npm --prefix . i chalk
-          node ./sync-peer-deps.mjs
-
-  #
-  # nx does not update package-lock file correctly.
-  # @see https://github.com/nrwl/nx/issues/26660
-  #
-  # This results in the following error, next time deps are installed:
-  #  “npm error `npm ci` can only install packages when your package.json and package-lock.json or
-  #   npm-shrinkwrap.json are in sync. Please update your lock file with `npm install` before continuing."
-  #
-  ci_update_package_lock_file:
-    needs: ci_sync_peer_deps
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.ref_name }} # https://github.com/actions/checkout/issues/1327
-          persist-credentials: false # https://github.com/semantic-release/semantic-release/issues/2636
-
-      - name: Synchronize package.json and package-lock.json
-        env:
-          GITHUB_TOKEN: ${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}
-        run: |
-          git config user.name 'dsi-hug-bot'
-          git config user.email '[email protected]'
-          git remote set-url origin https://x-access-token:${{ secrets.DSI_HUG_BOT_GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          npm install
-          git add package.json package-lock.json
-          git commit --message "chore: synchronize package.json and package-lock.json"
-          git push --follow-tags --no-verify --atomic
diff --git a/nx.json b/nx.json
@@ -5,21 +5,10 @@
             "dependsOn": [
                 "^build:ng"
             ]
-        },
-        "nx-release-publish": {
-            "dependsOn": [
-                "build"
-            ],
-            "options": {
-                "packageRoot": "{workspaceRoot}/dist/{projectRoot}"
-            }
         }
     },
     "release": {
         "projectsRelationship": "independent",
-        "git": {
-            "commitMessage": "chore({projectName}): release version {version} [skip ci]"
-        },
         "version": {
             "conventionalCommits": true
         },

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,9 +5,8 @@
         "lint": "eslint . --fix",
         "prepare": "husky || true",
         "new-package": "ng g .:new-package",
-        "release:dry-run": "nx release --verbose --dry-run",
-        "postinstall": "patch-package",
-        "ng": "ng"
+        "release:dry-run": "node -r @swc-node/register ./scripts/release.ts --verbose --dry-run",
+        "postinstall": "patch-package"
     },
     "workspaces": [
         "projects/core",

diff --git a/projects/core/package.json b/projects/core/package.json
@@ -46,8 +46,8 @@
         "test:ci": "ng test core --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build core -c=production",
         "build": "nx build:ng @hug/ngx-core --verbose",
-        "release": "nx release -p=@hug/ngx-core --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-core --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-core --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/layout/package.json b/projects/layout/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test layout --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build layout -c=production",
         "build": "nx build:ng @hug/ngx-layout --verbose",
-        "release": "nx release -p=@hug/ngx-layout --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-layout --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-layout --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/list-loader/package.json b/projects/list-loader/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test list-loader --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build list-loader -c=production",
         "build": "nx build:ng @hug/ngx-list-loader --verbose",
-        "release": "nx release -p=@hug/ngx-list-loader --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-list-loader --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-list-loader --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/message-box-dialog/package.json b/projects/message-box-dialog/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test message-box-dialog --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build message-box-dialog -c=production",
         "build": "nx build:ng @hug/ngx-message-box-dialog --verbose",
-        "release": "nx release -p=@hug/ngx-message-box-dialog --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-message-box-dialog --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-message-box-dialog --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/message-box/package.json b/projects/message-box/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test message-box --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build message-box -c=production",
         "build": "nx build:ng @hug/ngx-message-box --verbose",
-        "release": "nx release -p=@hug/ngx-message-box --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-message-box --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-message-box --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/numeric-stepper/package.json b/projects/numeric-stepper/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test numeric-stepper --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build numeric-stepper -c=production",
         "build": "nx build:ng @hug/ngx-numeric-stepper --verbose",
-        "release": "nx release -p=@hug/ngx-numeric-stepper --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-numeric-stepper --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-numeric-stepper --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/overlay/package.json b/projects/overlay/package.json
@@ -26,8 +26,8 @@
         "test:ci": "ng test overlay --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build overlay -c=production",
         "build": "nx build:ng @hug/ngx-overlay --verbose",
-        "release": "nx release -p=@hug/ngx-overlay --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-overlay --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-overlay --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/search-container/package.json b/projects/search-container/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test search-container --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build search-container -c=production",
         "build": "nx build:ng @hug/ngx-search-container --verbose",
-        "release": "nx release -p=@hug/ngx-search-container --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-search-container --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-search-container --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/sidenav/package.json b/projects/sidenav/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test sidenav --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build sidenav -c=production",
         "build": "nx build:ng @hug/ngx-sidenav --verbose",
-        "release": "nx release -p=@hug/ngx-sidenav --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-sidenav --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-sidenav --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/snackbar/package.json b/projects/snackbar/package.json
@@ -26,8 +26,8 @@
         "test:ci": "ng test snackbar --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build snackbar -c=production",
         "build": "nx build:ng @hug/ngx-snackbar --verbose",
-        "release": "nx release -p=@hug/ngx-snackbar --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-snackbar --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-snackbar --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/splitter/package.json b/projects/splitter/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test splitter --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build splitter -c=production",
         "build": "nx build:ng @hug/ngx-splitter --verbose",
-        "release": "nx release -p=@hug/ngx-splitter --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-splitter --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-splitter --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/status/package.json b/projects/status/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test status --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build status -c=production",
         "build": "nx build:ng @hug/ngx-status --verbose",
-        "release": "nx release -p=@hug/ngx-status --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-status --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-status --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/time-picker/package.json b/projects/time-picker/package.json
@@ -26,8 +26,8 @@
         "test:ci": "ng test time-picker --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build time-picker -c=production",
         "build": "nx build:ng @hug/ngx-time-picker --verbose",
-        "release": "nx release -p=@hug/ngx-time-picker --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-time-picker --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-time-picker --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/tooltip/package.json b/projects/tooltip/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hug/ngx-tooltip",
-    "version": "1.1.4",
+    "version": "1.1.2",
     "description": "HUG Angular - tooltip component",
     "homepage": "https://github.com/dsi-hug/ngx-components",
     "license": "GPL-3.0-only",
@@ -26,8 +26,8 @@
         "test:ci": "ng test tooltip --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build tooltip -c=production",
         "build": "nx build:ng @hug/ngx-tooltip --verbose",
-        "release": "nx release -p=@hug/ngx-tooltip --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-tooltip --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-tooltip --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/user-card/package.json b/projects/user-card/package.json
@@ -31,8 +31,8 @@
         "test:ci": "ng test user-card --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build user-card -c=production",
         "build": "nx build:ng @hug/ngx-user-card --verbose",
-        "release": "nx release -p=@hug/ngx-user-card --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-user-card --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-user-card --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",

diff --git a/projects/user-tooltip/package.json b/projects/user-tooltip/package.json
@@ -26,15 +26,15 @@
         "test:ci": "ng test user-tooltip --watch=false --browsers=ChromeHeadless",
         "build:ng": "ng build user-tooltip -c=production",
         "build": "nx build:ng @hug/ngx-user-tooltip --verbose",
-        "release": "nx release -p=@hug/ngx-user-tooltip --yes --verbose",
-        "release:dry-run": "nx release -p=@hug/ngx-user-tooltip --verbose --dry-run"
+        "release": "node -r @swc-node/register ../../scripts/release.ts --projects=@hug/ngx-user-tooltip --verbose",
+        "release:dry-run": "npm run release -- --dry-run"
     },
     "peerDependencies": {
         "@angular/common": ">= 14",
         "@angular/core": ">= 14",
         "@angular/material": ">= 14",
         "@hug/ngx-core": "1.1.6",
-        "@hug/ngx-tooltip": "1.1.4",
+        "@hug/ngx-tooltip": "1.1.2",
         "@hug/ngx-user-card": "1.1.1"
     },
     "dependencies": {