Merge remote-tracking branch 'bp/main'

waitingsong · Apr 6, 2024 · 81ba7a3 · 81ba7a3
2 parents ddff36e + c2d6a83
commit 81ba7a3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/.github/workflows/nodejs-win.yml.example b/.github/workflows/nodejs-win.yml.example
@@ -8,7 +8,7 @@ jobs:
   build:
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }} && ${{ github.actor != 'dependabot[bot]' }}
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[perf]') }}
     # if:  github.actor != 'dependabot[bot]'
 
     strategy:
@@ -32,12 +32,10 @@ jobs:
           path: |
             node_modules
             package-lock.json
-            # packages/*/.eslintcache
             packages/*/.tsbuildinfo
-            packages/*/.vscode
             packages/*/dist
             packages/*/node_modules
-            packages/*/package-lock.json
+            C:\npm\prefix\node_modules
           key: ${{ runner.OS }}-build-${{ env.cache-name }}-${{ github.ref }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.OS }}-build-${{ env.cache-name }}-${{ github.ref }}-${{ matrix.node }}-
@@ -60,7 +58,7 @@ jobs:
         shell: bash
         run: |
           export cwd=`pwd`
-          npm i --no-audit -g autocannon c8 lerna rollup tsx zx
+          npm i --no-audit -g c8 lerna madge rollup tsx zx
           npm i
         env:
           CI: true

diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -9,7 +9,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     container: node:current
     timeout-minutes: 60
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    # if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[perf]') }}
 
     strategy:
       matrix:
@@ -32,12 +33,8 @@ jobs:
           path: |
             node_modules
             package-lock.json
-            # packages/*/.eslintcache
             packages/*/.tsbuildinfo
-            packages/*/.vscode
             packages/*/dist
-            packages/*/node_modules
-            packages/*/package-lock.json
           key: ${{ runner.OS }}-build-${{ env.cache-name }}-${{ github.ref }}-${{ matrix.node }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.OS }}-build-${{ env.cache-name }}-${{ github.ref }}-${{ matrix.node }}-
@@ -86,7 +83,7 @@ jobs:
           # chown -R 1001:121 "/github/home/.npm"
           # DO NOT execute: npm config set unsafe-perm=true
           export cwd=`pwd`
-          npm i --no-audit -g autocannon c8 lerna rollup tsx zx
+          npm i --no-audit -g c8 lerna madge tsx zx
           npm i
         env:
           CI: true

diff --git a/.github/workflows/npm-manual-publish.yml b/.github/workflows/npm-manual-publish.yml
@@ -96,7 +96,7 @@ jobs:
         timeout-minutes: 15
         run: |
           export cwd=`pwd`
-          npm i --no-audit -g autocannon c8 lerna rollup tsx zx
+          npm i --no-audit -g lerna rollup tsx zx
           npm i --no-audit
         env:
           CI: true

diff --git a/.github/workflows/npm-publish-wo-test.yml b/.github/workflows/npm-publish-wo-test.yml
@@ -84,7 +84,7 @@ jobs:
         timeout-minutes: 15
         run: |
           export cwd=`pwd`
-          npm i --no-audit -g autocannon c8 lerna rollup tsx zx
+          npm i --no-audit -g lerna rollup tsx zx
           npm i --no-audit
         env:
           CI: true

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Declarative Transaction via decorator `@Transactional`
 
 ## Install global dependencies
 ```sh
-npm i -g c8 lerna rollup tsx zx
+npm i -g c8 lerna madge rollup tsx zx
 ```
 
 ## Installation

diff --git a/package.json b/package.json
@@ -16,23 +16,18 @@
     "@waiting/eslint-config": "^10.19.0",
     "@waiting/shared-core": "^23.3.0",
     "@waiting/shared-types": "^23.2.1",
-    "autocannon": "7",
-    "c8": "9",
     "coveralls": "3",
     "cross-env": "7",
     "debug": "^4.3.4",
     "eslint": "8",
-    "madge": "6",
     "mocha": "10",
     "mocha-lcov-reporter": "1",
     "mwtsc": "^1.7.2",
     "nx": "18",
     "swagger-ui-dist": "^5.13.0",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.8",
-    "tsx": "4",
-    "typescript": "^5.4.4",
-    "zx": "7"
+    "typescript": "^5.4.4"
   },
   "engines": {
     "node": ">=20.11.0"