Merge pull request #155 from ljlm0402/development

🌼 Update Version - v8.1.7

lib/default/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/default/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",

lib/graphql/.env.development.local

@@ -3,7 +3,7 @@ PORT = 3000
 
 # DATABASE
 DB_HOST = localhost
-DB_PORT = 3306
+DB_PORT = 5432
 DB_USER = root
 DB_PASSWORD = password
 DB_DATABASE = test
@@ -16,5 +16,5 @@ LOG_FORMAT = dev
 LOG_DIR = ../logs
 
 # CORS
-ORIGIN = *
+ORIGIN = true
 CREDENTIALS = true

lib/graphql/.env.production.local

@@ -3,7 +3,7 @@ PORT = 3000
 
 # DATABASE
 DB_HOST = localhost
-DB_PORT = 3306
+DB_PORT = 5432
 DB_USER = root
 DB_PASSWORD = password
 DB_DATABASE = test
@@ -16,5 +16,5 @@ LOG_FORMAT = combined
 LOG_DIR = ../logs
 
 # CORS
-ORIGIN = your.domain.com
+ORIGIN = false
 CREDENTIALS = true

lib/graphql/.env.test.local

@@ -3,7 +3,7 @@ PORT = 3000
 
 # DATABASE
 DB_HOST = localhost
-DB_PORT = 3306
+DB_PORT = 5432
 DB_USER = root
 DB_PASSWORD = password
 DB_DATABASE = test
@@ -16,5 +16,5 @@ LOG_FORMAT = dev
 LOG_DIR = ../logs
 
 # CORS
-ORIGIN = *
+ORIGIN = true
 CREDENTIALS = true

lib/graphql/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/graphql/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",

lib/graphql/src/app.ts

@@ -50,9 +50,12 @@ class App {
   }
 
   private initializeMiddlewares() {
+    if (this.env === 'production') {
+      this.app.use(hpp());
+      this.app.use(helmet());
+    }
+
     this.app.use(cors({ origin: ORIGIN, credentials: CREDENTIALS }));
-    this.app.use(hpp());
-    this.app.use(helmet());
     this.app.use(compression());
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
@@ -68,7 +71,7 @@ class App {
     const apolloServer = new ApolloServer({
       schema: schema,
       plugins: [
-        NODE_ENV === 'production'
+        this.env === 'production'
           ? ApolloServerPluginLandingPageProductionDefault({ footer: false })
           : ApolloServerPluginLandingPageLocalDefault({ footer: false }),
       ],

lib/graphql/src/config/index.ts

@@ -2,4 +2,5 @@ import { config } from 'dotenv';
 config({ path: `.env.${process.env.NODE_ENV || 'development'}.local` });
 
 export const CREDENTIALS = process.env.CREDENTIALS === 'true';
-export const { NODE_ENV, PORT, DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE, SECRET_KEY, LOG_FORMAT, LOG_DIR, ORIGIN } = process.env;
+export const ORIGIN = process.env.ORIGIN === 'true';
+export const { NODE_ENV, PORT, DB_HOST, DB_PORT, DB_USER, DB_PASSWORD, DB_DATABASE, SECRET_KEY, LOG_FORMAT, LOG_DIR } = process.env;

lib/graphql/src/entities/users.entity.ts

@@ -9,7 +9,7 @@ export class UserEntity extends BaseEntity implements User {
 
   @Column()
   @IsNotEmpty()
-  @Unique()
+  @Unique(['email'])
   email: string;
 
   @Column()

lib/graphql/src/repositories/auth.repository.ts

@@ -18,7 +18,7 @@ export default class AuthRepository {
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
     const hashedPassword = await hash(userData.password, 10);
-    const createUserData: User = await UserEntity.save({ ...userData, password: hashedPassword });
+    const createUserData: User = await UserEntity.create({ ...userData, password: hashedPassword }).save();
 
     return createUserData;
   }

lib/graphql/src/repositories/users.repository.ts

@@ -30,7 +30,7 @@ export default class UserRepository {
     if (findUser) throw new HttpException(409, `You're email ${userData.email} already exists`);
 
     const hashedPassword = await hash(userData.password, 10);
-    const createUserData: User = await UserEntity.save({ ...userData, password: hashedPassword });
+    const createUserData: User = await UserEntity.create({ ...userData, password: hashedPassword }).save();
 
     return createUserData;
   }

lib/knex/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/knex/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",

lib/mongoose/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/mongoose/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",

lib/prisma/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/prisma/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",

lib/routing-controllers/Makefile

@@ -1,6 +1,29 @@
+# app name should be overridden.
+# ex) production-stage: make build APP_NAME=<APP_NAME>
+# ex) development-stage: make build-dev APP_NAME=<APP_NAME>
+
+APP_NAME = typescript-express
+APP_NAME := $(APP_NAME)
+
+.PHONY: build
+# Build the container image - Dvelopment
+build-dev:
+	docker build -t ${APP_NAME}\
+		--target development-build-stage\
+		-f Dockerfile .
+
+# Build the container image - Production
 build:
-	docker build -t ${tag} .
+	docker build -t ${APP_NAME}\
+		--target production-build-stage\
+		-f Dockerfile .
+
+# Clean the container image
 clean:
-	docker rmi -f ${tag}
+	docker rmi -f ${APP_NAME}
+
+# Run the container image
 run:
-	docker run -d -p ${port}:${port} --name ${name} ${tag}
+	docker run -d -it -p 3000:3000 ${APP_NAME}
+
+all: build

lib/routing-controllers/package.json

@@ -7,8 +7,8 @@
   "scripts": {
     "start": "npm run build && cross-env NODE_ENV=production node dist/server.js",
     "dev": "cross-env NODE_ENV=development nodemon",
-    "build": "tsc && tsc-alias",
-    "build:swc": "swc src -d dist --source-maps --copy-files",
+    "build": "swc src -d dist --source-maps --copy-files",
+    "build:tsc": "tsc && tsc-alias",
     "test": "jest --forceExit --detectOpenHandles",
     "lint": "eslint --ignore-path .gitignore --ext .ts src/",
     "lint:fix": "npm run lint -- --fix",