feat: rename 'types' folder into 'shared' to allow additional shared …

…resources between the sub-projects (#112) * feat: renaming 'types/src' to 'shared/types' * feat: update applications to reference renamed 'shared/types' folder * fix: Updating Dockerfiles to reference updated 'shared' folder
TheNickOfTime · Aug 9, 2024 · 7c93c3c · 7c93c3c
1 parent 5175c0d
commit 7c93c3c
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 44 deletions.
diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json
@@ -29,12 +29,12 @@
 			"components/*": ["./src/components/*"],
 			"pages/*": ["./src/pages/*"],
 			"sections/*": ["./src/sections/*"],
-			"types/*": ["../types/src/*"]
+			"types/*": ["../shared/types/*"]
 		}
 	},
 	"references": [
 		{
-			"path": "../types"
+			"path": "../shared"
 		}
 	],
 	"include": ["src"]

diff --git a/client/vite.config.ts b/client/vite.config.ts
@@ -15,7 +15,7 @@ export default defineConfig({
 			components: path.resolve(__dirname, './src/components'),
 			pages: path.resolve(__dirname, './src/pages'),
 			sections: path.resolve(__dirname, './src/sections'),
-			types: path.resolve(__dirname, '../types/src'),
+			types: path.resolve(__dirname, '../shared/types'),
 		},
 	},
 	server: {

diff --git a/server/Dockerfile b/server/Dockerfile
@@ -1,32 +1,18 @@
 # Build client -------------------------------------------------------------------------------------
 FROM node:alpine AS client-build
 COPY client /handbrake-web/client
-COPY types /handbrake-web/types
+COPY shared /handbrake-web/shared
 WORKDIR /handbrake-web/client
 
 RUN npm install
 RUN npm run build
 
-# Build server -------------------------------------------------------------------------------------
-# FROM node:alpine AS server-build
-# COPY /server /handbrake-web/server
-# COPY /types /handbrake-web/types
-# WORKDIR /handbrake-web/server
-
-# RUN npm install
-# RUN npm run build
-
 # Main ---------------------------------------------------------------------------------------------
 FROM node:alpine AS main
 
-# Copy project folder
-# COPY --from=client-build /handbrake-web/client/build /handbrake-web/client
-# COPY --from=server-build /handbrake-web/server/build /handbrake-web/server/package.json /handbrake-web/server/package-lock.json /handbrake-web
-# WORKDIR /handbrake-web
-
 COPY --from=client-build /handbrake-web/client/build /handbrake-web/client
 COPY server /handbrake-web/server
-COPY types /handbrake-web/types
+COPY shared /handbrake-web/shared
 WORKDIR /handbrake-web/server
 
 # Install node dependencies

diff --git a/server/tsconfig.json b/server/tsconfig.json
@@ -34,7 +34,7 @@
 			"routes/*": ["./src/routes/*"],
 			"scripts/*": ["./src/scripts/*"],
 			"socket/*": ["./src/socket/*"],
-			"types/*": ["../types/src/*"]
+			"types/*": ["../shared/types/*"]
 		} /* Specify a set of entries that re-map imports to additional lookup locations. */,
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
 		// "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
@@ -114,7 +114,7 @@
 	},
 	"references": [
 		{
-			"path": "../types"
+			"path": "../shared"
 		}
 	],
 	"include": ["./src"]

diff --git a/types/tsconfig.json → shared/tsconfig.json b/types/tsconfig.json → shared/tsconfig.json
diff --git a/types/src/config.ts → shared/types/config.ts b/types/src/config.ts → shared/types/config.ts
diff --git a/types/src/database.ts → shared/types/database.ts b/types/src/database.ts → shared/types/database.ts
diff --git a/types/src/directory.ts → shared/types/directory.ts b/types/src/directory.ts → shared/types/directory.ts
diff --git a/types/src/file-browser.ts → shared/types/file-browser.ts b/types/src/file-browser.ts → shared/types/file-browser.ts
diff --git a/types/src/file-extensions.ts → shared/types/file-extensions.ts b/types/src/file-extensions.ts → shared/types/file-extensions.ts
diff --git a/types/src/handbrake.ts → shared/types/handbrake.ts b/types/src/handbrake.ts → shared/types/handbrake.ts
diff --git a/types/src/preset.ts → shared/types/preset.ts b/types/src/preset.ts → shared/types/preset.ts
diff --git a/types/src/queue.ts → shared/types/queue.ts b/types/src/queue.ts → shared/types/queue.ts
diff --git a/types/src/socket.ts → shared/types/socket.ts b/types/src/socket.ts → shared/types/socket.ts
diff --git a/types/src/transcode.ts → shared/types/transcode.ts b/types/src/transcode.ts → shared/types/transcode.ts
diff --git a/types/src/watcher.ts → shared/types/watcher.ts b/types/src/watcher.ts → shared/types/watcher.ts
diff --git a/worker/Dockerfile b/worker/Dockerfile
@@ -1,31 +1,11 @@
-# Build applications -------------------------------------------------------------------------------
-# FROM node:alpine AS build
-
-# COPY worker /handbrake-web/worker
-# COPY types /handbrake-web/types
-# WORKDIR /handbrake-web/worker
-
-# RUN npm install
-# RUN npm run build
-
 # Node ---------------------------------------------------------------------------------------------
 FROM node:bookworm-slim AS main
 
 # Install external dependencies
 RUN apt update && apt install -y handbrake-cli
 
-# Copy project folder
-# COPY --from=build handbrake-web/worker/build /handbrake-web
-# COPY --from=build \
-# 	handbrake-web/worker/package.json \
-# 	handbrake-web/worker/package-lock.json \
-# 	handbrake-web/worker/start.sh \
-# 	handbrake-web/worker/tsconfig.json \
-# 	/handbrake-web
-# WORKDIR /handbrake-web
-
 COPY worker /handbrake-web/worker
-COPY types /handbrake-web/types
+COPY shared /handbrake-web/shared
 WORKDIR /handbrake-web/worker
 
 # Install node dependencies

diff --git a/worker/tsconfig.json b/worker/tsconfig.json
@@ -34,7 +34,7 @@
 		"paths": {
 			"scripts/*": ["./src/scripts/*"],
 			"socket/*": ["./src/socket/*"],
-			"types/*": ["../types/src/*"]
+			"types/*": ["../shared/types/*"]
 		} /* Specify a set of entries that re-map imports to additional lookup locations. */,
 		// "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
 		// "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */
@@ -114,7 +114,7 @@
 	},
 	"references": [
 		{
-			"path": "../types"
+			"path": "../shared"
 		}
 	],
 	"ts-node": {