@payfit/nx-core 4.40.1 → 4.41.0-ephemeral-hello-lambda-05ab438.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payfit/nx-core",
-  "version": "4.40.1",
+  "version": "4.41.0-ephemeral-hello-lambda-05ab438.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -11,7 +11,7 @@
     "directory": "packages/nx-core"
   },
   "dependencies": {
-    "@nx/js": "21.3.2",
+    "@payfit/spacelift": "0.14.0-ephemeral-hello-lambda-05ab438.0",
     "args-tokenizer": "^0.3.0",
     "consola": "^3.4.2",
     "get-port": "^7.1.0",
@@ -31,11 +31,7 @@
     "nx": "^21"
   },
   "exports": {
-    ".": {
-      "types": "./src/index.d.ts",
-      "require": "./src/index.js",
-      "default": "./src/index.js"
-    },
+    ".": "./src/index.js",
     "./versionActions": "./src/scripts/version-actions.js",
     "./package.json": "./package.json"
   },
@@ -43,12 +39,5 @@
   "generators": "./generators.json",
   "publishConfig": {
     "access": "restricted"
-  },
-  "files": [
-    "src",
-    "executors.json",
-    "generators.json",
-    "package.json",
-    "!*tsconfig.lib.tsbuildinfo"
-  ]
+  }
 }

package/src/executors/publisher/docker.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishDocker = publishDocker;
 const fs = require("node:fs");
-const aws_auth_1 = require("../../utils/aws-auth");
+const aws_auth_1 = require("../../utils/common/aws-auth");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
 const datadog_1 = require("../../utils/datadog");
 const docker_1 = require("../../utils/docker");
-const github_1 = require("../../utils/github");
-const logger_1 = require("../../utils/logger");
 async function publishDocker(options, context, version, projectRoot, isDryRun) {
     const projectDockerfile = `${projectRoot}/Dockerfile`;
     if (!fs.existsSync(projectDockerfile)) {

package/src/executors/publisher/docker.js.map

@@ -1 +1 @@
-{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/docker.ts"],"names":[],"mappings":"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"}

package/src/executors/publisher/executor.js

@@ -1,15 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const nx_1 = require("../../utils/nx");
+const nx_1 = require("../../utils/common/nx");
 const docker_1 = require("./docker");
 const helm_1 = require("./helm");
+const lambda_1 = require("./lambda");
 const runExecutor = async (options, context) => {
     const isDryRun = process.env.NX_DRY_RUN === 'true' || options.dryRun || false;
-    const projectRoot = context.projectGraph.nodes[context.projectName].data.root;
-    const projectDist = await (0, nx_1.getDistForApp)(context);
-    const version = (0, nx_1.getVersion)(context);
+    const projectGraph = (0, nx_1.getProjectFromGraph)(context);
+    const projectRoot = projectGraph.data.root;
+    const projectDist = await (0, nx_1.getDistForApp)(projectGraph);
+    const version = (0, nx_1.getVersion)(projectDist);
     await (0, docker_1.publishDocker)(options, context, version, projectRoot, isDryRun);
     await (0, helm_1.publishHelm)(options, context, version, projectRoot, projectDist, isDryRun);
+    await (0, lambda_1.publishLambda)(options, context, version, projectRoot, projectDist, isDryRun);
     return {
         success: true,
     };

package/src/executors/publisher/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,uCAA0D;AAC1D,qCAAwC;AACxC,iCAAoC;AAGpC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,CAAA;IAC7E,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,OAAO,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,OAAO,CAAC,CAAA;IAEnC,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IACrE,MAAM,IAAA,kBAAW,EACf,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/executor.ts"],"names":[],"mappings":";;AAEA,8CAI8B;AAC9B,qCAAwC;AACxC,iCAAoC;AACpC,qCAAwC;AAGxC,MAAM,WAAW,GAGuB,KAAK,EAC3C,OAAiC,EACjC,OAAwB,EACxB,EAAE;IACF,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,KAAK,MAAM,IAAI,OAAO,CAAC,MAAM,IAAI,KAAK,CAAA;IAC7E,MAAM,YAAY,GAAG,IAAA,wBAAmB,EAAC,OAAO,CAAC,CAAA;IACjD,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAA;IAC1C,MAAM,WAAW,GAAG,MAAM,IAAA,kBAAa,EAAC,YAAY,CAAC,CAAA;IACrD,MAAM,OAAO,GAAG,IAAA,eAAU,EAAC,WAAW,CAAC,CAAA;IAEvC,MAAM,IAAA,sBAAa,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IACrE,MAAM,IAAA,kBAAW,EACf,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IACD,MAAM,IAAA,sBAAa,EACjB,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,WAAW,EACX,QAAQ,CACT,CAAA;IAED,OAAO;QACL,OAAO,EAAE,IAAI;KACd,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}

package/src/executors/publisher/helm.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishHelm = publishHelm;
 const tslib_1 = require("tslib");
 const fs = require("node:fs");
-const aws_auth_1 = require("../../utils/aws-auth");
-const github_1 = require("../../utils/github");
+const aws_auth_1 = require("../../utils/common/aws-auth");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
+const tsh_1 = require("../../utils/common/tsh");
 const helm_1 = require("../../utils/helm");
-const logger_1 = require("../../utils/logger");
-const tsh_1 = require("../../utils/tsh");
 async function publishHelm(options, context, version, projectRoot, projectDist, isDryRun) {
     const env_1 = { stack: [], error: void 0, hasError: false };
     try {

package/src/executors/publisher/helm.js.map

@@ -1 +1 @@
-{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../src/executors/publisher/helm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"helm.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/helm.ts"],"names":[],"mappings":"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"}

package/src/executors/publisher/lambda.d.ts

@@ -0,0 +1,3 @@
+import { ExecutorContext } from '@nx/devkit';
+import { PublisherExecutorOptions } from './schema';
+export declare function publishLambda(options: PublisherExecutorOptions, context: ExecutorContext, version: string, projectRoot: string, projectDist: string, isDryRun: boolean): Promise<void>;

package/src/executors/publisher/lambda.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.publishLambda = publishLambda;
+const path_1 = require("path");
+const aws_auth_1 = require("../../utils/common/aws-auth");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
+const s3_1 = require("../../utils/common/s3");
+const lambda_1 = require("../../utils/lambda/lambda");
+const oci_1 = require("../../utils/lambda/oci");
+const publish_1 = require("../../utils/lambda/publish");
+async function publishLambda(options, context, version, projectRoot, projectDist, isDryRun) {
+    const gitBranchName = await (0, github_1.getSanitizedCurrentGitBranch)();
+    const repoUrl = await (0, github_1.getSanitizedCurrentGitRepoUrl)();
+    const repoName = repoUrl.split('/').pop() ?? 'unknown-repo';
+    const zipName = `${context.projectName}-${version}.zip`;
+    const zipFileNameS3 = `${options.lambdaBucket}/${repoName}/${context.projectName}/${zipName}`;
+    if (!gitBranchName)
+        throw new Error('Unable to get current Git branch');
+    if (!options.lambdaRegistry) {
+        logger_1.consola.error('No lambda registry provided, add "lambdaRegistry" to your project.json metadata');
+        return;
+    }
+    if (!options.lambdaStacks) {
+        logger_1.consola.error('No lambda spacelift stacks provided, add "lambdaStacks" to your project.json metadata');
+        return;
+    }
+    if (!options.lambdaFunctions) {
+        logger_1.consola.error('No lambda functions provided, add "lambdaFunctions" to your project.json metadata');
+        return;
+    }
+    if (isDryRun) {
+        logger_1.consola.box(`Would have published lambda artefact to S3 ${zipFileNameS3} and ECR ${process.env.AWS_ECR_REGISTRY}/${options.lambdaRegistry}:${version}  but --dry-run is enabled`);
+        return;
+    }
+    await (0, aws_auth_1.checkAwsAuth)();
+    logger_1.consola.box(`Publishing the lambda artefact ${zipFileNameS3}`);
+    logger_1.consola.info(`Zipping ${zipName} from ${projectDist}`);
+    await (0, lambda_1.createZip)(projectDist, zipName);
+    const zipPath = (0, path_1.join)(projectDist, zipName);
+    logger_1.consola.info(`Uploading ${zipPath} to S3 at ${zipFileNameS3}`);
+    await (0, s3_1.pushToS3)(zipPath, zipFileNameS3);
+    logger_1.consola.info(`Creating Spacelift Lambda version for ${zipFileNameS3}`);
+    await (0, publish_1.createLambdaVersion)(options.lambdaStacks, options.lambdaFunctions, version);
+    const packageJsonPath = (0, path_1.join)(projectDist, 'package.json');
+    logger_1.consola.info(`Pushing empty image to ECR ${process.env.AWS_ECR_REGISTRY}/${options.lambdaRegistry}:${version}`);
+    await (0, oci_1.pushImageToEcr)(options.lambdaRegistry, version, packageJsonPath);
+    logger_1.consola.success('Lambda artifact successfully pushed to S3!');
+}
+//# sourceMappingURL=lambda.js.map

package/src/executors/publisher/lambda.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lambda.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/publisher/lambda.ts"],"names":[],"mappings":";;AAgBA,sCAuEC;AAvFD,+BAA2B;AAI3B,0DAA0D;AAC1D,sDAGkC;AAClC,sDAAmD;AACnD,8CAAgD;AAChD,sDAAqD;AACrD,gDAAuD;AACvD,wDAAgE;AAGzD,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,WAAmB,EACnB,QAAiB;IAEjB,MAAM,aAAa,GAAG,MAAM,IAAA,qCAA4B,GAAE,CAAA;IAE1D,MAAM,OAAO,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,IAAI,cAAc,CAAA;IAE3D,MAAM,OAAO,GAAG,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,MAAM,CAAA;IACvD,MAAM,aAAa,GAAG,GAAG,OAAO,CAAC,YAAY,IAAI,QAAQ,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,EAAE,CAAA;IAE7F,IAAI,CAAC,aAAa;QAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;IAEvE,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;QAC5B,gBAAO,CAAC,KAAK,CACX,iFAAiF,CAClF,CAAA;QACD,OAAM;IACR,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;QAC1B,gBAAO,CAAC,KAAK,CACX,uFAAuF,CACxF,CAAA;QACD,OAAM;IACR,CAAC;IAED,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,gBAAO,CAAC,KAAK,CACX,mFAAmF,CACpF,CAAA;QACD,OAAM;IACR,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,gBAAO,CAAC,GAAG,CACT,8CAA8C,aAAa,YAAY,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,4BAA4B,CACrK,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,IAAA,uBAAY,GAAE,CAAA;IACpB,gBAAO,CAAC,GAAG,CAAC,kCAAkC,aAAa,EAAE,CAAC,CAAA;IAE9D,gBAAO,CAAC,IAAI,CAAC,WAAW,OAAO,SAAS,WAAW,EAAE,CAAC,CAAA;IACtD,MAAM,IAAA,kBAAS,EAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAErC,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,CAAA;IAC1C,gBAAO,CAAC,IAAI,CAAC,aAAa,OAAO,aAAa,aAAa,EAAE,CAAC,CAAA;IAC9D,MAAM,IAAA,aAAQ,EAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAEtC,gBAAO,CAAC,IAAI,CAAC,yCAAyC,aAAa,EAAE,CAAC,CAAA;IAEtE,MAAM,IAAA,6BAAmB,EACvB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,eAAe,EACvB,OAAO,CACR,CAAA;IAED,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAA;IACzD,gBAAO,CAAC,IAAI,CACV,8BAA8B,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,OAAO,CAAC,cAAc,IAAI,OAAO,EAAE,CAClG,CAAA;IACD,MAAM,IAAA,oBAAc,EAAC,OAAO,CAAC,cAAc,EAAE,OAAO,EAAE,eAAe,CAAC,CAAA;IAEtE,gBAAO,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAA;AAC/D,CAAC"}

package/src/executors/publisher/schema.d.ts

@@ -0,0 +1,14 @@
+export interface PublisherExecutorSchema {} // eslint-disable-line
+export interface PublisherExecutorOptions {
+  chartRegistry: string
+  ecrRegistry: string
+  ociEcrRegistry?: string
+  isPublicRegistry?: boolean
+  helmChartFolder?: string
+  extraReleaseTags?: string[]
+  dryRun?: boolean
+  lambdaBucket?: string
+  lambdaRegistry?: string
+  lambdaStacks?: string[]
+  lambdaFunctions?: string[]
+}

package/src/executors/publisher/schema.json

@@ -39,6 +39,23 @@
       "type": "boolean",
       "description": "Whether to run in dry run mode. When true, shows what would be published without actually publishing.",
       "default": false
+    },
+    "lambdaBucket": {
+      "type": "string",
+      "description": "The S3 bucket for lambda",
+      "default": "payfit-shared-lambda-artifacts"
+    },
+    "lambdaRegistry": {
+      "type": "string",
+      "description": "The OCI registry for lambda"
+    },
+    "lambdaStacks": {
+      "type": "array",
+      "description": "The list of stacks to publish the lambda to"
+    },
+    "lambdaFunctions": {
+      "type": "array",
+      "description": "The list of lambda functions inside the workload"
     }
   },
   "required": []

package/src/executors/release/executor.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const release_1 = require("nx/release");
-const circleci_1 = require("../../utils/circleci");
-const github_1 = require("../../utils/github");
-const logger_1 = require("../../utils/logger");
-const tsh_1 = require("../../utils/tsh");
+const circleci_1 = require("../../utils/common/circleci");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
+const tsh_1 = require("../../utils/common/tsh");
 const runExecutor = async (options, context) => {
     const isDryRun = process.env.NX_DRY_RUN === 'true' || options.dryRun || false;
     if ((0, circleci_1.isCircleCIRunner)()) {

package/src/executors/release/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/release/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../packages/nx-core/src/executors/release/executor.ts"],"names":[],"mappings":"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"}

package/src/executors/release/schema.d.ts

@@ -0,0 +1,9 @@
+export interface ReleaseExecutorSchema {} // eslint-disable-line
+export interface ReleaseExecutorOptions {
+  skipPublish?: boolean
+  preRelease?: boolean
+  dryRun?: boolean
+  verbose?: boolean
+  groups?: string[]
+  specifier?: string
+}

package/src/generators/init/files/.circleci/config.yml.template

@@ -78,14 +78,11 @@ jobs:
       - checkout
       - node/install-packages: *install_packages
       - nx/set-shas: *nx_set_shas_option
-      - run: npx nx affected -t build
+      - run: npx nx run-many -t build
       - persist_to_workspace:
           root: '.'
           paths:
             - dist
-            - apps/*/dist
-            - packages/*/dist
-            - libs/*/dist
 
   test:
     <<: *setup_env_node
@@ -94,6 +91,8 @@ jobs:
       - node/install-packages: *install_packages
       - nx/set-shas: *nx_set_shas_option
       - run: npx nx affected -t test
+      - store_test_results:
+          path: test-results
 
   publish:
     <<: *setup_env_machine
@@ -118,6 +117,15 @@ jobs:
             tar -xzf teleport-v17.4.6-linux-amd64-bin.tar.gz
             cd teleport
             sudo ./install
+      - run:
+          name: 'Install Oras'
+          command: |
+            VERSION="1.2.2"
+            curl -LO "https://github.com/oras-project/oras/releases/download/v${VERSION}/oras_${VERSION}_linux_amd64.tar.gz"
+            mkdir -p oras-install/
+            tar -zxf oras_${VERSION}_*.tar.gz -C oras-install/
+            sudo mv oras-install/oras /usr/local/bin/
+            rm -rf oras_${VERSION}_*.tar.gz oras-install/
       - run:
           name: Release
           command: |

package/src/generators/init/init.d.ts

@@ -2,12 +2,6 @@ import { Tree } from '@nx/devkit';
 import { InitGeneratorSchema } from './schema';
 export declare function extractMetadataFromCircleCI(circleciContent: string, tree: Tree): Promise<Record<string, string>>;
 export declare function injectMetadata(tree: Tree, projectRoot: string, metadata: Record<string, string>): void;
-/**
- * Make sure the package.json publish config have correct default values
- * @param tree
- * @param packageJsonPath
- * @param shouldBePublished
- */
-export declare function processPackageJsonPublishConfig(tree: Tree, packageJsonPath: string, shouldBePublished?: boolean): void;
+export declare function processPackageJsonPublishConfig(tree: Tree, packageJsonPath: string): Promise<void>;
 export declare function initGenerator(tree: Tree, options?: InitGeneratorSchema): Promise<import("@nx/devkit").GeneratorCallback>;
 export default initGenerator;

package/src/generators/init/init.js

@@ -7,8 +7,8 @@ exports.initGenerator = initGenerator;
 const path = require("path");
 const devkit_1 = require("@nx/devkit");
 const yaml = require("yaml");
-const github_1 = require("../../utils/github");
-const logger_1 = require("../../utils/logger");
+const github_1 = require("../../utils/common/github");
+const logger_1 = require("../../utils/common/logger");
 const METADATA_EXTRACTORS = [
     {
         jobType: 'payfit-aws-ecr/build-and-push',
@@ -91,24 +91,15 @@ function injectMetadata(tree, projectRoot, metadata) {
         return projectJson;
     });
 }
-/**
- * Make sure the package.json publish config have correct default values
- * @param tree
- * @param packageJsonPath
- * @param shouldBePublished
- */
-function processPackageJsonPublishConfig(tree, packageJsonPath, shouldBePublished = false) {
-    if (!tree.exists(packageJsonPath))
-        return;
+async function processPackageJsonPublishConfig(tree, packageJsonPath) {
     (0, devkit_1.updateJson)(tree, packageJsonPath, packageJson => {
-        // we force apply this config to make sure we're not publishing anything publicly,
-        // user can always opt out afterward
-        packageJson.publishConfig = {
-            access: 'restricted',
-        };
-        packageJson.private = true;
-        if (shouldBePublished) {
-            delete packageJson.private; // should be removed to be published to npm
+        if (packageJson.private === undefined) {
+            packageJson.private = true;
+        }
+        else if (packageJson.private === false && !packageJson.publishConfig) {
+            packageJson.publishConfig = {
+                access: 'restricted',
+            };
         }
         return packageJson;
     });
@@ -129,39 +120,67 @@ async function processCircleCIMetadata(tree, projectCircleCIPath, projectRoot) {
     });
 }
 function injectNxReleaseConfiguration(tree, packageJsonName) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.release = {
-        projectsRelationship: 'independent',
-        projects: ['*', `!${packageJsonName}`],
-        releaseTagPattern: '{projectName}-{version}',
-        changelog: {
-            projectChangelogs: {
-                createRelease: 'github',
-                file: false,
+    (0, devkit_1.updateJson)(tree, 'nx.json', nxJson => {
+        nxJson.release = {
+            projectsRelationship: 'independent',
+            projects: ['*', `!${packageJsonName}`],
+            releaseTagPattern: '{projectName}-{version}',
+            changelog: {
+                projectChangelogs: {
+                    createRelease: 'github',
+                    file: false,
+                },
+                automaticFromRef: true,
+                git: {
+                    commit: false,
+                    tag: true,
+                },
             },
-            automaticFromRef: true,
-            git: {
-                commit: false,
-                tag: true,
+            version: {
+                useLegacyVersioning: false,
+                currentVersionResolver: 'git-tag',
+                fallbackCurrentVersionResolver: 'disk',
+                specifierSource: 'conventional-commits',
+                manifestRootsToUpdate: ['{workspaceRoot}/dist/{projectRoot}'],
+                preserveLocalDependencyProtocols: false,
             },
-        },
-        version: {
-            useLegacyVersioning: false,
-            currentVersionResolver: 'git-tag',
-            fallbackCurrentVersionResolver: 'disk',
-            specifierSource: 'conventional-commits',
-            preserveLocalDependencyProtocols: false,
-        },
-    };
-    // Initialize plugins array if it doesn't exist
-    nxJson.plugins = nxJson.plugins ?? [];
-    // Add @payfit/nx-core plugin if it doesn't already exist
-    if (!nxJson.plugins.includes('@payfit/nx-core')) {
-        nxJson.plugins.push('@payfit/nx-core');
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+        };
+        // Initialize plugins array if it doesn't exist
+        nxJson.plugins = nxJson.plugins ?? [];
+        // Add @payfit/nx-core plugin if it doesn't already exist
+        if (!nxJson.plugins.includes('@payfit/nx-core')) {
+            nxJson.plugins.push('@payfit/nx-core');
+        }
+        // Initialize nx-release-publish target default
+        nxJson.targetDefaults = nxJson.targetDefaults ?? [];
+        if (!nxJson.targetDefaults['nx-release-publish']) {
+            nxJson.targetDefaults['nx-release-publish'] = {
+                options: {
+                    packageRoot: '{workspaceRoot}/dist/{projectRoot}',
+                },
+            };
+        }
+        const outputPath = '{workspaceRoot}/dist/{projectRoot}';
+        // Inject the build output path for the release
+        if (!nxJson.targetDefaults['build']) {
+            nxJson.targetDefaults['build'] = {
+                options: {
+                    outputPath,
+                },
+            };
+        }
+        else if (!nxJson.targetDefaults['build'].options) {
+            nxJson.targetDefaults['build'].options = {
+                outputPath,
+            };
+        }
+        else {
+            nxJson.targetDefaults['build'].options.outputPath = outputPath;
+        }
+        return nxJson;
+    });
 }
-function injectRootPackageJsonConfiguration(tree) {
+function injectPackageJsonConfiguration(tree) {
     (0, devkit_1.updateJson)(tree, 'package.json', packageJson => {
         if (!packageJson.nx) {
             packageJson.nx = {
@@ -178,23 +197,24 @@ function injectRootPackageJsonConfiguration(tree) {
 function injectRootProjectJsonConfiguration(tree, packageJsonName) {
     if (tree.exists('project.json')) {
         (0, devkit_1.updateJson)(tree, 'project.json', projectJson => {
-            const projectConfig = projectJson;
-            if (!projectConfig.targets) {
-                projectConfig.targets = {
+            if (!projectJson.targets) {
+                projectJson.targets = {
                     release: {
                         executor: '@payfit/nx-core:release',
                         cache: false,
                     },
                 };
             }
-            else if (!projectConfig.targets['release']) {
-                projectConfig.targets['release'] = {
+            else if (!projectJson.targets['release']) {
+                projectJson.targets['release'] = {
                     executor: '@payfit/nx-core:release',
                     cache: false,
                 };
             }
-            projectConfig.name = packageJsonName;
-            return projectConfig;
+            if (projectJson.name !== packageJsonName) {
+                projectJson.name = packageJsonName;
+            }
+            return projectJson;
         });
     }
     else {
@@ -217,22 +237,25 @@ function getPackageJsonName(tree) {
         ? packageJson?.name
         : `@payfit/${packageJson?.name}`;
 }
-// For each project, we need to remove the github, version, npm as there not used anymore
-function injectProjectJsonConfiguration(tree, projectName, options) {
-    const projectJson = (0, devkit_1.readProjectConfiguration)(tree, projectName);
-    let existingNpmTarget = false;
-    for (const targetName in projectJson.targets) {
-        if (targetName === 'npm')
-            existingNpmTarget = true;
-        const inferedTargets = ['github', 'version', 'npm'];
-        if (inferedTargets.includes(targetName)) {
-            delete projectJson.targets[targetName];
-        }
+// For each project, we need to remove the github, version
+// We should also remove the lint and test targets as they should be infered
+// if there is a eslint.json or jest.config.js/vite config file
+function removeInferedNxProjectConfiguration(tree, projectRoot) {
+    const nxJsonPath = path.join(projectRoot, 'project.json');
+    if (tree.exists(nxJsonPath)) {
+        (0, devkit_1.updateJson)(tree, nxJsonPath, nxJson => {
+            const inferedTargets = ['github', 'version'];
+            inferedTargets.forEach(target => {
+                if (nxJson.targets?.[target]) {
+                    delete nxJson.targets[target];
+                }
+            });
+            return nxJson;
+        });
     }
-    processPackageJsonPublishConfig(tree, path.join(projectJson.root, 'package.json'), existingNpmTarget); // relying on the existing target name Npm to know if the package should be published or not
-    (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectJson);
 }
 async function initGenerator(tree, options = {}) {
+    const workspaceRoot = `.`;
     // Check for each project if we can find a template.yaml or a cdk.json file
     // If it's the case we should keep the continuation jobs in the .circleci/config.yml,
     // the .circleci/shared-config.yml
@@ -246,9 +269,13 @@ async function initGenerator(tree, options = {}) {
         const templateYamlPath = path.join(projectRoot, 'template.yaml');
         const cdkJsonPath = path.join(projectRoot, 'cdk.json');
         const projectCircleCIPath = path.join(projectRoot, '.circleci/config.yml');
+        const packageJsonPath = path.join(projectRoot, 'package.json');
         if (tree.exists(projectCircleCIPath)) {
             await processCircleCIMetadata(tree, projectCircleCIPath, projectRoot);
         }
+        if (tree.exists(packageJsonPath)) {
+            await processPackageJsonPublishConfig(tree, packageJsonPath);
+        }
         // Check if either file exists, this may need to be adjusted based on serverless autodiscover pattern
         if (tree.exists(templateYamlPath) || tree.exists(cdkJsonPath)) {
             hasCdkOrTemplateFile = true;
@@ -259,20 +286,21 @@ async function initGenerator(tree, options = {}) {
                 tree.delete(projectCircleCIPath);
             }
         }
-        injectProjectJsonConfiguration(tree, projectName, options);
     }
     // If there is no project with a template.yaml or cdk.json file,
     // we can delete the .circleci/shared-config.yml file
-    const sharedConfigPath = '.circleci/shared-config.yml';
-    if (!hasCdkOrTemplateFile && tree.exists(sharedConfigPath)) {
+    if (!hasCdkOrTemplateFile) {
         logger_1.consola.info('No project with a template.yaml or cdk.json file found, deleting .circleci/shared-config.yml');
-        tree.delete(sharedConfigPath);
+        const sharedConfigPath = path.join(workspaceRoot, '.circleci/shared-config.yml');
+        if (tree.exists(sharedConfigPath)) {
+            tree.delete(sharedConfigPath);
+        }
     }
     const packageJsonName = getPackageJsonName(tree);
     // Delete the .circleci/config.yml file if it exists
-    tree.delete('.circleci/config.yml');
+    tree.delete(path.join(workspaceRoot, '.circleci/config.yml'));
     // Generate the .circleci/config.yml file
-    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), '.', {
+    (0, devkit_1.generateFiles)(tree, path.join(__dirname, 'files'), workspaceRoot, {
         queuing_release: options.queuing_release ?? true,
         keepContinuationJobs: hasCdkOrTemplateFile,
         packageJsonName,
@@ -280,11 +308,18 @@ async function initGenerator(tree, options = {}) {
     // Patch the nx.json file with the nx release default configuration
     injectNxReleaseConfiguration(tree, packageJsonName);
     // Patch root package.json file
-    injectRootPackageJsonConfiguration(tree);
+    injectPackageJsonConfiguration(tree);
     // Patch or create root project.json file
     injectRootProjectJsonConfiguration(tree, packageJsonName);
-    const installCallback = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/conformance': '^3' }, 'package.json', false);
+    // For each project, remove the infered targets
+    if (options.remove_infered_targets) {
+        for (const [projectName, projectConfig] of projects.entries()) {
+            const projectRoot = projectConfig.root;
+            removeInferedNxProjectConfiguration(tree, projectRoot);
+        }
+    }
     await (0, devkit_1.formatFiles)(tree);
+    const installCallback = (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@nx/conformance': '^3' }, 'package.json', false);
     return (0, devkit_1.runTasksInSerial)(installCallback);
 }
 exports.default = initGenerator;