From 23acc8729b128eecdd134a4eba3409cb1ace8a69 Mon Sep 17 00:00:00 2001 From: koalasat Date: Wed, 18 Sep 2024 09:07:35 +0200 Subject: [PATCH] new integration test pipeline 4 --- .github/workflows/frontend-build.yml | 1 - frontend/webpack.config.ts | 30 +++++++++++++++------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.github/workflows/frontend-build.yml b/.github/workflows/frontend-build.yml index cb4c25fb6..625e6fc45 100644 --- a/.github/workflows/frontend-build.yml +++ b/.github/workflows/frontend-build.yml @@ -64,7 +64,6 @@ jobs: path: | nodeapp/static nodeapp/*.html - frontend/templates/frontend/*.html - name: 'Archive Desktop App Static Build Results' uses: actions/upload-artifact@v4 with: diff --git a/frontend/webpack.config.ts b/frontend/webpack.config.ts index 47700f762..3bcdd33d7 100644 --- a/frontend/webpack.config.ts +++ b/frontend/webpack.config.ts @@ -84,21 +84,23 @@ const configNode: Configuration = { robosatsSettings: 'desktop-basic', }), // Web App HTML - new CopyPlugin({ - patterns: [ - { - from: path.resolve(__dirname, 'templates/frontend/basic.html'), - to: path.resolve(__dirname, '../web/basic.html'), - }, - ], + new HtmlWebpackPlugin({ + template: path.resolve(__dirname, 'templates/frontend/index.ejs'), + templateParameters: { + pro: false, + }, + filename: path.resolve(__dirname, '../web/basic.html'), + inject: 'body', + robosatsSettings: 'web-basic', }), - new CopyPlugin({ - patterns: [ - { - from: path.resolve(__dirname, 'templates/frontend/pro.html'), - to: path.resolve(__dirname, '../web/pro.html'), - }, - ], + new HtmlWebpackPlugin({ + template: path.resolve(__dirname, 'templates/frontend/index.ejs'), + templateParameters: { + pro: true, + }, + filename: path.resolve(__dirname, '../web/pro.html'), + inject: 'body', + robosatsSettings: 'web-pro', }), // Static files new CopyPlugin({