Tweak building

.github/workflows/build-tauri.yml

@@ -17,6 +17,7 @@ on:
             - "packages/core/**"
             - "packages/tauri/**"
             - "packages/locale/**"
+            - "assets/**"
 
 jobs:
     build_and_publish:
@@ -48,7 +49,13 @@ jobs:
               run: |
                   npm i -g npm@8.2.0
                   npm ci
-            - uses: tauri-apps/tauri-action@v0.2.0
+            - name: Build
+              run: |
+                  npm run tauri:build
+              env:
+                  PL_SERVER_URL: ${{ secrets.PL_SERVER_URL }}
+            - name: Publish
+              uses: tauri-apps/tauri-action@v0.2.0
               env:
                   PL_SERVER_URL: ${{ secrets.PL_SERVER_URL }}
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.prettierignore

@@ -6,4 +6,5 @@ packages/cordova/www/**/*
 packages/electron/app/**/*
 packages/electron/build/**/*
 packages/electron/dist/**/*
+packages/tauri/dist/**/*
 package-lock.json

package.json

@@ -37,6 +37,7 @@
         "start": "npm run pwa:build && lerna run --scope '@padloc/{server,pwa}' --parallel start",
         "dev": "lerna run --parallel --scope '@padloc/{server,pwa}' --parallel dev",
         "tauri:dev": "lerna run --parallel --scope '@padloc/{server,tauri}' --parallel dev",
+        "tauri:build": "lerna run build --scope @padloc/tauri",
         "repl": "cd packages/server && npm run repl && cd ../..",
         "test": "lerna run test",
         "locale:extract": "lerna run extract --scope '@padloc/locale'",

packages/tauri/package.json

@@ -15,10 +15,11 @@
         "css-loader": "5.2.6",
         "file-loader": "6.2.0",
         "html-webpack-plugin": "5.3.1",
+        "raw-loader": "4.0.2",
         "style-loader": "2.0.0",
         "ts-loader": "9.2.2",
         "ts-node": "10.0.0",
-        "typescript": "4.3.2",
+        "typescript": "4.4.3",
         "webpack": "5.38.1",
         "webpack-cli": "4.7.0",
         "webpack-dev-server": "3.11.2",

packages/tauri/webpack.config.js

@@ -1,14 +1,16 @@
-const path = require("path");
+const { resolve } = require("path");
 const { EnvironmentPlugin } = require("webpack");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const { CleanWebpackPlugin } = require("clean-webpack-plugin");
 const { version } = require("./package.json");
 
-const out = process.env.PL_PWA_DIR || path.resolve(__dirname, "dist");
+const out = process.env.PL_PWA_DIR || resolve(__dirname, "dist");
 const serverUrl = process.env.PL_SERVER_URL || `http://0.0.0.0:${process.env.PL_SERVER_PORT || 3000}`;
+const rootDir = resolve(__dirname, "../..");
+const assetsDir = resolve(rootDir, process.env.PL_ASSETS_DIR || "assets");
 
 module.exports = {
-    entry: path.resolve(__dirname, "src/index.ts"),
+    entry: resolve(__dirname, "src/index.ts"),
     output: {
         path: out,
         filename: "[name].js",
@@ -19,7 +21,10 @@ module.exports = {
     devtool: "source-map",
     stats: "minimal",
     resolve: {
-        extensions: [".ts", ".js"],
+        extensions: [".ts", ".js", ".css", ".svg", ".png", ".jpg"],
+        alias: {
+            assets: assetsDir,
+        },
     },
     module: {
         rules: [
@@ -35,6 +40,10 @@ module.exports = {
                 test: /\.(woff|woff2|eot|ttf|otf|svg)$/,
                 use: ["file-loader"],
             },
+            {
+                test: /\.txt|md$/i,
+                use: "raw-loader",
+            },
         ],
     },
     plugins: [
@@ -50,11 +59,11 @@ module.exports = {
         new CleanWebpackPlugin(),
         new HtmlWebpackPlugin({
             title: "Padloc",
-            template: path.resolve(__dirname, "src/index.html"),
+            template: resolve(__dirname, "src/index.html"),
         }),
     ],
     devServer: {
-        contentBase: path.resolve(__dirname, "dist"),
+        contentBase: resolve(__dirname, "dist"),
         historyApiFallback: true,
         host: "0.0.0.0",
         port: process.env.PL_PWA_PORT || 8080,