@aws/nx-plugin 0.2.0 → 0.2.1

package/src/ts/lib/__snapshots__/generator.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`ts lib generator > should generate library with custom directory > custom-dir-index.ts 1`] = `
 "export function hello() {
-    return "Hello!";
+  return "Hello!";
 }
 "
 `;
@@ -17,23 +17,11 @@ exports[`ts lib generator > should generate library with custom directory > cust
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../../coverage/libs/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -42,11 +30,23 @@ exports[`ts lib generator > should generate library with custom directory > cust
       "options": {
         "outputPath": "dist/libs/test-lib",
         "main": "libs/test-lib/src/index.ts",
-        "tsConfig": "libs/test-lib/tsconfig.lib.json",
+        "tsConfig": "libs/test-lib/tsconfig.json",
         "assets": [
           "libs/test-lib/*.md"
         ]
       }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/vite:test",
+      "outputs": [
+        "{options.reportsDirectory}"
+      ],
+      "options": {
+        "reportsDirectory": "../../coverage/libs/test-lib"
+      }
     }
   }
 }
@@ -56,7 +56,6 @@ exports[`ts lib generator > should generate library with custom directory > cust
 exports[`ts lib generator > should generate library with custom directory > custom-dir-tsconfig.json 1`] = `
 "{
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -66,14 +65,22 @@ exports[`ts lib generator > should generate library with custom directory > cust
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;
 
-exports[`ts lib generator > should generate library with custom scope > scoped-project.json 1`] = `
+exports[`ts lib generator > should generate library with default options > index.ts 1`] = `
+"export function hello() {
+  return "Hello!";
+}
+"
+`;
+
+exports[`ts lib generator > should generate library with default options > project.json 1`] = `
 "{
-  "name": "@custom/test-lib",
+  "name": "@proj/test-lib",
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "test-lib/src",
   "projectType": "library",
@@ -81,23 +88,11 @@ exports[`ts lib generator > should generate library with custom scope > scoped-p
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../coverage/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -106,38 +101,11 @@ exports[`ts lib generator > should generate library with custom scope > scoped-p
       "options": {
         "outputPath": "dist/test-lib",
         "main": "test-lib/src/index.ts",
-        "tsConfig": "test-lib/tsconfig.lib.json",
+        "tsConfig": "test-lib/tsconfig.json",
         "assets": [
           "test-lib/*.md"
         ]
       }
-    }
-  }
-}
-"
-`;
-
-exports[`ts lib generator > should generate library with default options > index.ts 1`] = `
-"export function hello() {
-    return "Hello!";
-}
-"
-`;
-
-exports[`ts lib generator > should generate library with default options > project.json 1`] = `
-"{
-  "name": "@proj/test-lib",
-  "$schema": "../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "test-lib/src",
-  "projectType": "library",
-  "tags": [],
-  "targets": {
-    "build": {
-      "dependsOn": [
-        "compile",
-        "lint",
-        "test"
-      ]
     },
     "lint": {
       "executor": "@nx/eslint:lint"
@@ -150,20 +118,6 @@ exports[`ts lib generator > should generate library with default options > proje
       "options": {
         "reportsDirectory": "../coverage/test-lib"
       }
-    },
-    "compile": {
-      "executor": "@nx/js:tsc",
-      "outputs": [
-        "{options.outputPath}"
-      ],
-      "options": {
-        "outputPath": "dist/test-lib",
-        "main": "test-lib/src/index.ts",
-        "tsConfig": "test-lib/tsconfig.lib.json",
-        "assets": [
-          "test-lib/*.md"
-        ]
-      }
     }
   }
 }
@@ -173,7 +127,6 @@ exports[`ts lib generator > should generate library with default options > proje
 exports[`ts lib generator > should generate library with default options > tsconfig.json 1`] = `
 "{
   "extends": "../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -183,14 +136,15 @@ exports[`ts lib generator > should generate library with default options > tscon
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;
 
 exports[`ts lib generator > should generate library with subdirectory > subdir-index.ts 1`] = `
 "export function hello() {
-    return "Hello!";
+  return "Hello!";
 }
 "
 `;
@@ -205,23 +159,11 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
   "targets": {
     "build": {
       "dependsOn": [
-        "compile",
         "lint",
+        "compile",
         "test"
       ]
     },
-    "lint": {
-      "executor": "@nx/eslint:lint"
-    },
-    "test": {
-      "executor": "@nx/vite:test",
-      "outputs": [
-        "{options.reportsDirectory}"
-      ],
-      "options": {
-        "reportsDirectory": "../../coverage/feature/test-lib"
-      }
-    },
     "compile": {
       "executor": "@nx/js:tsc",
       "outputs": [
@@ -230,11 +172,23 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
       "options": {
         "outputPath": "dist/feature/test-lib",
         "main": "feature/test-lib/src/index.ts",
-        "tsConfig": "feature/test-lib/tsconfig.lib.json",
+        "tsConfig": "feature/test-lib/tsconfig.json",
         "assets": [
           "feature/test-lib/*.md"
         ]
       }
+    },
+    "lint": {
+      "executor": "@nx/eslint:lint"
+    },
+    "test": {
+      "executor": "@nx/vite:test",
+      "outputs": [
+        "{options.reportsDirectory}"
+      ],
+      "options": {
+        "reportsDirectory": "../../coverage/feature/test-lib"
+      }
     }
   }
 }
@@ -244,7 +198,6 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-p
 exports[`ts lib generator > should generate library with subdirectory > subdir-tsconfig.json 1`] = `
 "{
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {},
   "files": [],
   "include": [],
   "references": [
@@ -254,7 +207,8 @@ exports[`ts lib generator > should generate library with subdirectory > subdir-t
     {
       "path": "./tsconfig.spec.json"
     }
-  ]
+  ],
+  "compilerOptions": {}
 }
 "
 `;

package/src/ts/lib/eslint.d.ts

@@ -3,5 +3,4 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { Tree } from '@nx/devkit';
-import { ConfigureProjectOptions } from './types';
-export declare const configureEslint: (tree: Tree, options: ConfigureProjectOptions) => Promise<void>;
+export declare const configureEslint: (tree: Tree) => Promise<void>;

package/src/ts/lib/eslint.js

@@ -10,22 +10,25 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const typescript_1 = require("typescript");
-const configureEslint = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
+const ast_1 = require("../../utils/ast");
+const configureEslint = (tree) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c;
     // Configure the lint task
-    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.fullyQualifiedName);
-    if (!projectConfiguration.targets.lint) {
-        projectConfiguration.targets.lint = {
-            executor: '@nx/eslint:lint',
-            options: {
-                fix: true,
-            },
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName, projectConfiguration);
+    let nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!((_a = nxJson.plugins) === null || _a === void 0 ? void 0 : _a.filter((e) => typeof e !== 'string').some((e) => e.plugin === '@nx/eslint/plugin'))) {
+        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { plugins: [
+                ...((_b = nxJson.plugins) !== null && _b !== void 0 ? _b : []),
+                {
+                    plugin: '@nx/eslint/plugin',
+                    options: {
+                        targetName: 'lint',
+                    },
+                },
+            ] }));
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['prettier', 'eslint-plugin-prettier']));
-    // Update or create eslint.config.cjs
-    const eslintConfigPath = 'eslint.config.cjs';
+    // Update or create eslint.config.mjs
+    const eslintConfigPath = 'eslint.config.mjs';
     if (tree.exists(eslintConfigPath)) {
         const eslintConfigContent = tree.read(eslintConfigPath).toString();
         const sourceFile = (0, tsquery_1.ast)(eslintConfigContent);
@@ -34,23 +37,13 @@ const configureEslint = (tree, options) => tslib_1.__awaiter(void 0, void 0, voi
         let updatedContent = sourceFile;
         // Add import if it doesn't exist
         if (existingImport.length === 0) {
-            const importDeclaration = typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
-                typescript_1.factory.createVariableDeclaration(typescript_1.factory.createIdentifier('eslintPluginPrettierRecommended'), undefined, undefined, typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('require'), undefined, [
-                    typescript_1.factory.createStringLiteral('eslint-plugin-prettier/recommended'),
-                ])),
-            ], typescript_1.NodeFlags.Const));
-            updatedContent = tsquery_1.tsquery.map(updatedContent, 'SourceFile', (node) => {
-                return typescript_1.factory.updateSourceFile(node, [
-                    importDeclaration,
-                    ...node.statements,
-                ]);
-            });
+            updatedContent = (0, tsquery_1.ast)((0, ast_1.singleImport)(tree, eslintConfigPath, 'eslintPluginPrettierRecommended', 'eslint-plugin-prettier/recommended'));
         }
-        // Check if eslintPluginPrettierRecommended exists in module.exports array
-        const existingPlugin = tsquery_1.tsquery.query(updatedContent, 'BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]) > ArrayLiteralExpression Identifier[name="eslintPluginPrettierRecommended"]');
+        // Check if eslintPluginPrettierRecommended exists in exports array
+        const existingPlugin = tsquery_1.tsquery.query(updatedContent, 'ExportAssignment > ArrayLiteralExpression Identifier[name="eslintPluginPrettierRecommended"]');
         // Add eslintPluginPrettierRecommended to array if it doesn't exist
         if (existingPlugin.length === 0) {
-            updatedContent = tsquery_1.tsquery.map(updatedContent, 'BinaryExpression:has(Identifier[name="module"]):has(Identifier[name="exports"]) > ArrayLiteralExpression', (node) => {
+            updatedContent = tsquery_1.tsquery.map(updatedContent, 'ExportAssignment > ArrayLiteralExpression', (node) => {
                 return typescript_1.factory.createArrayLiteralExpression([
                     typescript_1.factory.createIdentifier('eslintPluginPrettierRecommended'),
                     ...node.elements,
@@ -61,8 +54,8 @@ const configureEslint = (tree, options) => tslib_1.__awaiter(void 0, void 0, voi
         if (updatedContent !== sourceFile) {
             tree.write(eslintConfigPath, updatedContent.getFullText());
         }
-        const nxJson = (0, devkit_1.readNxJson)(tree);
-        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {})), { lint: {
+        nxJson = (0, devkit_1.readNxJson)(tree);
+        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_c = nxJson.targetDefaults) !== null && _c !== void 0 ? _c : {})), { lint: {
                     cache: true,
                     configurations: {
                         fix: {
@@ -71,8 +64,8 @@ const configureEslint = (tree, options) => tslib_1.__awaiter(void 0, void 0, voi
                     },
                     inputs: [
                         'default',
-                        '{workspaceRoot}/eslint.config.js',
-                        '{projectRoot}/eslint.config.js',
+                        '{workspaceRoot}/eslint.config.mjs',
+                        '{projectRoot}/eslint.config.mjs',
                     ],
                 } }) }));
     }

package/src/ts/lib/eslint.js.map

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

package/src/ts/lib/generator.js

@@ -11,12 +11,14 @@ const js_1 = require("@nx/js");
 const npm_scope_1 = require("../../utils/npm-scope");
 const ts_project_utils_1 = require("./ts-project-utils");
 const names_1 = require("../../utils/names");
+const path_1 = require("path");
+const format_1 = require("../../utils/format");
 /**
  * Returns details about the TS library to be created
  */
 const getTsLibDetails = (tree, schema) => {
     var _a, _b;
-    const scope = schema.scope ? `${schema.scope}/` : (0, npm_scope_1.getNpmScopePrefix)(tree);
+    const scope = (0, npm_scope_1.getNpmScopePrefix)(tree);
     const normalizedName = (0, names_1.toKebabCase)(schema.name);
     const fullyQualifiedName = `${scope}${normalizedName}`;
     const dir = (0, devkit_1.joinPathFragments)((_a = (0, names_1.toKebabCase)(schema.directory)) !== null && _a !== void 0 ? _a : '.', (_b = (0, names_1.toKebabCase)(schema.subDirectory)) !== null && _b !== void 0 ? _b : normalizedName);
@@ -28,7 +30,7 @@ exports.getTsLibDetails = getTsLibDetails;
  */
 const tsLibGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
     const { fullyQualifiedName, dir } = (0, exports.getTsLibDetails)(tree, schema);
-    yield (0, js_1.libraryGenerator)(tree, Object.assign(Object.assign({}, schema), { name: fullyQualifiedName, directory: dir, skipPackageJson: true, bundler: 'tsc', linter: 'eslint', unitTestRunner: 'vitest' }));
+    yield (0, js_1.libraryGenerator)(tree, Object.assign(Object.assign({}, schema), { name: (0, names_1.toKebabCase)(schema.name), directory: dir, skipPackageJson: true, bundler: 'tsc', linter: 'eslint', unitTestRunner: 'vitest' }));
     // Replace with simpler sample source code
     tree.delete((0, devkit_1.joinPathFragments)(dir, 'src'));
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)(dir), {
@@ -41,6 +43,36 @@ const tsLibGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void
         dir,
         fullyQualifiedName,
     });
+    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
+    const targets = projectConfiguration.targets;
+    targets['compile'] = {
+        executor: '@nx/js:tsc',
+        outputs: ['{options.outputPath}'],
+        options: {
+            outputPath: (0, devkit_1.joinPathFragments)('dist', dir),
+            main: (0, devkit_1.joinPathFragments)(dir, 'src/index.ts'),
+            tsConfig: (0, devkit_1.joinPathFragments)(dir, 'tsconfig.json'),
+            assets: [(0, devkit_1.joinPathFragments)(dir, '*.md')],
+        },
+    };
+    targets['build'] = {
+        dependsOn: ['lint', 'compile', 'test'],
+    };
+    targets['test'] = {
+        executor: '@nx/vite:test',
+        outputs: ['{options.reportsDirectory}'],
+        options: {
+            reportsDirectory: (0, devkit_1.joinPathFragments)((0, path_1.relative)((0, devkit_1.joinPathFragments)(tree.root, dir), tree.root), 'coverage', dir),
+        },
+    };
+    projectConfiguration.targets = Object.keys(targets)
+        .sort()
+        .reduce((obj, key) => {
+        obj[key] = targets[key];
+        return obj;
+    }, {});
+    (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
+    (0, format_1.formatFilesInSubtree)(tree);
     return () => {
         if (!schema.skipInstall) {
             (0, devkit_1.installPackagesTask)(tree);

package/src/ts/lib/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCAQoB;AAEpB,+BAA0C;AAC1C,qDAA0D;AAC1D,yDAAwD;AACxD,6CAAgD;AAWhD;;GAEG;AACI,MAAM,eAAe,GAAG,CAC7B,IAAU,EACV,MAA4B,EACd,EAAE;;IAChB,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC1E,MAAM,cAAc,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,GAAG,KAAK,GAAG,cAAc,EAAE,CAAC;IACvD,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAC3B,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,SAAS,CAAC,mCAAI,GAAG,EACpC,MAAA,IAAA,mBAAW,EAAC,MAAM,CAAC,YAAY,CAAC,mCAAI,cAAc,CACnD,CAAC;IACF,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;AACrC,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B;AACF;;GAEG;AACI,MAAM,cAAc,GAAG,CAC5B,IAAU,EACV,MAA4B,EACA,EAAE;IAC9B,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAA,uBAAe,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClE,MAAM,IAAA,qBAAgB,EAAC,IAAI,kCACtB,MAAM,KACT,IAAI,EAAE,kBAAkB,EACxB,SAAS,EAAE,GAAG,EACd,eAAe,EAAE,IAAI,EACrB,OAAO,EAAE,KAAK,EACd,MAAM,EAAE,QAAQ,EAChB,cAAc,EAAE,QAAQ,IACxB,CAAC;IACH,0CAA0C;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,IAAA,0BAAiB,EAAC,GAAG,CAAC,EACtB;QACE,kBAAkB;QAClB,SAAS,EAAE,IAAA,iCAAwB,GAAE,CAAC,IAAI;KAC3C,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IACF,IAAA,qCAAkB,EAAC,IAAI,EAAE;QACvB,GAAG;QACH,kBAAkB;KACnB,CAAC,CAAC;IACH,OAAO,GAAG,EAAE;QACV,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YACxB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAA,CAAC;AArCW,QAAA,cAAc,kBAqCzB;AACF,kBAAe,sBAAc,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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"}

package/src/ts/lib/schema.d.ts

@@ -9,7 +9,6 @@ export interface TsLibGeneratorSchema {
   //   unitTestRunner?: LibraryGeneratorSchema['unitTestRunner'];
   // TODO: test and consider exposing alternate bundlers
   // bundler?: LibraryGeneratorSchema['bundler'];
-  scope?: string;
   subDirectory?: string;
   skipInstall?: boolean;
 }

package/src/ts/lib/schema.json

@@ -17,12 +17,6 @@
       "x-prompt": "Which directory do you want to create the library in?",
       "x-priority": "important"
     },
-    "scope": {
-      "type": "string",
-      "description": "Scope for your package, e.g. @my-company. If omitted this will be inferred",
-      "pattern": "^@[a-z0-9-]+(?:/[a-z0-9-]+)?$",
-      "x-prompt": "What namespace would you like your library to have? i.e: @myapi"
-    },
     "subDirectory": {
       "type": "string",
       "description": "The sub directory the lib is placed in. By default this is the library name.",

package/src/ts/lib/ts-project-utils.js

@@ -7,7 +7,6 @@ exports.configureTsProject = void 0;
  */
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
-const generator_1 = require("../cjs-to-esm/generator");
 const npm_scope_1 = require("../../utils/npm-scope");
 const vitest_1 = require("./vitest");
 const eslint_1 = require("./eslint");
@@ -23,10 +22,10 @@ const configureTsProject = (tree, options) => {
                     : (_b = tsConfig.compilerOptions) === null || _b === void 0 ? void 0 : _b.module }) }));
     });
     const outDirToRootRelativePath = (0, path_1.relative)((0, path_1.join)(tree.root, options.dir), tree.root);
-    const distDir = (0, path_1.join)(outDirToRootRelativePath, 'dist', options.dir);
+    const distDir = (0, path_1.join)(outDirToRootRelativePath, 'dist');
     // Remove baseUrl and rootDir from the tsconfig.lib.json
     if (tree.exists((0, path_1.join)(options.dir, 'tsconfig.lib.json'))) {
-        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.lib.json'), (tsConfig) => (Object.assign(Object.assign({}, tsConfig), { compilerOptions: Object.assign(Object.assign({}, tsConfig.compilerOptions), { baseUrl: undefined, rootDir: undefined, outDir: distDir, tsBuildInfoFile: (0, path_1.join)(distDir, 'tsconfig.lib.tsbuildinfo') }), include: undefined })));
+        (0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.lib.json'), (tsConfig) => (Object.assign(Object.assign({}, tsConfig), { compilerOptions: Object.assign(Object.assign({}, tsConfig.compilerOptions), { baseUrl: undefined, rootDir: undefined, outDir: distDir, tsBuildInfoFile: (0, path_1.join)(distDir, options.dir, 'tsconfig.lib.tsbuildinfo') }) })));
     }
     // Update root project tsconfig
     (0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (tsConfig) => {
@@ -56,21 +55,7 @@ const configureTsProject = (tree, options) => {
     if (tree.exists((0, path_1.join)(options.dir, 'package.json'))) {
         tree.delete((0, path_1.join)(options.dir, 'package.json'));
     }
-    // Convert cjs files to esm for eslint configs and source code, including root monorepo config.
-    (0, generator_1.cjsToEsm)(tree, '.', {
-        include: ['eslint.config.js', '**/eslint.config.js', '**/src/**/*.ts'],
-    });
-    // Build task should both test and lint, so move build to compile and compose build as compile + test + lint
-    const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, options.fullyQualifiedName);
-    if (projectConfiguration.targets.build &&
-        projectConfiguration.targets.build.executor === '@nx/js:tsc') {
-        projectConfiguration.targets.compile = projectConfiguration.targets.build;
-        projectConfiguration.targets.build = {
-            dependsOn: ['compile', 'lint', 'test'],
-        };
-        (0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName, projectConfiguration);
-    }
-    (0, eslint_1.configureEslint)(tree, options);
+    (0, eslint_1.configureEslint)(tree);
     (0, vitest_1.configureVitest)(tree, options);
 };
 exports.configureTsProject = configureTsProject;

package/src/ts/lib/ts-project-utils.js.map

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

package/src/ts/lib/vitest.js

@@ -66,13 +66,11 @@ const configureVitest = (tree, options) => {
         });
         tree.write(configPath, printer.printNode(typescript_1.default.EmitHint.Unspecified, sourceFile, originalSourceFile));
         const nxJson = (0, devkit_1.readNxJson)(tree);
-        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {})), { test: {
-                    configurations: {
+        (0, devkit_1.updateNxJson)(tree, Object.assign(Object.assign({}, nxJson), { targetDefaults: Object.assign(Object.assign({}, ((_a = nxJson.targetDefaults) !== null && _a !== void 0 ? _a : {})), { '@nx/vite:test': Object.assign({ cache: true, inputs: ['default', '^production'], configurations: {
                         'update-snapshot': {
                             args: '--update',
                         },
-                    },
-                } }) }));
+                    } }, nxJson.targetDefaults['@nx/vite:test']) }) }));
     }
 };
 exports.configureVitest = configureVitest;

package/src/ts/lib/vitest.js.map

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

package/src/utils/files/common/types/src/runtime-config.ts.template

@@ -1 +1,2 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/no-empty-interface
 export interface IRuntimeConfig {}

package/src/utils/format.d.ts

@@ -7,4 +7,4 @@ import { Tree } from '@nx/devkit';
  * Format files in the given directory within the tree
  * See https://github.com/nrwl/nx/blob/4cd640a9187954505d12de5b6d76a90d8ce4c2eb/packages/devkit/src/generators/format-files.ts#L11
  */
-export declare function formatFilesInSubtree(tree: Tree, dir: string): Promise<void>;
+export declare function formatFilesInSubtree(tree: Tree, dir?: string): Promise<void>;

package/src/utils/format.js

@@ -25,7 +25,7 @@ function formatFilesInSubtree(tree, dir) {
         const files = new Set(tree
             .listChanges()
             .filter((file) => file.type !== 'DELETE')
-            .filter((file) => file.path.startsWith(dir)));
+            .filter((file) => (dir ? file.path.startsWith(dir) : true)));
         const changedPrettierInTree = getChangedPrettierConfigInTree(tree);
         yield Promise.all(Array.from(files).map((file) => tslib_1.__awaiter(this, void 0, void 0, function* () {
             try {
@@ -33,7 +33,7 @@ function formatFilesInSubtree(tree, dir) {
                 const resolvedOptions = yield prettier.resolveConfig(systemPath, {
                     editorconfig: true,
                 });
-                const options = Object.assign(Object.assign(Object.assign({}, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
+                const options = Object.assign(Object.assign(Object.assign({ trailingComma: 'all' }, resolvedOptions), changedPrettierInTree), { filepath: systemPath });
                 const support = yield prettier.getFileInfo(systemPath, options);
                 if (support.ignored || !support.inferredParser) {
                     return;

package/src/utils/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/format.ts"],"names":[],"mappings":";;AAWA,oDA8CC;;AAzDD;;;GAGG;AACH,uCAA4C;AAC5C,wDAAwB;AAExB;;;GAGG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,GAAW;;QAEX,IAAI,QAAyB,CAAC;QAC9B,IAAI,CAAC;YACH,QAAQ,GAAG,gEAAa,UAAU,GAAC,CAAC;QACtC,CAAC;QAAC,WAAM,CAAC;YACP,gDAAgD;YAChD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI;aACD,WAAW,EAAE;aACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;aACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAC/C,CAAC;QACF,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACnC,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE;oBAC/D,YAAY,EAAE,IAAI;iBACnB,CAAC,CAAC;gBACH,MAAM,OAAO,iDACR,eAAe,GACf,qBAAqB,KACxB,QAAQ,EAAE,UAAU,GACrB,CAAC;gBACF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAc,CAAC,CAAC;gBACvE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;oBAC/C,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI;gBACT,gDAAgD;gBAChD,MAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAEnD,CACZ,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AACD,SAAS,8BAA8B,CAAC,IAAU;IAChD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC;YACH,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/format.ts"],"names":[],"mappings":";;AAYA,oDAgDC;;AA5DD;;;GAGG;AACH,uCAA4C;AAC5C,wDAAwB;AAGxB;;;GAGG;AACH,SAAsB,oBAAoB,CACxC,IAAU,EACV,GAAY;;QAEZ,IAAI,QAAyB,CAAC;QAC9B,IAAI,CAAC;YACH,QAAQ,GAAG,gEAAa,UAAU,GAAC,CAAC;QACtC,CAAC;QAAC,WAAM,CAAC;YACP,gDAAgD;YAChD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,IAAI;aACD,WAAW,EAAE;aACb,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;aACxC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAC9D,CAAC;QACF,MAAM,qBAAqB,GAAG,8BAA8B,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAO,IAAI,EAAE,EAAE;YACnC,IAAI,CAAC;gBACH,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnD,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE;oBAC/D,YAAY,EAAE,IAAI;iBACnB,CAAC,CAAC;gBACH,MAAM,OAAO,+CACX,aAAa,EAAE,KAAK,IACjB,eAAe,GACf,qBAAqB,KACxB,QAAQ,EAAE,UAAU,GACrB,CAAC;gBACF,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAc,CAAC,CAAC;gBACvE,IAAI,OAAO,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;oBAC/C,OAAO;gBACT,CAAC;gBAED,IAAI,CAAC,KAAK,CACR,IAAI,CAAC,IAAI;gBACT,gDAAgD;gBAChD,MAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAEnD,CACZ,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,aAAa,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAA,CAAC,CACH,CAAC;IACJ,CAAC;CAAA;AACD,SAAS,8BAA8B,CAAC,IAAU;IAChD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,aAAa,CAAC,EAAE,CAAC;QACnE,IAAI,CAAC;YACH,OAAO,IAAA,iBAAQ,EAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}

package/src/utils/shared-constructs.js

@@ -40,7 +40,7 @@ function sharedConstructsGenerator(tree) {
             }, {
                 overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
             });
-            (0, format_1.formatFilesInSubtree)(tree, (0, devkit_1.joinPathFragments)(exports.PACKAGES_DIR, exports.TYPE_DEFINITIONS_DIR));
+            (0, format_1.formatFilesInSubtree)(tree);
         }
         if (!tree.exists((0, devkit_1.joinPathFragments)(exports.PACKAGES_DIR, exports.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
             yield (0, generator_1.default)(tree, {
@@ -62,8 +62,8 @@ function sharedConstructsGenerator(tree) {
             }, {
                 overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
             });
-            (0, format_1.formatFilesInSubtree)(tree, (0, devkit_1.joinPathFragments)(exports.PACKAGES_DIR, exports.SHARED_CONSTRUCTS_DIR));
             (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), {});
+            (0, format_1.formatFilesInSubtree)(tree);
         }
     });
 }