fix build issue

dagu-org · Aug 11, 2023 · 1fe1a38 · 1fe1a38
1 parent fe1f8c9
commit 1fe1a38
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -42,7 +42,9 @@ jobs:
 
       - name: Copy web assets
         run: |
-          cp ui/dist/*.js ./internal/web/handlers/assets/js/
+          cp ui/dist/*.js ./internal/web/handlers/assets/
+          cp ui/dist/*.woff ./internal/web/handlers/assets/
+          cp ui/dist/*.woff2 ./internal/web/handlers/assets/
 
       - name: Run protoc
         run: |

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -39,7 +39,7 @@ jobs:
 
       - name: Copy web assets
         run: |
-          cp ui/dist/*.js ./internal/web/handlers/assets/js/
+          cp ui/dist/* ./internal/web/handlers/assets/js/
 
       - name: Cache Go modules
         uses: actions/cache@v1

diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@
 bin/*
 dist/
 internal/web/handlers/assets/fonts/*
-internal/web/handlers/assets/js/*
-!internal/web/handlers/assets/js/.gitkeep
+internal/web/handlers/assets/*
+!internal/web/handlers/assets/.gitkeep
 internal/**/*.pb.go
 
 # NVM

diff --git a/Makefile b/Makefile
@@ -36,7 +36,9 @@ build: build-ui build-dir gen-pb build-bin
 build-ui:
 	@cd ui; \
 		yarn && yarn build
-	@cp ui/dist/*.js ./internal/web/handlers/assets/js/
+	@cp ui/dist/*.js ./internal/web/handlers/assets/
+	@cp ui/dist/*.woff ./internal/web/handlers/assets/
+	@cp ui/dist/*.woff2 ./internal/web/handlers/assets/
 
 test:
 	@go test -v ./...

diff --git a/internal/web/handlers/assets/js/.gitkeep → internal/web/handlers/assets/.gitkeep b/internal/web/handlers/assets/js/.gitkeep → internal/web/handlers/assets/.gitkeep
diff --git a/internal/web/handlers/templates/base.gohtml b/internal/web/handlers/templates/base.gohtml
@@ -17,7 +17,7 @@
       }
     }
   </script>
-  <script defer="defer" src="/assets/js/bundle.js?v={{ version }}"></script>
+  <script defer="defer" src="/assets/bundle.js?v={{ version }}"></script>
 </head>
 <body>
   {{template "content" .}}

diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -9,9 +9,6 @@ import { SWRConfig } from 'swr';
 import fetchJson from './lib/fetchJson';
 import Search from './pages/search';
 
-import "@fontsource/inter"
-import "@fontsource/inter/100.css"
-
 export type Config = {
   title: string;
   navbarColor: string;

diff --git a/ui/src/index.tsx b/ui/src/index.tsx
@@ -5,6 +5,11 @@ import App, { Config } from './App';
 import './styles/styles.css';
 import './styles/prism.css';
 
+import "@fontsource/inter"
+import "@fontsource/inter/300.css"
+import "@fontsource/inter/400.css"
+import "@fontsource/inter/500.css"
+import "@fontsource/inter/600.css"
 import '@fontsource/roboto/300.css';
 import '@fontsource/roboto/400.css';
 import '@fontsource/roboto/500.css';

diff --git a/ui/webpack.prod.js b/ui/webpack.prod.js
@@ -21,7 +21,7 @@ module.exports = merge(common, {
   output: {
     filename: 'bundle.js',
     path: path.resolve(__dirname, 'dist'),
-    publicPath: '/assets/js/',
+    publicPath: '/assets/',
     clean: true,
   },
 });