feat(nx-container): fix generator

gperdomor · Nov 7, 2023 · 15eaea1 · 15eaea1
1 parent eb88944
commit 15eaea1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/packages/nx-container/.eslintrc.json b/packages/nx-container/.eslintrc.json
@@ -21,7 +21,7 @@
         "@nx/dependency-checks": [
           "error",
           {
-            "ignoredDependencies": ["dotenv"]
+            "ignoredDependencies": ["dotenv", "@nx-tools/container-metadata"]
           }
         ]
       }

diff --git a/packages/nx-container/package.json b/packages/nx-container/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nx-tools/nx-container",
-  "version": "6.0.0-alpha.1",
+  "version": "6.0.0-alpha.2",
   "author": "gperdomor <gperdomor@gmail.com>",
   "repository": "https://github.com/gperdomor/nx-tools",
   "bugs": "https://github.com/gperdomor/nx-tools/issues",
@@ -11,7 +11,7 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "dependencies": {
-    "@nx-tools/core": "5.0.3",
+    "@nx-tools/core": "6.0.0-alpha.2",
     "tmp": "0.2.1",
     "csv-parse": "5.5.2",
     "semver": "7.5.4",
@@ -21,5 +21,8 @@
     "dotenv": ">=16.0.0",
     "@nx/devkit": "^16.0.0 || ^17.0.0",
     "tslib": "^2.5.3"
+  },
+  "optionalDependencies": {
+    "@nx-tools/container-metadata": "6.0.0-alpha.2"
   }
 }
diff --git a/packages/nx-container/src/generators/configuration/generator.spec.ts b/packages/nx-container/src/generators/configuration/generator.spec.ts
@@ -46,7 +46,10 @@ describe('configuration generator', () => {
 
       expect(project.targets).toMatchObject({
         container: {
-          executor: `@nx-tools/nx-container:${executor}`,
+          executor: `@nx-tools/nx-container:build`,
+          options: {
+            engine: executor,
+          },
         },
       });
     }

diff --git a/packages/nx-container/src/generators/configuration/generator.ts b/packages/nx-container/src/generators/configuration/generator.ts
@@ -26,9 +26,10 @@ export async function configurationGenerator(tree: Tree, options: ConfigurationS
     targets: {
       ...project.targets,
       container: {
-        executor: `@nx-tools/nx-container:${options.engine ?? DEFAULT_ENGINE}`,
+        executor: `@nx-tools/nx-container:build`,
         dependsOn: ['build'],
         options: {
+          engine: options.engine ?? DEFAULT_ENGINE,
           metadata: {
             images: [project.name],
             load: true,