Merge pull request #111 from klerick/update-dep

klerick · web-flow · commit 2f469ecbbed7 · 2025-05-23T16:05:43.000+02:00
feat(json-api-nestjs,json-api-nestjs-microorm,json-api-nestjs-sdk,jso…
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -82,64 +82,64 @@ on:
 
 
 jobs:
-#  compute-projects:
-#    uses: ./.github/workflows/compute-projects.yml
-#    with:
-#      tagChoice: ${{ github.event.inputs.tagChoice }}
-#      project1: ${{ github.event.inputs.project1 }}
-#      project2: ${{ github.event.inputs.project2 }}
-#      project3: ${{ github.event.inputs.project3 }}
-#      project4: ${{ github.event.inputs.project4 }}
-#
-#  test:
-#    needs: [compute-projects]
-#    uses: ./.github/workflows/test.yml
-#    with:
-#      mainBranch: "last-tag"
-#    secrets:
-#      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-#
-#  e2e-test:
-#    needs: [test]
-#    uses: ./.github/workflows/e2e-test.yml
-#    with:
-#      mainBranch: "last-tag"
-#    secrets:
-#      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-#
-#  build:
-#    needs: [test, e2e-test]
-#    uses: ./.github/workflows/build.yml
-#    with:
-#      mainBranch: "last-tag"
-#    secrets:
-#      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-#
-#  upload-badge:
-#    needs: [ test, e2e-test ]
-#    uses: ./.github/workflows/upload-badge.yml
-#    with:
-#      mainBranch: "last-tag"
-#    secrets:
-#      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
-#      GIST_SECRET: ${{ secrets.GIST_SECRET }}
-#      GIST_ID: ${{ secrets.GIST_ID }}
+  compute-projects:
+    uses: ./.github/workflows/compute-projects.yml
+    with:
+      tagChoice: ${{ github.event.inputs.tagChoice }}
+      project1: ${{ github.event.inputs.project1 }}
+      project2: ${{ github.event.inputs.project2 }}
+      project3: ${{ github.event.inputs.project3 }}
+      project4: ${{ github.event.inputs.project4 }}
 
-#  bump-version:
-#    needs: [build]
-#    uses: ./.github/workflows/bump-version.yml
-#    with:
-#      projects: ${{ needs.compute-projects.outputs.finalProjects }}
-#      beta-release: ${{ fromJSON(github.event.inputs.beta-release) }}
-#      dry-run: ${{ fromJSON(github.event.inputs.dry-run) }}
-#    secrets:
-#      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-#      GITHUB_TOKEN_SECRET: ${{ secrets.GITHUB_TOKEN }}
-#      PAT: ${{secrets.PAT}}
+  test:
+    needs: [compute-projects]
+    uses: ./.github/workflows/test.yml
+    with:
+      mainBranch: "last-tag"
+    secrets:
+      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
+  e2e-test:
+    needs: [test]
+    uses: ./.github/workflows/e2e-test.yml
+    with:
+      mainBranch: "last-tag"
+    secrets:
+      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
+  build:
+    needs: [test, e2e-test]
+    uses: ./.github/workflows/build.yml
+    with:
+      mainBranch: "last-tag"
+    secrets:
+      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+
+  upload-badge:
+    needs: [ test, e2e-test ]
+    uses: ./.github/workflows/upload-badge.yml
+    with:
+      mainBranch: "last-tag"
+    secrets:
+      NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
+      GIST_SECRET: ${{ secrets.GIST_SECRET }}
+      GIST_ID: ${{ secrets.GIST_ID }}
+
+  bump-version:
+    needs: [build]
+    uses: ./.github/workflows/bump-version.yml
+    with:
+      projects: ${{ needs.compute-projects.outputs.finalProjects }}
+      beta-release: ${{ fromJSON(github.event.inputs.beta-release) }}
+      dry-run: ${{ fromJSON(github.event.inputs.dry-run) }}
+    secrets:
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      GITHUB_TOKEN_SECRET: ${{ secrets.GITHUB_TOKEN }}
+      PAT: ${{secrets.PAT}}
 
   publish:
     if: ${{ fromJSON(github.event.inputs.dry-run) == false }}
-#    needs: [bump-version]
+    needs: [bump-version]
     uses: ./.github/workflows/publish.yml
     secrets:
       NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/libs/json-api/json-api-nestjs-microorm/package.json b/libs/json-api/json-api-nestjs-microorm/package.json
@@ -1,21 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-microorm",
   "version": "0.1.0-beta.1",
-  "license": "MIT",
-  "private": false,
-  "contributors": [
-    {
-      "email": "klerick666@gmain.com",
-      "name": "Aleksandr Kharkovey"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/klerick/nestjs-json-api.git"
-  },
-  "engines": {
-    "node": ">= 20.0.0"
-  },
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -33,8 +18,5 @@
     "tslib": ">2.3.0",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.1.0"
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }
diff --git a/libs/json-api/json-api-nestjs-microorm/project.json b/libs/json-api/json-api-nestjs-microorm/project.json
@@ -10,7 +10,7 @@
     "type:publish"
   ],
   "targets": {
-    "build": {
+    "build-common": {
       "dependsOn": [
         {
           "projects": [
@@ -37,6 +37,30 @@
         "updateBuildableProjectDepsInPackageJson": true
       }
     },
+    "build": {
+      "executor": "nx:run-commands",
+      "dependsOn": [
+        "build-common"
+      ],
+      "options": {
+        "outputPath": "dist/{projectRoot}",
+        "commands": [
+          {
+            "command": "node tools/scripts/prepare-package-json.mjs json-api-nestjs-microorm"
+          },
+          {
+            "command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-microorm",
+            "forwardAllArgs": false
+          },
+          {
+            "command": "ln -s $(pwd)/dist/{projectRoot} node_modules/@klerick/json-api-nestjs-microorm",
+            "forwardAllArgs": false
+          }
+        ],
+        "cwd": "./",
+        "parallel": false
+      }
+    },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": [
diff --git a/libs/json-api/json-api-nestjs-sdk/package.json b/libs/json-api/json-api-nestjs-sdk/package.json
@@ -1,21 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-sdk",
   "version": "10.0.0-beta.1",
-  "license": "MIT",
-  "private": false,
-  "contributors": [
-    {
-      "email": "klerick666@gmain.com",
-      "name": "Aleksandr Kharkovey"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/klerick/nestjs-json-api.git"
-  },
-  "engines": {
-    "node": ">= 20.0.0"
-  },
   "description": "Helper for client JsonAPi Plugin for NestJs",
   "keywords": [
     "nestjs",
@@ -57,8 +42,5 @@
         "./mjs/src/ngModule.d.ts"
       ]
     }
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }
diff --git a/libs/json-api/json-api-nestjs-sdk/project.json b/libs/json-api/json-api-nestjs-sdk/project.json
@@ -76,6 +76,9 @@
             "command": "cp dist/{projectRoot}/cjs/package.json dist/{projectRoot}/package.json",
             "forwardAllArgs": false
           },
+          {
+            "command": "node tools/scripts/prepare-package-json.mjs json-api-nestjs-sdk"
+          },
           {
             "command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-sdk",
             "forwardAllArgs": false
diff --git a/libs/json-api/json-api-nestjs-shared/package.json b/libs/json-api/json-api-nestjs-shared/package.json
@@ -1,21 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-shared",
   "version": "1.0.0-beta.1",
-  "license": "MIT",
-  "private": false,
-  "contributors": [
-    {
-      "email": "klerick666@gmain.com",
-      "name": "Aleksandr Kharkovey"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/klerick/nestjs-json-api.git"
-  },
-  "engines": {
-    "node": ">= 20.0.0"
-  },
   "description": "Shared Helper for JsonApi Plugin for NestJs",
   "keywords": [
     "nestjs",
@@ -34,8 +19,5 @@
   "type": "commonjs",
   "main": "./cjs/src/index.js",
   "types": "./cjs/src/index.d.ts",
-  "module": "./mjs/src/index.js",
-  "publishConfig": {
-    "access": "public"
-  }
+  "module": "./mjs/src/index.js"
 }
diff --git a/libs/json-api/json-api-nestjs-shared/project.json b/libs/json-api/json-api-nestjs-shared/project.json
@@ -58,6 +58,9 @@
             "command": "[ ! -f dist/{projectRoot}/cjs/package.json ] ||  cp dist/{projectRoot}/cjs/package.json dist/{projectRoot}/package.json",
             "forwardAllArgs": false
           },
+          {
+            "command": "node tools/scripts/prepare-package-json.mjs json-api-nestjs-shared"
+          },
           {
             "command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-shared",
             "forwardAllArgs": false
diff --git a/libs/json-api/json-api-nestjs-typeorm/package.json b/libs/json-api/json-api-nestjs-typeorm/package.json
@@ -1,21 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs-typeorm",
   "version": "0.1.0-beta.1",
-  "license": "MIT",
-  "private": false,
-  "contributors": [
-    {
-      "email": "klerick666@gmain.com",
-      "name": "Aleksandr Kharkovey"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/klerick/nestjs-json-api.git"
-  },
-  "engines": {
-    "node": ">= 20.0.0"
-  },
   "dependencies": {
     "tslib": ">2.3.0",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
@@ -33,8 +18,5 @@
     "typeorm",
     "microorm",
     "CRUD"
-  ],
-  "publishConfig": {
-    "access": "public"
-  }
+  ]
 }
diff --git a/libs/json-api/json-api-nestjs-typeorm/project.json b/libs/json-api/json-api-nestjs-typeorm/project.json
@@ -5,7 +5,7 @@
   "projectType": "library",
   "tags": ["type:lib", "lib:json-api-nestjs", "lib:json-api-nestjs-typeorm", "type:publish"],
   "targets": {
-    "build": {
+    "build-common": {
       "executor": "@nx/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
@@ -19,6 +19,30 @@
         "updateBuildableProjectDepsInPackageJson": true
       }
     },
+    "build": {
+      "executor": "nx:run-commands",
+      "dependsOn": [
+        "build-common"
+      ],
+      "options": {
+        "outputPath": "dist/{projectRoot}",
+        "commands": [
+          {
+            "command": "node tools/scripts/prepare-package-json.mjs json-api-nestjs-typeorm"
+          },
+          {
+            "command": "mkdir -p node_modules/@klerick && rm -rf node_modules/@klerick/json-api-nestjs-typeorm",
+            "forwardAllArgs": false
+          },
+          {
+            "command": "ln -s $(pwd)/dist/{projectRoot} node_modules/@klerick/json-api-nestjs-typeorm",
+            "forwardAllArgs": false
+          }
+        ],
+        "cwd": "./",
+        "parallel": false
+      }
+    },
     "nx-release-publish": {
       "options": {
         "packageRoot": "dist/{projectRoot}"
diff --git a/libs/json-api/json-api-nestjs/package.json b/libs/json-api/json-api-nestjs/package.json
@@ -1,21 +1,6 @@
 {
   "name": "@klerick/json-api-nestjs",
   "version": "10.0.0-beta.1",
-  "license": "MIT",
-  "private": false,
-  "contributors": [
-    {
-      "email": "klerick666@gmain.com",
-      "name": "Aleksandr Kharkovey"
-    }
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/klerick/nestjs-json-api.git"
-  },
-  "engines": {
-    "node": ">= 20.0.0"
-  },
   "type": "commonjs",
   "description": "JsonApi Plugin for NestJs",
   "keywords": [
@@ -31,8 +16,5 @@
     "tslib": ">2.3.0",
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.1.0"
-  },
-  "publishConfig": {
-    "access": "public"
   }
 }
diff --git a/libs/json-api/json-api-nestjs/project.json b/libs/json-api/json-api-nestjs/project.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/tools/scripts/prepare-package-json.mjs b/tools/scripts/prepare-package-json.mjs
diff --git a/tsconfig.base.json b/tsconfig.base.json
