MI-72: Update template to use new eslint

eslint.config.mjs

@@ -6,7 +6,7 @@ import nxEslintPlugin from '@nx/eslint-plugin';
 export const eslintBaseConfig = [
     ...eslintConfigs.core,
     {
-        files: ['**/*.ts', '**/*.tsx'],
+        files: ['**/*.ts'],
         plugins: {
             '@nx': nxEslintPlugin,
             import: eslintPluginImport,
@@ -38,7 +38,6 @@ export const eslintBaseConfig = [
     },
     {
         files: ['**/*.json'],
-        rules: {},
         languageOptions: { parser: jsonParser },
     },
 ];

tools/serverless-plugin/project.json

@@ -29,7 +29,7 @@
             "options": {
                 "cwd": "{projectRoot}",
                 "color": true,
-                "command": "eslint ."
+                "command": "eslint . --max-warnings 0"
             }
         },
         "test": {

tools/serverless-plugin/src/generators/service/general-files/eslint.config.mjs.template

@@ -0,0 +1,3 @@
+import { eslintBaseConfig } from '../../eslint.config.mjs';
+
+export default [...eslintBaseConfig, { ignores: ['!./**/*.ts'] }];

tools/serverless-plugin/src/generators/service/general-files/tests/example-tests.test.ts.template

@@ -1,4 +1,4 @@
-import { simpleObject, YOUR_ENV_VAR } from './__data__/example-data';
+import { YOUR_ENV_VAR, simpleObject } from './__data__/example-data';
 
 describe('Passing tests', () => {
     test('Passing test', () => {

tools/serverless-plugin/src/generators/service/general-files/tsconfig.json.template

@@ -1,7 +1,6 @@
 {
     "extends": "../../tsconfig.base.json",
     "include": [
-        "vite.config.mjs",
         "../../libs/**/src/index.ts",
         "src/**/*.ts",
         "**/*.test.ts"

tools/serverless-plugin/src/generators/service/general-files/vite.config.mjs.template

@@ -1,5 +1,5 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
-import { viteBaseConfig } from '../../vite.config.base.mjs';
+import { viteBaseConfig } from '../../vite.config.mjs';
 
 export default mergeConfig(
     viteBaseConfig,

tools/serverless-plugin/src/generators/service/generator.ts

@@ -41,12 +41,7 @@ export async function serviceGenerator(tree: Tree, options: serviceGeneratorSche
                 ...buildRunCommandConfig('tsc --noEmit --pretty'),
             },
             lint: {
-                executor: '@nx/eslint:lint',
-                outputs: ['{options.outputFile}'],
-                options: {
-                    lintFilePatterns: [projectRoot + '/**/*.ts'],
-                    maxWarnings: 0,
-                },
+                ...buildRunCommandConfig('eslint . --max-warnings 0'),
             },
             test: {
                 executor: '@nx/vite:test',

tools/serverless-plugin/src/generators/service/notification-files/README.md

@@ -56,15 +56,15 @@ This service accepts events in the following format (similar to CloudWatch Event
   "time": "2024-06-24T04:42:33.884Z",
   "region": "ap-southeast-2",
   "resources": [
-    "arn:aws:lambda:ap-southeast-2:XXXXXXXXXX:function:tt-int-shippit-order-dev-lambdaName"
+    "arn:aws:lambda:ap-southeast-2:XXXXXXXXXX:function:client-int-service-name-stg-lambdaName"
   ],
   "detail": {
-    "executionArn": "arn:aws:lambda:ap-southeast-2:XXXXXXXXXX:function:tt-int-shippit-order-dev-lambdaName",
-    "logGroupName": "/aws/lambda/tt-int-shippit-order-dev-lambdaName",
-    "name": "tt-int-shippit-order-dev-lambdaName",
+    "executionArn": "arn:aws:lambda:ap-southeast-2:XXXXXXXXXX:function:client-int-service-name-stg-lambdaName",
+    "logGroupName": "/aws/lambda/client-int-service-name-stg-lambdaName",
+    "name": "client-int-service-name-stg-lambdaName",
     "status": "FAILED",
     "error": "SyntaxError",
-    "cause": "{\"errorType\":\"SyntaxError\",\"errorMessage\":\"Unexpected token u in JSON at position 0\",\"trace\":\"SyntaxError: Unexpected token u in JSON at position 0\\n    at JSON.parse (<anonymous>)\\n    at Runtime.V1 (/src/lambda/create-shippit-order.ts:39:34)\\n    at Runtime.handleOnceNonStreaming (file:///var/runtime/index.mjs:1173:29)\"}"
+    "cause": "{\"errorType\":\"SyntaxError\",\"errorMessage\":\"Unexpected token u in JSON at position 0\",\"trace\":\"SyntaxError: Unexpected token u in JSON at position 0\\n    at JSON.parse (<anonymous>)\\n    at Runtime.V1 (/src/lambda/create-order.ts:39:34)\\n    at Runtime.handleOnceNonStreaming (file:///var/runtime/index.mjs:1173:29)\"}"
   }
 }
 ```

tools/serverless-plugin/src/generators/service/notification-files/eslint.config.mjs.template

@@ -0,0 +1,3 @@
+import { eslintBaseConfig } from '../../eslint.config.mjs';
+
+export default [...eslintBaseConfig, { ignores: ['!./**/*.ts'] }];

tools/serverless-plugin/src/generators/service/notification-files/tsconfig.json.template

@@ -1,7 +1,6 @@
 {
     "extends": "../../tsconfig.base.json",
     "include": [
-        "vite.config.mjs",
         "../../libs/**/src/index.ts",
         "src/**/*.ts",
         "**/*.test.ts"

tools/serverless-plugin/src/generators/service/notification-files/vite.config.mjs.template

@@ -1,5 +1,5 @@
 import { defineConfig, mergeConfig } from 'vitest/config';
-import { viteBaseConfig } from '../../vite.config.base.mjs';
+import { viteBaseConfig } from '../../vite.config.mjs';
 
 export default mergeConfig(
     viteBaseConfig,

tsconfig.base.json

@@ -7,9 +7,7 @@
         "exactOptionalPropertyTypes": false,
         "noUncheckedSideEffectImports": true,
         "paths": {
-            "@aligent/serverless-plugin": [
-                "tools/serverless-plugin/src/index.ts"
-            ]
+            "@aligent/serverless-plugin": ["tools/serverless-plugin/src/index.ts"]
         },
         "types": ["node", "vitest", "vitest/globals"]
     }