From bf7a985b0d4ea937991c488faff38a9dbca16b59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8B=93=E6=B5=B7=20=E7=9C=9F=E5=A3=81?= Date: Fri, 24 Feb 2023 07:53:44 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=207:=20=E3=82=BF=E3=82=B9=E3=82=AF?= =?UTF-8?q?=201384:=20OMDS=E7=92=B0=E5=A2=83=E3=81=B8=E3=81=AE=E5=BC=95?= =?UTF-8?q?=E3=81=A3=E8=B6=8A=E3=81=97(Pipeline)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [タスク 1384: OMDS環境への引っ越し(Pipeline)](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/OMDSDictation/_workitems/edit/1384) - OMDS環境へのPipeline引っ越しに関する変更です。 - パイプラインをDevOpsで作成しているためYamlファイルを削除 - buildへのパスを修正 ## レビューポイント - 共有 ## UIの変更 - なし ## 動作確認状況 - パイプラインが動作してAzure環境にデプロイされることを確認 --- dictation_client/package.json | 4 ++++ dictation_client/src/pages/SamplePage/index.tsx | 4 +--- dictation_client/staticwebapp.config.json | 5 +++++ dictation_server/src/app.module.ts | 2 +- dictation_server/src/main.ts | 2 ++ 5 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 dictation_client/staticwebapp.config.json diff --git a/dictation_client/package.json b/dictation_client/package.json index aa8636a..1387fb2 100644 --- a/dictation_client/package.json +++ b/dictation_client/package.json @@ -2,9 +2,13 @@ "name": "client", "private": true, "version": "0.1.0", + "engines": { + "node": ">=18.0.0" + }, "scripts": { "start": "vite", "build": "tsc && vite build", + "build:prod": "tsc && vite build", "build:local": "tsc && vite build && sh localdeploy.sh", "preview": "vite preview", "typecheck": "tsc --noEmit", diff --git a/dictation_client/src/pages/SamplePage/index.tsx b/dictation_client/src/pages/SamplePage/index.tsx index ef8c383..754ba8e 100644 --- a/dictation_client/src/pages/SamplePage/index.tsx +++ b/dictation_client/src/pages/SamplePage/index.tsx @@ -2,9 +2,7 @@ import React from "react"; const SamplePage: React.FC = () => (
- hello world! -
- Dictation App Service Site +

hello world!!

); diff --git a/dictation_client/staticwebapp.config.json b/dictation_client/staticwebapp.config.json new file mode 100644 index 0000000..e094983 --- /dev/null +++ b/dictation_client/staticwebapp.config.json @@ -0,0 +1,5 @@ +{ + "navigationFallback": { + "rewrite": "/index.html" + } +} diff --git a/dictation_server/src/app.module.ts b/dictation_server/src/app.module.ts index 0106524..eed0928 100644 --- a/dictation_server/src/app.module.ts +++ b/dictation_server/src/app.module.ts @@ -10,7 +10,7 @@ import { AuthController } from './features/auth/auth.controller'; @Module({ imports: [ ServeStaticModule.forRoot({ - rootPath: join(__dirname, '../../dictation_client', 'build'), + rootPath: join(__dirname, '..', 'build'), }), ConfigModule.forRoot({ envFilePath: ['.env.local', '.env'], diff --git a/dictation_server/src/main.ts b/dictation_server/src/main.ts index c9e3be2..5619f07 100644 --- a/dictation_server/src/main.ts +++ b/dictation_server/src/main.ts @@ -29,6 +29,8 @@ async function bootstrap() { SwaggerModule.setup('api', app, document); } + // TODO:検証のためポートを固定 後で直す + // await app.listen(process.env.PORT || 80); await app.listen(process.env.PORT || 80); } bootstrap();