new integrations pipelines fix

This commit is contained in:
koalasat 2024-09-18 10:14:43 +02:00
parent 3be4c4e757
commit 6df8bf399d
No known key found for this signature in database
GPG Key ID: 2F7F61C6146AB157
4 changed files with 19 additions and 19 deletions

View File

@ -33,7 +33,7 @@ jobs:
- name: 'Setup node' - name: 'Setup node'
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 16.17.0 node-version: 22.4.0
cache: npm cache: npm
cache-dependency-path: frontend/package-lock.json cache-dependency-path: frontend/package-lock.json
- name: 'Install NPM Dependencies' - name: 'Install NPM Dependencies'

1
.gitignore vendored
View File

@ -646,6 +646,7 @@ frontend/static/frontend/**
docs/.jekyll-cache* docs/.jekyll-cache*
docs/_site* docs/_site*
node node
desktopApp/release-builds
# frontend statics # frontend statics
frontend/templates/frontend/*.html frontend/templates/frontend/*.html

View File

@ -21,7 +21,7 @@
<link rel="stylesheet" href="./static/css/fonts.css"/> <link rel="stylesheet" href="./static/css/fonts.css"/>
<% } %> <% } %>
{% load static %}
<link rel="stylesheet" type="text/css" href="./static/css/loader.css"/> <link rel="stylesheet" type="text/css" href="./static/css/loader.css"/>
<link rel="stylesheet" type="text/css" href="./static/css/index.css"/> <link rel="stylesheet" type="text/css" href="./static/css/index.css"/>
<link rel="stylesheet" type="text/css" href="./static/css/leaflet.css"/> <link rel="stylesheet" type="text/css" href="./static/css/leaflet.css"/>

View File

@ -73,6 +73,14 @@ const configNode: Configuration = {
inject: 'body', inject: 'body',
robosatsSettings: 'selfhosted-pro', robosatsSettings: 'selfhosted-pro',
}), }),
new CopyPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../nodeapp/static'),
},
],
}),
// Desktop App HTML // Desktop App HTML
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -83,6 +91,14 @@ const configNode: Configuration = {
inject: 'body', inject: 'body',
robosatsSettings: 'desktop-basic', robosatsSettings: 'desktop-basic',
}), }),
new CopyPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../desktopApp/static'),
},
],
}),
// Web App HTML // Web App HTML
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, 'templates/frontend/index.ejs'), template: path.resolve(__dirname, 'templates/frontend/index.ejs'),
@ -102,15 +118,6 @@ const configNode: Configuration = {
inject: 'body', inject: 'body',
robosatsSettings: 'web-pro', robosatsSettings: 'web-pro',
}), }),
// Static files
new CopyPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../nodeapp/static'),
},
],
}),
new CopyPlugin({ new CopyPlugin({
patterns: [ patterns: [
{ {
@ -119,14 +126,6 @@ const configNode: Configuration = {
}, },
], ],
}), }),
new CopyPlugin({
patterns: [
{
from: path.resolve(__dirname, 'static'),
to: path.resolve(__dirname, '../desktopApp/static'),
},
],
}),
], ],
}; };