Merge branch 'main' of https://github.com/dsi-hug/ngx-components

# Conflicts: # .github/workflows/ci_release.yml # .vscode/settings.json # nx.json # package.json # scripts/sync-peer-deps.mjs
DSI-HUG · Jul 5, 2024 · 0ef831d · 0ef831d
2 parents f527e65 + dfcdb12
commit 0ef831d
Show file tree

Hide file tree

Showing 29 changed files with 517 additions and 365 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
@@ -3,19 +3,10 @@
     "targetDefaults": {
         "build:ng": {
             "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,12 +5,11 @@
         "lint": "eslint . --fix",
         "prepare": "husky || true",
         "new-package": "ng g .:new-package",
-        "release:dry-run": "nx release --verbose --dry-run",
+        "release:dry-run": "node -r @swc-node/register ./scripts/release.ts --verbose --dry-run",
         "postinstall": "patch-package",
         "start": "ng serve",
         "prettier": "npx prettier . --check",
-        "prettier-fix": "npx prettier . --write",
-        "ng": "ng"
+        "prettier-fix": "npx prettier . --write"
     },
     "workspaces": [
         "projects/core",

diff --git a/patches/nx+19.3.0.patch b/patches/nx+19.3.0.patch
diff --git a/patches/nx+19.3.2.patch b/patches/nx+19.3.2.patch
@@ -1,6 +1,3 @@
-diff --git a/node_modules/nx/bin/nx-cloud.js b/node_modules/nx/bin/nx-cloud.js
-old mode 100755
-new mode 100644
 diff --git a/node_modules/nx/src/command-line/release/changelog.js b/node_modules/nx/src/command-line/release/changelog.js
 index 13e2e34..5dc0610 100644
 --- a/node_modules/nx/src/command-line/release/changelog.js
@@ -13,6 +10,20 @@ index 13e2e34..5dc0610 100644
                      }
                      const { fileMap } = await (0, file_map_utils_1.createFileMapUsingProjectGraph)(projectGraph);
                      const fileToProjectMap = createFileToProjectMap(fileMap.projectFileMap);
+diff --git a/node_modules/nx/src/command-line/release/utils/git.js b/node_modules/nx/src/command-line/release/utils/git.js
+index c5c7d90..bb882ad 100644
+--- a/node_modules/nx/src/command-line/release/utils/git.js
++++ b/node_modules/nx/src/command-line/release/utils/git.js
+@@ -281,7 +281,8 @@ function parseConventionalCommitsMessage(message) {
+ exports.parseConventionalCommitsMessage = parseConventionalCommitsMessage;
+ // https://www.conventionalcommits.org/en/v1.0.0/
+ // https://regex101.com/r/FSfNvA/1
+-const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
++// const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.+)\))?(?<breaking>!)?: (?<description>.+)/i;
++const ConventionalCommitRegex = /(?<type>[a-z]+)(\((?<scope>.*)\))?(?<breaking>!)?: (?<description>.+)/i;
+ const CoAuthoredByRegex = /co-authored-by:\s*(?<name>.+)(<(?<email>.+)>)/gim;
+ const PullRequestRE = /\([ a-z]*(#\d+)\s*\)/gm;
+ const IssueRE = /(#\d+)/gm;
 diff --git a/node_modules/nx/src/command-line/release/utils/shared.js b/node_modules/nx/src/command-line/release/utils/shared.js
 index e08aff8..de3cdc7 100644
 --- a/node_modules/nx/src/command-line/release/utils/shared.js

diff --git a/projects/core/CHANGELOG.md b/projects/core/CHANGELOG.md
@@ -1,3 +1,13 @@
+## 1.1.7 (2024-07-05)
+
+### 🐛 Fixes
+
+-   theming ([79feb6e](https://github.com/DSI-HUG/ngx-components/commit/79feb6e))
+
+### ❤️ Thank You
+
+-   Serge
+
 ## 1.1.5 (2024-06-24)
 
 ### 🐛 Fixes

diff --git a/projects/core/package.json b/projects/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hug/ngx-core",
-    "version": "1.1.6",
+    "version": "1.1.7",
     "description": "HUG Angular - the core framework",
     "homepage": "https://github.com/dsi-hug/ngx-components",
     "license": "GPL-3.0-only",
@@ -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,15 +31,15 @@
         "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",
         "@angular/core": ">= 14",
         "@angular/cdk": ">= 14",
         "@angular/material": ">= 14",
-        "@hug/ngx-core": "1.1.6",
+        "@hug/ngx-core": "1.1.7",
         "@hug/ngx-sidenav": "1.1.1"
     },
     "dependencies": {

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/CHANGELOG.md b/projects/message-box-dialog/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.1.3 (2024-07-05)
+
+### 🐛 Fixes
+
+-   theming ([79feb6e](https://github.com/DSI-HUG/ngx-components/commit/79feb6e))
+
+### 🌱 Dependencies
+
+-   **@hug/ngx-core:** upgrade to v1.1.7 ([b0f15b9](https://github.com/DSI-HUG/ngx-components/commit/b0f15b9))
+
+### ❤️ Thank You
+
+-   dsi-hug-bot @dsi-hug-bot
+-   Serge
+
 ## 1.1.1 (2024-07-01)
 
 ### 🐛 Fixes

diff --git a/projects/message-box-dialog/package.json b/projects/message-box-dialog/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@hug/ngx-message-box-dialog",
-    "version": "1.1.2",
+    "version": "1.1.3",
     "description": "HUG Angular - message-box-dialog component",
     "homepage": "https://github.com/dsi-hug/ngx-components",
     "license": "GPL-3.0-only",
@@ -31,15 +31,15 @@
         "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",
         "@angular/core": ">= 14",
         "@angular/material": ">= 14",
         "rxjs": ">= 7.0.0",
-        "@hug/ngx-core": "1.1.6"
+        "@hug/ngx-core": "1.1.7"
     },
     "dependencies": {
         "tslib": "^2.6.3"

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,16 +31,16 @@
         "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",
         "@angular/core": ">= 14",
         "@angular/cdk": ">= 14",
         "@angular/material": ">= 14",
         "rxjs": ">= 7.0.0",
-        "@hug/ngx-core": "1.1.6"
+        "@hug/ngx-core": "1.1.7"
     },
     "dependencies": {
         "tslib": "^2.6.3"

diff --git a/projects/overlay/CHANGELOG.md b/projects/overlay/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.1.3 (2024-07-05)
+
+### 🐛 Fixes
+
+-   overlay-demo.component and add demo ([c8ac2b4](https://github.com/DSI-HUG/ngx-components/commit/c8ac2b4))
+
+### 🌱 Dependencies
+
+-   **@hug/ngx-core:** upgrade to v1.1.7 ([b0f15b9](https://github.com/DSI-HUG/ngx-components/commit/b0f15b9))
+
+### ❤️ Thank You
+
+-   dsi-hug-bot @dsi-hug-bot
+-   Serge
+
 ## 1.1.1 (2024-06-24)
 
 ### 🐛 Fixes

diff --git a/projects/overlay/package.json b/projects/overlay/package.json
@@ -26,15 +26,15 @@
         "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",
         "@angular/core": ">= 14",
         "@angular/cdk": ">= 14",
         "rxjs": ">= 7.0.0",
-        "@hug/ngx-core": "1.1.6"
+        "@hug/ngx-core": "1.1.7"
     },
     "dependencies": {
         "tslib": "^2.6.3"

diff --git a/projects/search-container/CHANGELOG.md b/projects/search-container/CHANGELOG.md
@@ -1,3 +1,18 @@
+## 1.1.2 (2024-07-05)
+
+### 🐛 Fixes
+
+-   theming ([79feb6e](https://github.com/DSI-HUG/ngx-components/commit/79feb6e))
+
+### 🌱 Dependencies
+
+-   **@hug/ngx-core:** upgrade to v1.1.7 ([b0f15b9](https://github.com/DSI-HUG/ngx-components/commit/b0f15b9))
+
+### ❤️ Thank You
+
+-   dsi-hug-bot @dsi-hug-bot
+-   Serge
+
 ## 1.1.0 (2024-06-26)
 
 ### 🚀 Features