merge/patch pnpm-vite

hotosm · Oct 7, 2023 · 997810b · 997810b
1 parent cfdbf37
commit 997810b
Show file tree

Hide file tree

Showing 10 changed files with 11,243 additions and 30,333 deletions.
diff --git a/.github/workflows/r-frontend_tests.yml b/.github/workflows/r-frontend_tests.yml
@@ -17,17 +17,14 @@ jobs:
         with:
           node-version: "18"
 
-      - name: Cache Node Modules
-        uses: actions/cache@v3
+      - name: Setup pnpm
+        uses: pnpm/[email protected]
         with:
-          path: |
-            src/frontend/node_modules
-          keys: node-modules-${{ env.cache_id }}
-          restore-keys: |
-            node-modules-
+          package_json_file: src/frontend/main/package.json
+          version: 8.8.0
 
       - name: Test Frontend
+        working-directory: src/frontend/main
         run: |
-          cd src/frontend
-          npm ci --only-dev
-          npm run test
+          pnpm ci --only-dev
+          pnpm run test
diff --git a/src/frontend/debug.dockerfile b/src/frontend/debug.dockerfile
@@ -5,6 +5,9 @@ ARG FRONTEND_MAIN_URL
 ENV FRONTEND_MAIN_URL="${FRONTEND_MAIN_URL}"
 WORKDIR /app
 COPY ./package*.json ./
-RUN npm install
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+RUN pnpm install
 ENV NODE_ENV development
 ENTRYPOINT ["npm", "run", "start:live"]
diff --git a/src/frontend/src/index.html → src/frontend/main/index.html b/src/frontend/src/index.html → src/frontend/main/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -19,5 +19,6 @@
 
   <body>
     <div id="app"></div>
+    <script type="module" src="/src/App.jsx"></script>
   </body>
 </html>