@aligent/nx-cdk 0.8.1 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aligent/nx-cdk",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "type": "commonjs",
   "main": "./src/index.js",
   "typings": "./src/index.d.ts",
@@ -10,7 +10,7 @@
     "directory": "packages/nx-cdk"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.2",
+    "@nx/devkit": "22.7.5",
     "ts-morph": "^27.0.2"
   },
   "generators": "./generators.json",

package/src/generators/helpers/configs/base-package/package.json

@@ -11,53 +11,50 @@
     "typecheck": "nx affected -t typecheck",
     "typecheck:all": "nx run-many -t typecheck",
     "audit": "nx run-many -t lint typecheck test --configuration coverage --skip-nx-cache",
-    "pg:synth": "nx run application:pg:synth --bundle-mode=dev --profile playground",
-    "pg:deploy": "nx run application:pg:deploy --bundle-mode=dev --method=direct --require-approval never --profile playground",
-    "pg:diff": "nx run application:pg:diff --profile playground",
-    "pg:destroy": "nx run application:pg:destroy --profile playground",
+    "pg:synth": "nx run application:pg:synth --mode=development --profile playground",
+    "pg:deploy": "nx run application:pg:deploy --mode=development --method=direct --require-approval never --profile playground",
+    "pg:diff": "nx run application:pg:diff --mode=development --profile playground",
+    "pg:destroy": "nx run application:pg:destroy --mode=development --profile playground",
     "postinstall": "[ -d .git ] && git config core.hooksPath '.git-hooks' && chmod +x .git-hooks/* || true"
   },
   "dependencies": {
     "@aligent/microservice-util-lib": "^1.2.0"
   },
   "devDependencies": {
-    "@aligent/cdk-aspects": "^0.5.5",
-    "@aligent/cdk-nodejs-function-from-entry": "^0.2.1",
-    "@aligent/cdk-step-function-from-file": "^0.5.1",
-    "@aligent/nx-openapi": "^2.1.1",
-    "@aligent/ts-code-standards": "^4.2.1",
-    "@nx/eslint": "22.1.3",
-    "@nx/eslint-plugin": "22.1.3",
-    "@nx/js": "22.1.3",
-    "@nx/vitest": "22.1.3",
-    "@nx/workspace": "22.1.3",
-    "@swc-node/register": "^1.10.10",
-    "@swc/core": "^1.13.3",
-    "@swc/helpers": "^0.5.17",
-    "@types/aws-lambda": "^8.10.152",
-    "@types/node": "^22.17.0",
-    "@typescript-eslint/eslint-plugin": "8.44.0",
-    "@typescript-eslint/parser": "8.44.0",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
+    "@aligent/cdk-aspects": "^0.6.3",
+    "@aligent/cdk-nodejs-function-from-entry": "^0.2.3",
+    "@aligent/cdk-step-function-from-file": "^0.5.3",
+    "@aligent/nx-openapi": "^2.1.2",
+    "@aligent/ts-code-standards": "^5.0.0",
+    "@nx/eslint": "22.7.3",
+    "@nx/eslint-plugin": "22.7.3",
+    "@nx/js": "22.7.3",
+    "@nx/vite": "22.7.3",
+    "@nx/workspace": "22.7.3",
+    "@swc-node/register": "1.11.1",
+    "@swc/core": "1.15.8",
+    "@swc/helpers": "0.5.21",
+    "@types/aws-lambda": "^8.10.161",
+    "@typescript-eslint/eslint-plugin": "8.60.1",
+    "@typescript-eslint/parser": "8.60.1",
+    "@vitest/coverage-v8": "^4.1.8",
+    "@vitest/ui": "^4.1.8",
     "aws-cdk": "^2.1120.0",
     "aws-cdk-lib": "^2.251.0",
     "cdk-nag": "^2.38.2",
     "constructs": "^10.6.0",
-    "eslint": "^9.32.0",
+    "eslint": "^10.4.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
-    "fast-glob": "^3.3.3",
-    "jiti": "2.5.1",
-    "jsonc-eslint-parser": "^2.4.0",
-    "nx": "22.1.3",
-    "prettier": "^3.6.2",
-    "rolldown": "1.0.0-rc.1",
+    "eslint-plugin-import-x": "^4.16.2",
+    "jiti": "^2.7.0",
+    "jsonc-eslint-parser": "^3.1.0",
+    "nx": "22.7.3",
+    "prettier": "^3.8.3",
     "tslib": "^2.8.1",
-    "tsx": "^4.21.0",
-    "typescript": "~5.9.2",
-    "vite": "^7.2.6",
-    "vitest": "^3.2.4"
+    "tsx": "^4.22.3",
+    "typescript": "~6.0.3",
+    "vite": "^8.0.14",
+    "vitest": "^4.1.7"
   },
   "nx": {
     "includedScripts": []
@@ -68,5 +65,5 @@
     "libs/*",
     "services/*"
   ],
-  "packageManager": "yarn@4.12.0+sha512.f45ab632439a67f8bc759bf32ead036a1f413287b9042726b7cc4818b7b49e14e9423ba49b18f9e06ea4941c1ad062385b1d8760a8d5091a1a31e5f6219afca8"
+  "packageManager": "yarn@4.16.0+sha512.5374c94eb4ef6aa8188fb112f20c1aa6569f248d676c5e576e1fd2a1a4d8d87a96df65d9dfe1c2a0252cbe38bda46cf18d955005b81b43cc7607a5c9d56fd2b6"
 }

package/src/generators/helpers/configs/nxJson.js

@@ -9,7 +9,7 @@ exports.NX_JSON = {
     plugins: [
         { plugin: '@nx/eslint/plugin', options: {} },
         { plugin: '@nx/js/typescript', options: { build: false } },
-        { plugin: '@nx/vitest', options: {} },
+        { plugin: '@nx/vite', options: {} },
     ],
     namedInputs: {
         default: ['{projectRoot}/**/*', 'sharedGlobals'],
@@ -18,7 +18,7 @@ exports.NX_JSON = {
             '!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)',
             '!{projectRoot}/tests/*',
             '!{projectRoot}/tsconfig.spec.json',
-            '!{projectRoot}/vitest.config.m[jt]s',
+            '!{projectRoot}/vite.config.m[jt]s',
         ],
         sharedGlobals: [],
     },

package/src/generators/helpers/configs/tsConfigs.js

@@ -9,12 +9,11 @@ exports.TS_CONFIG_JSON = {
     references: [],
 };
 exports.TS_CONFIG_LIB_JSON = {
-    extends: BASE_CONFIG,
+    extends: './tsconfig.json',
     compilerOptions: {
-        baseUrl: '.',
         rootDir: 'src',
-        outDir: 'dist',
-        tsBuildInfoFile: 'dist/tsconfig.lib.tsbuildinfo',
+        outDir: 'out-tsc/lib',
+        tsBuildInfoFile: 'out-tsc/tsconfig.lib.tsbuildinfo',
         types: ['node'],
     },
     include: ['src/**/*.ts'],
@@ -22,7 +21,7 @@ exports.TS_CONFIG_LIB_JSON = {
     references: [],
 };
 exports.TS_CONFIG_SPEC_JSON = {
-    extends: BASE_CONFIG,
+    extends: './tsconfig.json',
     compilerOptions: {
         outDir: './out-tsc/vitest',
         types: ['vitest/globals', 'vitest/importMeta', 'node', 'vitest'],

package/src/generators/helpers/utilities.d.ts

@@ -4,7 +4,10 @@ interface PackageJsonInput {
     name: string;
     projectName: string;
     version: string;
-    nodeVersion: string;
+    nodeVersion: {
+        major: string;
+        full: string;
+    };
 }
 interface Service {
     name: string;

package/src/generators/helpers/utilities.js

@@ -29,6 +29,7 @@ function constructPackageJsonFile(input) {
     const config = readPackageJsonConfig();
     const devDependencies = Object.fromEntries(Object.entries({
         '@aligent/nx-cdk': input.version,
+        '@types/node': `^${input.nodeVersion.major}`,
         ...config.devDependencies,
     }).sort());
     const packageJson = Object.fromEntries(Object.entries({
@@ -37,7 +38,7 @@ function constructPackageJsonFile(input) {
         version: input.version,
         ...config,
         devDependencies,
-        engines: { node: `^${input.nodeVersion}` },
+        engines: { node: `^${input.nodeVersion.full}` },
         nx: { name: `${input.name}-int`, ...config.nx },
     }));
     return packageJson;

package/src/generators/preset/files/.gitignore.template

@@ -19,10 +19,9 @@
 !nx.json
 !package.json
 !prettier.config.mjs
-!rolldown.config.base.mjs
 !tsconfig.json
 !vitest.global.setup.mjs
-!vitest.config.base.mjs
+!vite.config.base.mjs
 
 # Package manager
 !.yarn

package/src/generators/preset/files/.yarnrc.yml.template

@@ -1,5 +1,9 @@
+enableScripts: true
+
 nodeLinker: node-modules
 
+npmMinimalAgeGate: '3d'
+
 plugins:
   - checksum: e5e6e2885ab0e6521b70b0af7c6d8ca2c75dcae2403706fc4600a783b339a6530a476dafb9450c9436ca4050eb6bdee9b62e6e2cebfecf1e81dd709a2480dc07
     path: .yarn/plugins/@yarnpkg/plugin-engines.cjs

package/src/generators/preset/files/application/package.json.template

@@ -4,6 +4,7 @@
   "main": "./bin/main.ts",
   "types": "./bin/main.ts",
   "nx": {
+    "projectType": "application",
     "tags": [
       "scope:application"
     ],

package/src/generators/preset/files/eslint.config.mjs.template

@@ -1,6 +1,7 @@
 import { eslintConfigs } from '@aligent/ts-code-standards';
 import nxEslintPlugin from '@nx/eslint-plugin';
-import jsonParser from 'jsonc-eslint-parser';
+import { importX } from 'eslint-plugin-import-x';
+import * as jsonParser from 'jsonc-eslint-parser';
 
 const eslintBaseConfig = [
     ...eslintConfigs.base,
@@ -18,7 +19,7 @@ const eslintBaseConfig = [
     },
     {
         files: ['**/*.ts'],
-        plugins: { '@nx': nxEslintPlugin },
+        plugins: { '@nx': nxEslintPlugin, 'import-x': importX },
         rules: {
             '@nx/enforce-module-boundaries': [
                 'error',
@@ -40,6 +41,14 @@ const eslintBaseConfig = [
                     ],
                 },
             ],
+            'import-x/no-extraneous-dependencies': [
+                'warn',
+                {
+                    optionalDependencies: false,
+                    peerDependencies: false,
+                    packageDir: ['.', '..', '../..'],
+                },
+            ],
             'no-console': 'warn',
         },
     },

package/src/generators/preset/files/libs/infra/eslint.config.mjs.template

@@ -1,20 +1,3 @@
-import eslintPluginImport from 'eslint-plugin-import';
 import baseConfig from '../../eslint.config.mjs';
 
-export default [
-    ...baseConfig,
-    {
-        files: ['**/*.ts'],
-        plugins: { import: eslintPluginImport },
-        rules: {
-            'import/no-extraneous-dependencies': [
-                'warn',
-                {
-                    optionalDependencies: false,
-                    peerDependencies: false,
-                    packageDir: ['.', '..', '../..'],
-                },
-            ],
-        },
-    },
-];
+export default [...baseConfig];

package/src/generators/preset/files/libs/infra/package.json.template

@@ -12,6 +12,7 @@
     "./package.json": "./package.json"
   },
   "nx": {
+    "projectType": "library",
     "tags": [
       "scope:libs"
     ]

package/src/generators/preset/files/vite.config.base.mjs.template

@@ -0,0 +1,106 @@
+import { globSync } from 'node:fs';
+import { builtinModules } from 'node:module';
+import { extname, resolve } from 'node:path';
+import { defineConfig } from 'vite';
+
+export const baseConfig = defineConfig(() => {
+    return {
+        test: {
+            globals: true,
+            watch: false,
+            environment: 'node',
+            reporters: ['default'],
+            coverage: {
+                provider: 'v8',
+                exclude: [
+                    'node_modules/',
+                    '**/types',
+                    '*.mjs',
+                    '**/__data__',
+                    '**/dist',
+                    '**/out-tsc',
+                ],
+                thresholds: {
+                    branches: 80,
+                    functions: 80,
+                    lines: 80,
+                    statements: 80,
+                },
+            },
+            include: [
+                'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+                'tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+            ],
+            setupFiles: [
+                // Include the root setup file in all tests that extend this config
+                resolve(import.meta.dirname, './vitest.global.setup.mjs'),
+            ],
+        },
+    };
+});
+
+// ESM doesn't define __dirname/__filename. This shim ensures bundled CJS dependencies
+// that reference them won't throw a ReferenceError at runtime.
+// TODO: [MI-251] Support shims only when needed instead consider looking at tsup, tsdown and rollup shims plugins
+const shimBanner = `import { fileURLToPath as __shim_fileURLToPath } from 'node:url';
+import { dirname as __shim_dirname } from 'node:path';
+const __filename = __shim_fileURLToPath(import.meta.url);
+const __dirname = __shim_dirname(__filename);`;
+
+/**
+ * Creates Vite environments for bundling Lambda handlers using the Vite Environment API.
+ * Each handler file gets its own environment that outputs to dist/<entryName>/index.mjs.
+ *
+ * This uses Vite's built-in `mode` to control build behaviour.
+ * See https://vite.dev/guide/env-and-mode
+ */
+export function defineLambdaEnvironments(subPath, options = {}, envPrefix = 'lambda') {
+    // When running vitest, skip the Lambda environments entirely
+    if (process.env.VITEST === 'true') return {};
+
+    if (subPath.includes('..')) throw new Error('Invalid path provided');
+
+    const handlersPath = resolve(process.cwd(), subPath);
+    const handlers = globSync(`${handlersPath}/**/*.ts`);
+
+    const environments = {};
+    for (const handler of handlers) {
+        const bundledPath = handler.replace(`${handlersPath}/`, '');
+        const entryName = bundledPath.replace(extname(bundledPath), '');
+        const envName = `${envPrefix}_${entryName.replace(/[\\/]/g, '_')}`;
+
+        environments[envName] = {
+            resolve: { noExternal: true },
+            build: {
+                outDir: `dist/${entryName}`,
+                minify: options.mode === 'development' ? 'oxc' : false,
+                sourcemap: options.mode !== 'production',
+                platform: 'node',
+                rollupOptions: {
+                    input: { index: handler },
+                    moduleTypes: { ...options.moduleTypes },
+                    external: [...builtinModules, ...builtinModules.map(m => `node:${m}`)],
+                    output: {
+                        entryFileNames: 'index.mjs',
+                        format: 'esm',
+                        comments: { legal: false },
+                        codeSplitting: false,
+                        banner: shimBanner,
+                    },
+                },
+            },
+        };
+    }
+
+    return {
+        environments,
+        builder: {
+            buildApp: async builder => {
+                const lambdaEnvs = Object.entries(builder.environments)
+                    .filter(([name]) => name.startsWith(`${envPrefix}_`))
+                    .map(([, env]) => env);
+                await Promise.all(lambdaEnvs.map(env => builder.build(env)));
+            },
+        },
+    };
+}

package/src/generators/preset/preset.js

@@ -11,6 +11,9 @@ async function presetGenerator(tree, options) {
     const [nodeVersionMajor] = nodeVersion.split('.');
     const nameParts = (0, utilities_1.splitInputName)(name);
     const projectName = nameParts.join(' ');
+    if (!nodeVersionMajor) {
+        throw new Error(`Malformed NodeJs Version: ${nodeVersion}`);
+    }
     const templateVars = {
         ...options,
         projectName,
@@ -27,7 +30,7 @@ async function presetGenerator(tree, options) {
         name: options.name,
         projectName,
         version: (0, utilities_1.getGeneratorVersion)(),
-        nodeVersion,
+        nodeVersion: { major: nodeVersionMajor, full: nodeVersion },
     });
     (0, devkit_1.writeJson)(tree, 'package.json', packageJson);
     // Generate application's tsconfigs

package/src/generators/service/files/eslint.config.mjs.template

@@ -1,20 +1,3 @@
-import eslintPluginImport from 'eslint-plugin-import';
 import baseConfig from '../../eslint.config.mjs';
 
-export default [
-    ...baseConfig,
-    {
-        files: ['**/*.ts'],
-        plugins: { import: eslintPluginImport },
-        rules: {
-            'import/no-extraneous-dependencies': [
-                'warn',
-                {
-                    optionalDependencies: false,
-                    peerDependencies: false,
-                    packageDir: ['.', '..', '../..'],
-                },
-            ],
-        },
-    },
-];
+export default [...baseConfig];

package/src/generators/service/files/package.json.template

@@ -16,18 +16,19 @@
     "@libs/infra"
   ],
   "nx": {
+    "projectType": "library",
+    "tags": [
+      "scope:services"
+    ],
     "targets": {
       "build": {
         "executor": "nx:run-commands",
         "options": {
-          "command": "rolldown -c rolldown.config.mjs --environment BUNDLE_MODE:{args.bundle-mode}",
+          "command": "vite build --mode {args.mode}",
           "color": true,
           "cwd": "{projectRoot}"
         }
       }
-    },
-    "tags": [
-      "scope:services"
-    ]
+    }
   }
 }

package/src/generators/service/files/src/index.ts.template

@@ -1,6 +1,6 @@
-import { SharedInfraProps } from '@libs/infra';
-import { Stack, StackProps, Stage, Tags } from 'aws-cdk-lib';
-import { Construct } from 'constructs';
+import { type SharedInfraProps } from '@libs/infra';
+import { Stack, type StackProps, Stage, Tags } from 'aws-cdk-lib';
+import { type Construct } from 'constructs';
 
 /**
 * @important

package/src/generators/service/files/{vitest.config.mjs.template → vite.config.mjs.template}

@@ -1,10 +1,15 @@
-import { defineConfig, mergeConfig } from 'vitest/config';
-import { vitestBaseConfig } from '../../vitest.config.base.mjs';
+import { defineConfig, mergeConfig } from 'vite';
+import { baseConfig, defineLambdaEnvironments } from '../../vite.config.base.mjs';
 
 export default defineConfig(configEnv => {
+    const lambdaConfig = defineLambdaEnvironments('src/runtime/handlers', {
+        mode: configEnv.mode,
+    });
+
     return mergeConfig(
-        vitestBaseConfig(configEnv),
+        baseConfig(configEnv),
         defineConfig({
+            ...lambdaConfig,
             cacheDir: '../../node_modules/.vitest/<%= name %>',
             test: {
                 env: {

package/src/generators/preset/files/rolldown.config.base.mjs.template

@@ -1,46 +0,0 @@
-import fg from 'fast-glob';
-import { builtinModules } from 'node:module';
-import { extname, resolve } from 'node:path';
-import { defineConfig } from 'rolldown';
-
-/**
- * Prepare Rolldown config that bundles all typescript files in a single directory in to separate files
- * This is used to bundle lambda handlers with their own dependencies for separate upload to AWS Lambda
- *
- * @param {string} subPath Relative path to the handlers directory
- * @returns Rolldown config for multiple lambda handlers
- */
-export function defineLambdaConfig(subPath) {
-    if (subPath.includes('..')) throw new Error('Invalid path provided');
-    const handlersPath = resolve(process.cwd(), subPath);
-    const handlers = fg.sync(`${handlersPath}/**/*.ts`);
-
-    return handlers.map(handler => {
-        const bundledPath = handler.replace(`${handlersPath}/`, '');
-        const entryName = bundledPath.replace(extname(bundledPath), '');
-        const bundleMode = process.env.BUNDLE_MODE?.toLowerCase() || 'prd';
-
-        return defineConfig({
-            input: { [entryName]: handler },
-            platform: 'node',
-            tsconfig: 'tsconfig.lib.json',
-            logLevel: 'info',
-            watch: false,
-            external: [...builtinModules],
-            output: {
-                entryFileNames: '[name]/index.mjs',
-                format: 'esm',
-                sourcemap: bundleMode === 'prd' ? false : true,
-                // FIXME: [MI-251] Rolldown is still in RC and built-in minification is not production ready yet
-                minify: false,
-                legalComments: 'none',
-                inlineDynamicImports: true,
-                // TODO: [MI-251] Support shims only when needed instead consider looking at tsup, tsdown and rollup shims plugins
-                banner: `import { fileURLToPath } from 'node:url';
-import { dirname } from 'node:path';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);`,
-            },
-        });
-    });
-}

package/src/generators/preset/files/vitest.config.base.mjs.template

@@ -1,39 +0,0 @@
-import { resolve } from 'node:path';
-import { defineConfig } from 'vitest/config';
-
-// More information about mode: https://vite.dev/guide/env-and-mode.html#node-env-and-modes
-export const vitestBaseConfig = defineConfig(({ command, mode }) => {
-    return {
-        test: {
-            globals: true,
-            watch: false,
-            environment: 'node',
-            reporters: ['default'],
-            coverage: {
-                provider: 'v8',
-                exclude: [
-                    'node_modules/',
-                    '**/types',
-                    '*.mjs',
-                    '**/__data__',
-                    '**/dist',
-                    '**/out-tsc',
-                ],
-                thresholds: {
-                    branches: 80,
-                    functions: 80,
-                    lines: 80,
-                    statements: 80,
-                },
-            },
-            include: [
-                'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
-                'tests/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
-            ],
-            setupFiles: [
-                // Include the root setup file in all tests that extend this config
-                resolve(import.meta.dirname, './vitest.global.setup.mjs'),
-            ],
-        },
-    };
-});

package/src/generators/service/files/rolldown.config.mjs.template

@@ -1,3 +0,0 @@
-import { defineLambdaConfig } from '../../rolldown.config.base.mjs';
-
-export default defineLambdaConfig('src/runtime/handlers');