feat(executors): move quarkus build-image executor to common lib (#236)

khalilou88 · May 27, 2023 · 0400100 · 0400100
1 parent 86d6740
commit 0400100
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 122 deletions.
diff --git a/packages/common/project.json b/packages/common/project.json
@@ -14,7 +14,19 @@
         "tsConfig": "packages/common/tsconfig.lib.json",
         "updateBuildableProjectDepsInPackageJson": true,
         "buildableProjectDepsInPackageJsonType": "dependencies",
-        "assets": ["packages/common/*.md"]
+        "assets": [
+          "packages/common/*.md",
+          {
+            "input": "./packages/common/src",
+            "glob": "**/!(*.ts)",
+            "output": "./src"
+          },
+          {
+            "input": "./packages/common/src",
+            "glob": "**/*.d.ts",
+            "output": "./src"
+          }
+        ]
       }
     },
     "lint": {

diff --git a/...tors/build-image/quarkus/executor.spec.ts → ...tors/build-image/quarkus/executor.spec.ts b/...tors/build-image/quarkus/executor.spec.ts → ...tors/build-image/quarkus/executor.spec.ts
@@ -1,5 +1,5 @@
 import { ExecutorContext } from '@nx/devkit';
-import { runCommand } from '@jnxplus/common';
+import { runCommand } from '../../../.';
 import executor from './executor';
 import { BuildImageExecutorSchema } from './schema';
 jest.mock('@jnxplus/common');

diff --git a/...executors/build-image/quarkus/executor.ts → ...executors/build-image/quarkus/executor.ts b/...executors/build-image/quarkus/executor.ts → ...executors/build-image/quarkus/executor.ts
@@ -1,5 +1,5 @@
 import { ExecutorContext, logger, workspaceRoot } from '@nx/devkit';
-import { getProjectRoot, runCommand } from '@jnxplus/common';
+import { getProjectRoot, runCommand } from '../../../.';
 import { BuildImageExecutorSchema } from './schema';
 import { join } from 'path';
 

diff --git a/...executors/build-image/quarkus/schema.d.ts → ...executors/build-image/quarkus/schema.d.ts b/...executors/build-image/quarkus/schema.d.ts → ...executors/build-image/quarkus/schema.d.ts
@@ -1,4 +1,4 @@
-import { ImageType } from '@jnxplus/common';
+import { ImageType } from '../../../.';
 
 export interface BuildImageExecutorSchema {
   imageType: ImageType;

diff --git a/...executors/build-image/quarkus/schema.json → ...executors/build-image/quarkus/schema.json b/...executors/build-image/quarkus/schema.json → ...executors/build-image/quarkus/schema.json
diff --git a/packages/gradle/src/executors/build-image/quarkus/executor.spec.ts b/packages/gradle/src/executors/build-image/quarkus/executor.spec.ts
diff --git a/packages/gradle/src/executors/build-image/quarkus/schema.d.ts b/packages/gradle/src/executors/build-image/quarkus/schema.d.ts
diff --git a/packages/maven/.eslintrc.json b/packages/maven/.eslintrc.json
@@ -15,7 +15,7 @@
       "rules": {}
     },
     {
-      "files": ["./package.json", "./executors.json"],
+      "files": ["./package.json"],
       "parser": "jsonc-eslint-parser",
       "rules": {
         "@nx/nx-plugin-checks": "error"

diff --git a/packages/maven/package.json b/packages/maven/package.json
@@ -23,6 +23,5 @@
   ],
   "peerDependencies": {
     "@nx/devkit": ">=16.0.0"
-  },
-  "executors": "./executors.json"
+  }
 }
diff --git a/packages/maven/project.json b/packages/maven/project.json
@@ -16,7 +16,6 @@
         "buildableProjectDepsInPackageJsonType": "dependencies",
         "assets": [
           "packages/maven/*.md",
-
           {
             "input": "./packages/maven/src",
             "glob": "**/!(*.ts)",
@@ -26,11 +25,6 @@
             "input": "./packages/maven/src",
             "glob": "**/*.d.ts",
             "output": "./src"
-          },
-          {
-            "input": "./packages/maven",
-            "glob": "executors.json",
-            "output": "."
           }
         ]
       }

diff --git a/packages/maven/src/executors/build-image/quarkus/executor.ts b/packages/maven/src/executors/build-image/quarkus/executor.ts
diff --git a/packages/maven/src/executors/build-image/quarkus/schema.json b/packages/maven/src/executors/build-image/quarkus/schema.json
diff --git a/packages/nx-quarkus-gradle/executors.json b/packages/nx-quarkus-gradle/executors.json
@@ -7,8 +7,8 @@
       "description": "build executor"
     },
     "build-image": {
-      "implementation": "@jnxplus/gradle/src/executors/build-image/quarkus/executor",
-      "schema": "@jnxplus/gradle/src/executors/build-image/quarkus/schema.json",
+      "implementation": "@jnxplus/common/src/executors/build-image/quarkus/executor",
+      "schema": "@jnxplus/common/src/executors/build-image/quarkus/schema.json",
       "description": "build-image executor"
     },
     "serve": {

diff --git a/packages/nx-quarkus-maven/executors.json b/packages/nx-quarkus-maven/executors.json
@@ -7,8 +7,8 @@
       "description": "build executor"
     },
     "build-image": {
-      "implementation": "@jnxplus/maven/src/executors/build-image/quarkus/executor",
-      "schema": "@jnxplus/maven/src/executors/build-image/quarkus/schema.json",
+      "implementation": "@jnxplus/common/src/executors/build-image/quarkus/executor",
+      "schema": "@jnxplus/common/src/executors/build-image/quarkus/schema.json",
       "description": "build-image executor"
     },
     "serve": {