diff --git a/package.json b/package.json index 925d657..c320eb3 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,9 @@ ], "scripts": { "dev": "turbo dev", - "dev:taehui-www": "pnpm --filter taehui-www dev", "build": "turbo build", - "build:taehui-ts": "pnpm --filter taehui-ts build", - "deploy": "turbo deploy && taehui.cmd" + "start": "turbo start", + "deploy": "taehui.cmd" }, "devDependencies": { "eslint": "^8.57.0", @@ -23,5 +22,6 @@ }, "resolutions": { "formidable": "^3.2.5" - } + }, + "packageManager": "pnpm@8.15.4" } diff --git a/qwilight-fe/package.json b/qwilight-fe/package.json index 5153d6c..32561b8 100644 --- a/qwilight-fe/package.json +++ b/qwilight-fe/package.json @@ -6,8 +6,7 @@ "dev": "next dev -p 3001", "build": "next build", "start": "next start -p 3001", - "lint": "next lint", - "deploy": "qwilight-fe.cmd" + "lint": "next lint" }, "dependencies": { "@tanstack/react-query": "^5.28.0", diff --git a/qwilight-fe/qwilight-fe.cmd b/qwilight-fe/qwilight-fe.cmd deleted file mode 100644 index a6d3919..0000000 --- a/qwilight-fe/qwilight-fe.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@ECHO OFF - -git archive --output \\taehui\taehui\qwilight-fe.tar develop -wsl ssh taehui@taehui tar -xf qwilight-fe.tar -wsl ssh taehui@taehui sudo service qwilight-fe stop -wsl ssh taehui@taehui sudo rm -r /var/qwilight-fe -wsl ssh taehui@taehui sudo cp -R qwilight-fe /var -wsl ssh taehui@taehui sudo service qwilight-fe start -wsl ssh taehui@taehui rm -r qwilight-fe diff --git a/taehui-fe/package.json b/taehui-fe/package.json index f5b403c..dcd713a 100644 --- a/taehui-fe/package.json +++ b/taehui-fe/package.json @@ -6,8 +6,7 @@ "dev": "next dev", "build": "next build", "start": "next start", - "lint": "next lint", - "deploy": "qwilight-fe.cmd" + "lint": "next lint" }, "dependencies": { "@tanstack/react-query": "^5.28.0", diff --git "a/taehui-fe/src/app/\133language\135/forum/\133forumID\135/edit/\133\133...essayID\135\135/page.tsx" "b/taehui-fe/src/app/\133language\135/forum/\133forumID\135/edit/\133\133...essayID\135\135/page.tsx" index f1ade0e..96f3316 100644 --- "a/taehui-fe/src/app/\133language\135/forum/\133forumID\135/edit/\133\133...essayID\135\135/page.tsx" +++ "b/taehui-fe/src/app/\133language\135/forum/\133forumID\135/edit/\133\133...essayID\135\135/page.tsx" @@ -10,7 +10,7 @@ import usePutAutoEssay from "@/app/[language]/forum/query/usePutAutoEssay"; import usePutEssay from "@/app/[language]/forum/query/usePutEssay"; import withTotem from "@/hoc/withTotem"; -import { useTaehuiStore, useForumStore, useTaehuiStore } from "@/state/Stores"; +import { useForumStore, useTaehuiStore } from "@/state/Stores"; import { observer } from "mobx-react-lite"; import { useTranslations } from "next-intl"; import { useParams } from "next/navigation"; diff --git a/taehui-fe/taehui-fe.cmd b/taehui-fe/taehui-fe.cmd deleted file mode 100644 index 533c887..0000000 --- a/taehui-fe/taehui-fe.cmd +++ /dev/null @@ -1,6 +0,0 @@ -@ECHO OFF - -Robocopy . \\taehui\taehui\taehui-fe /MIR -wsl ssh taehui@taehui sudo rm -r /var/taehui-fe -wsl ssh taehui@taehui sudo cp -R taehui-fe/* /var/taehui-fe -wsl ssh taehui@taehui rm -r taehui-fe diff --git a/taehui-www/package.json b/taehui-www/package.json index 323f3ee..b106675 100644 --- a/taehui-www/package.json +++ b/taehui-www/package.json @@ -20,14 +20,11 @@ "@types/koa-router": "^7.4.8", "@types/uuid": "^9.0.8", "concurrently": "^8.2.2", - "esbuild": "^0.20.1", "nodemon": "^3.1.0" }, "scripts": { "dev": "conc pnpm:local pnpm:watch", "local": "nodemon -e js,json build", - "watch": "esbuild --bundle --outfile=build/index.js --platform=node --sourcemap --watch src", - "build": "esbuild --bundle --minify --outfile=build/index.js --platform=node --sourcemap src", - "deploy": "taehui-www.cmd" + "watch": "esbuild --bundle --outfile=build/index.js --platform=node --sourcemap --watch src" } } diff --git a/taehui-www/taehui-www.cmd b/taehui-www/taehui-www.cmd deleted file mode 100644 index 4ab6be0..0000000 --- a/taehui-www/taehui-www.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@ECHO OFF - -Robocopy . build ecosystem.config.js -Robocopy System build\System /MIR -Robocopy build \\taehui\taehui\taehui-www /MIR -wsl ssh taehui@taehui.ddns.net sudo service pm2-root stop -wsl ssh taehui@taehui sudo cp -R taehui-www/* /var/taehui-www -wsl ssh taehui@taehui sudo service pm2-root start -wsl ssh taehui@taehui rm -r taehui-www diff --git a/taehui.cmd b/taehui.cmd index 191da8b..4cbf101 100644 --- a/taehui.cmd +++ b/taehui.cmd @@ -7,3 +7,11 @@ git push git checkout develop git push + +git archive -o \\taehui\taehui\taehui.tar develop + +wsl ssh taehui@taehui sudo service taehui stop +wsl ssh taehui@taehui sudo tar -xf taehui.tar -C /var/taehui +wsl ssh taehui@taehui sudo service taehui start + +wsl ssh taehui@taehui rm taehui.tar diff --git a/turbo.json b/turbo.json index fff5e46..7864051 100644 --- a/turbo.json +++ b/turbo.json @@ -6,11 +6,6 @@ "build:taehui-ts" ] }, - "build:taehui-ts": { - "outputs": [ - "build/**" - ] - }, "build": { "dependsOn": [ "^build" @@ -19,6 +14,11 @@ ".next/**" ] }, + "start": { + "dependsOn": [ + "build" + ] + }, "deploy": {} } }