@nathapp/na-cli 1.0.1-rc.6 → 1.0.2

package/dist/templates/nestjs-api/Dockerfile

@@ -1,19 +1,39 @@
-FROM node:16.14.2-alpine3.15 AS builder
+## this is a multi-stage build dockerfile optimized for kaniko cache
+FROM nathapp/apline-jq:3.18 AS deps
+
+# https://stackoverflow.com/a/58487433
+# To prevent cache invalidation from changes in fields other than dependencies
+
+COPY package.json package-lock.json /tmp/
+
+RUN jq '{ name, dependencies, devDependencies, scripts }' < /tmp/package.json > /tmp/deps.json
+RUN jq '{ name, lockfileVersion, requires, packages, dependencies }' < /tmp/package-lock.json > /tmp/deps-lock.json
+
+
+FROM nathapp/node-bun:18.20.2-1.1.12-alpine AS builder
 WORKDIR /app/
-ADD ./package.json /app/
-ADD ./package-lock.json /app/
-ADD ./tsconfig.json /app/
-ADD ./tsconfig.build.json /app/
+
+COPY --from=deps /tmp/deps.json ./package.json
+COPY --from=deps /tmp/deps-lock.json ./package-lock.json
+
+ADD ./bun.lockb ./tsconfig.json ./tsconfig.build.json ./nest-cli.json /app/
+
+## install dependencies first
+RUN bun install --freeze-lockfile
 ADD ./src /app/src
-RUN npm install glob rimraf
-RUN npm install
-COPY . .
-RUN npm run build
+#COPY . .
+RUN bun run build
 
 
-FROM node:16.14.2-alpine3.15
+FROM nathapp/node-bun:18.20.2-1.1.12-alpine
 WORKDIR /app/
-COPY package*.json ./
-RUN npm ci --omit=dev
+
+COPY bun.lockb ./
+COPY --from=deps /tmp/deps.json ./package.json
+COPY --from=deps /tmp/deps-lock.json ./package-lock.json
+
+RUN bun install --freeze-lockfile --production
+
 COPY --from=builder /app/dist /app/dist
-CMD ["npm", "run", "start:prod"]
+COPY package*.json ./
+CMD ["bun", "run", "start:prod"]

package/dist/templates/nestjs-api/package.json

@@ -6,63 +6,73 @@
   "private": true,
   "license": "UNLICENSED",
   "scripts": {
+    "clean": "rimraf dist/ .turbo/",    
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "ENV_NAME=production node dist/main",
+    "start": "nest start --env-file=.env --env-file=.env.local",
+    "start:dev": "nest start --env-file=.env --env-file=.env.local --watch",
+    "start:debug": "nest start --env-file=.env --env-file=.env.local --debug --watch",
+    "start:prod": "ENV_NAME=production bun dist/main",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
+    "test": "jest --config ./test/jest-test.json",
+    "test:cov": "jest --config ./test/jest-test.json --coverage",
+    "test:watch": "jest --config ./test/jest-test.json --watch",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "typeorm": "ts-node ./node_modules/typeorm/cli",
+    "migration:run": "npm run typeorm migration:run -- -d ./ormconfig.ts",
+    "migration:generate": "npm run typeorm -- -d ./ormconfig.ts migration:generate ./src/migrations/$npm_config_name",
+    "migration:create": "npm run typeorm -- migration:create ./src/migrations/$npm_config_name",
+    "migration:revert": "npm run typeorm -- -d ./ormconfig.ts migration:revert",
+    "migration:sql": "ts-node -r tsconfig-paths/register ./node_modules/@nathapp/typeorm-migrate-to-sql/bin/typeorm-migrate-sql.js -d ./src/migrations/ -c ./ormconfig.ts -n $npm_config_name"    
   },
   "dependencies": {
+    <%if (isFastify) { -%>"@fastify/helmet": "^11.1.1",<% }-%>  
     <%if (isFastify) { -%>"@fastify/static": "^6.11.2",<% }-%>       
-    "@nathapp/common": "^0.1.13",
-    "@nathapp/nestjs-app": "^1.0.0-rc.10",
-    "@nathapp/nestjs-auth": "^1.0.0-rc.28",
-    "@nathapp/nestjs-common": "^1.0.1-rc.28",
-    "@nathapp/nestjs-data": "^1.0.0-rc.13",
-    "@nathapp/nestjs-microservices": "^1.0.0-rc.14",
-    "@nestjs/common": "^10.0.0",
-    "@nestjs/config": "^3.0.0",
-    "@nestjs/core": "^10.0.0",
-    "@nestjs/passport": "^10.0.0",
-    "@nestjs/platform-<%= nestjsPlatform %>": "^10.0.0",
-    "@nestjs/swagger": "^7.0.0",
+    "@nathapp/common": "^0.1.14",
+    "@nathapp/nestjs-app": "^2.0.3",
+    "@nathapp/nestjs-auth": "^2.0.3",
+    "@nathapp/nestjs-common": "^2.0.3",
+    "@nathapp/nestjs-data": "^2.0.3",
+    "@nathapp/nestjs-logging": "^2.0.3",
+    "@nathapp/nestjs-microservices": "^2.0.3",
+    "@nestjs/common": "^11.0.0",
+    "@nestjs/config": "^4.0.0",
+    "@nestjs/core": "^11.0.0",
+    "@nestjs/passport": "^11.0.0",
+    "@nestjs/platform-<%= nestjsPlatform %>": "^11.0.0",
+    "@nestjs/swagger": "^11.0.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
-    "mysql2": "^2.3.3",
+    <%if (!isFastify) { -%>"helmet": "^7.1.0",<% }-%>      
+    "mysql2": "^3.9.4",
+    "nestjs-i18n": "^10.4.5",    
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0"
   },
   "devDependencies": {
-    "@golevelup/ts-jest": "^0.4.0",    
-    "@nestjs/cli": "^10.0.0",
-    "@nestjs/schematics": "^10.0.0",
-    "@nestjs/testing": "^10.0.0",
-    <%if (!isFastify) { -%>"@types/express": "^4.17.13",<% }-%>        
-    "@types/jest": "29.2.4",
-    "@types/node": "18.11.18",
+    "@golevelup/ts-jest": "^0.6.2",  
+    "@nestjs/cli": "^11.0.0",
+    "@nestjs/schematics": "^11.0.0",
+    "@nestjs/testing": "^11.0.0",
+    <%if (!isFastify) { -%>"@types/express": "^4.17.13",<% }-%>
+    "@types/jest": "^29.5.2",
+    "@types/node": "^22.0.0",
     "@types/supertest": "^2.0.11",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest": "29.3.1",
-    "prettier": "^2.3.2",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^8.10.2",
+    "eslint-plugin-prettier": "^4.2.5",
+    "jest": "^29.5.0",
+    "prettier": "^3.2.5",
     "source-map-support": "^0.5.20",
-    "supertest": "^6.1.3",
-    "ts-jest": "29.0.3",
+    "supertest": "^6.3.3",
+    "ts-jest": "^29.1.0",
     "ts-loader": "^9.2.3",
     "ts-node": "^10.0.0",
     "tsconfig-paths": "4.1.1",
-    "typeorm-model-generator": "^0.4.6-no-engines",
-    "typescript": "^4.7.4"
+    "typescript": "^5"
   },
   "jest": {
     "moduleFileExtensions": [

package/dist/templates/nestjs-api/src/i18n/en_US/date.json

@@ -0,0 +1,7 @@
+{
+  "dateFormat": "YYYY-MM-DD",
+  "dateTimeFormat": "YYYY-MM-DD h:mm a",
+  "queryDateFormat": "YYYY-MM-DD",
+  "dateFormatWithDay": "ddd, DD MMM YYYY",
+  "dateTimeFromatWithDay": "ddd, DD MMM YYYY h:mm a"
+}

package/dist/templates/nestjs-api/src/i18n/en_US/validation.json

@@ -0,0 +1,16 @@
+{
+  "isString": "{property} must be a string",
+  "isNotEmpty": "{property} is required",
+  "isBoolean": "{property} is not a boolean",
+  "isEmail": "{property} must be a valid email",
+  "min": "{property} with value: \"{value}\" needs to be at least {constraints.0}",
+  "max": "{property} with value: \"{value}\" needs to be less than or equal {constraints.0}",
+  "length": "{property} must be longer than or equal to {constraints.0} characters",
+  "minLength": "{property} must be at least {constraints.0} characters long",
+  "maxLength": "{property} must be less than or equal to {constraints.0} characters long",
+  "isInt": "{property} must be an integer",
+  "contains": "{property} must contain {constraints.0}",
+  "isFQDN": "{property} is not a valid Fully Qualified Domain Name",
+  "isDate": "{property} is not a valid date",
+  "isNotEmptyObject": "{property} is an empty object"
+}

package/dist/templates/nestjs-api/src/i18n/zh_CN/date.json

@@ -0,0 +1,7 @@
+{
+  "dateFormat": "YYYY-MM-DD",
+  "dateTimeFormat": "YYYY-MM-DD h:mm a",
+  "queryDateFormat": "YYYY-MM-DD",
+  "dateFormatWithDay": "ddd, DD MMM YYYY",
+  "dateTimeFromatWithDay": "ddd, DD MMM YYYY h:mm a"
+}

package/dist/templates/nestjs-api/src/i18n/zh_CN/validation.json

@@ -0,0 +1,16 @@
+{
+  "isString": "{property}必须是字符串",
+  "isNotEmpty": "{property}是必填项",
+  "isBoolean": "{property}不是布尔值",
+  "isEmail": "{property}必须是有效的电子邮件",
+  "min": "{property}的值必须至少为{constraints.0}",
+  "max": "{property}的值必须小于或等于{constraints.0}",
+  "length": "{property}的长度必须大于或等于{constraints.0}个字符",
+  "minLength": "{property}的长度必须至少为{constraints.0}个字符",
+  "maxLength": "{property}的长度必须小于或等于{constraints.0}个字符",
+  "isInt": "{property}必须是整数",
+  "contains": "{property}必须包含{constraints.0}",
+  "isFQDN": "{property}不是有效的完全限定域名",
+  "isDate": "{property}不是有效的日期",
+  "isNotEmptyObject": "{property}是一个空对象"
+}

package/dist/templates/nestjs-api/src/i18n/zh_TW/date.json

@@ -0,0 +1,7 @@
+{
+  "dateFormat": "YYYY-MM-DD",
+  "dateTimeFormat": "YYYY-MM-DD h:mm a",
+  "queryDateFormat": "YYYY-MM-DD",
+  "dateFormatWithDay": "ddd, DD MMM YYYY",
+  "dateTimeFromatWithDay": "ddd, DD MMM YYYY h:mm a"
+}

package/dist/templates/nestjs-api/src/i18n/zh_TW/validation.json

@@ -0,0 +1,16 @@
+{
+  "isString": "{property}必須是字串",
+  "isNotEmpty": "{property}為必填項目",
+  "isBoolean": "{property}不是布林值",
+  "isEmail": "{property}必須是有效的電子郵件",
+  "min": "{property}的值必須至少為{constraints.0}",
+  "max": "{property}的值必須小於或等於{constraints.0}",
+  "length": "{property}的長度必須大於或等於{constraints.0}個字元",
+  "minLength": "{property}的長度必須至少為{constraints.0}個字元",
+  "maxLength": "{property}的長度必須小於或等於{constraints.0}個字元",
+  "isInt": "{property}必須是整數",
+  "contains": "{property}必須包含{constraints.0}",
+  "isFQDN": "{property}不是有效的完全限定域名",
+  "isDate": "{property}不是有效的日期",
+  "isNotEmptyObject": "{property}是一個空物件"
+}

package/dist/templates/nestjs-api/test/jest-test.json

@@ -0,0 +1,26 @@
+{
+  "moduleFileExtensions": [
+    "js",
+    "json",
+    "ts",
+    "d.ts"
+  ],
+  "rootDir": "../",
+  "testEnvironment": "node",
+  "testRegex": ".spec.ts$",
+  "transform": {
+    "^.+\\.(t)s$": [
+      "ts-jest",
+      {
+        "diagnostics": true
+      }
+    ]
+  },
+  "collectCoverageFrom": [
+    "lib/**/*.ts",
+    "!**/node_modules/**"
+  ],
+  "moduleNameMapper": {
+    "^@/(.*)$": "<rootDir>/src/$1"
+  }  
+}

package/dist/templates/nestjs-library/.npmignore-rename

@@ -20,6 +20,10 @@ tsconfig.build.json
 tslint.json
 webpack.config.js
 yarn.lock
+bun.lockb
+README.md
+.eslintrc.js
+.dockerignore
 
 .npmrc
 .nvmrc

package/dist/templates/nestjs-library/package.json

@@ -16,12 +16,12 @@
     "node": ">=16"
   },
   "devDependencies": {
-    "@golevelup/ts-jest": "^0.3.7",
-    "@nestjs/platform-express": "^10.0.0",
-    "@nestjs/platform-fastify": "^10.0.0",
-    "@nestjs/testing": "^10.0.0",
+    "@golevelup/ts-jest": "^0.6.2", 
+    "@nestjs/platform-express": "^11.0.0",
+    "@nestjs/platform-fastify": "^11.0.0",
+    "@nestjs/testing": "^11.0.0",
     "@types/jest": "^29.5.2",
-    "@types/node": "^17.0.22",
+    "@types/node": "18.11.18",
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^4",
     "@typescript-eslint/parser": "^4",
@@ -32,7 +32,7 @@
     "prettier": "^2",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.0",
-    "typescript": "^4"
+    "typescript": "^5"
   },
   "types": "./index.d.ts",
   "main": "index.js",
@@ -41,8 +41,8 @@
   },
   "dependencies": {},
   "peerDependencies": {
-    "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
-    "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
+    "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0 || ^11.0.0",
     "class-transformer": "*",
     "class-validator": "*",
     "rxjs": "*"

package/dist/templates/ts-library/.npmignore-rename

@@ -20,6 +20,10 @@ tsconfig.build.json
 tslint.json
 webpack.config.js
 yarn.lock
+bun.lockb
+README.md
+.eslintrc.js
+.dockerignore
 
 .npmrc
 .nvmrc

package/dist/templates/turbo-nestjs-vuexy/README.md

@@ -0,0 +1,3 @@
+# <%= projectName %>
+
+This is an Turborepo packages for monorepo.

package/dist/templates/turbo-nestjs-vuexy/package.json

@@ -0,0 +1,49 @@
+{
+  "name": "<%= projectName %>",
+  "private": true,
+  "scripts": {
+    "build": "turbo build",
+    "dev": "turbo run dev",
+    "test": "turbo test",
+    "lint": "turbo lint",
+    "format": "prettier --write \"**/*.{ts,tsx,md}\"",
+    "version-list": "npm list --workspaces --json | jq \".dependencies | to_entries | .[] | \\\"\\(.key): \\(.value.version)\\\"\""
+  },
+  "dependencies": {
+    "@changesets/cli": "^2.27.9"
+  },  
+  "devDependencies": {
+    "@golevelup/ts-jest": "^0.4.0",
+    "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/platform-fastify": "^10.0.0",
+    "@nestjs/testing": "^10.0.0",
+    "@types/jest": "^29.5.2",
+    "@types/node": "^18.0.0",
+    "@types/supertest": "^2.0.12",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "eslint": "^8.57.0",
+    "jest": "^29.5.0",
+    "prettier": "^3.2.5",
+    "supertest": "^6.3.3",
+    "ts-jest": "^29.1.0",
+    "turbo": "^2.2.3",
+    "typescript": "^5"
+  },
+  "peerDependencies": {
+    "@nestjs/common": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "@nestjs/config": "^1.0.0 || ^2.0.0 || ^3.0.0",
+    "@nestjs/core": "^8.0.0 || ^9.0.0 || ^10.0.0",
+    "class-transformer": "*",
+    "class-validator": "*",
+    "rxjs": "*"
+  },  
+  "engines": {
+    "node": ">=18"
+  },
+  "packageManager": "bun@1.1.12",
+  "workspaces": [
+    "apps/*",
+    "packages/*"
+  ]
+}

package/dist/templates/turbo-nestjs-vuexy/packages/eslint-config/README.md

@@ -0,0 +1,3 @@
+# `@turbo/eslint-config`
+
+Collection of internal eslint configurations.

package/dist/templates/turbo-nestjs-vuexy/packages/eslint-config/library.js

@@ -0,0 +1,43 @@
+const { resolve } = require("node:path");
+
+const project = resolve(process.cwd(), "tsconfig.json");
+
+/** @type {import("eslint").Linter.Config} */
+module.exports = {
+  extends: ["eslint:recommended", "prettier", "turbo",'plugin:@typescript-eslint/recommended'],
+  plugins: ['@typescript-eslint/eslint-plugin'],
+  globals: {
+    // React: true,
+    // JSX: true,
+  },
+  root: true,
+  env: {
+    node: true,
+    jest: true,
+  },
+  settings: {
+    "import/resolver": {
+      typescript: {
+        project,
+      },
+    },
+  },
+  ignorePatterns: [
+    // Ignore dotfiles
+    ".*.js",
+    "node_modules/",
+    "dist/",
+    '.eslintrc.js',
+  ],
+  rules: {
+    '@typescript-eslint/interface-name-prefix': 'off',
+    '@typescript-eslint/explicit-function-return-type': 'off',
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    '@typescript-eslint/no-explicit-any': 'off',
+  },  
+  overrides: [
+    {
+      files: ["*.js?(x)", "*.ts?(x)"],
+    },
+  ],
+};

package/dist/templates/turbo-nestjs-vuexy/packages/eslint-config/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@nathapp/eslint-config",
+  "version": "1.0.1",
+  "private": true,
+  "files": [
+    "library.js"
+  ],
+  "devDependencies": {
+    "@vercel/style-guide": "^5.2.0",
+    "eslint-config-turbo": "^2.0.0",
+    "eslint-config-prettier": "^6",
+    "eslint-plugin-prettier": "^3",
+    "eslint-plugin-only-warn": "^1.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "typescript": "5.5.4"
+  }
+}