Revert build changes

hugo-vrijswijk · Mar 16, 2024 · 1ab640f · 1ab640f
1 parent 0a2f744
commit 1ab640f
Show file tree

Hide file tree

Showing 11 changed files with 974 additions and 556 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -13,7 +13,7 @@
 !/package-lock.json
 !/requirements.dev.txt
 !/requirements.txt
-!/rollup.config.mjs
+!/rollup.config.js
 !/supervisord.conf
 !/uwsgi.ini
 !/version.txt

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -7,18 +7,17 @@ jobs:
     name: Unit Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 20
-          cache: 'npm'
+          node-version: 18
       - name: Install Node dependencies
-        run: npm ci
+        run: npm install
       - name: Setup Python environment
         run: pip install -r requirements.txt -r requirements.dev.txt
       - name: Run tests
@@ -27,18 +26,17 @@ jobs:
     name: E2E Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
-          node-version: 20
-          cache: 'npm'
+          node-version: 18
       - name: Install Node dependencies
-        run: npm ci
+        run: npm install
       - name: Setup Python environment
         run: |
           pip install -r requirements.txt -r requirements.dev.txt

diff --git a/bookmarks/frontend/components/SearchAutoComplete.svelte b/bookmarks/frontend/components/SearchAutoComplete.svelte
@@ -209,9 +209,9 @@
     {/if}
     {#each suggestions.tags as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <button on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
-        </button>
+        </a>
       </li>
     {/each}
 
@@ -220,9 +220,9 @@
     {/if}
     {#each suggestions.recentSearches as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <button on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
-        </button>
+        </a>
       </li>
     {/each}
 
@@ -231,9 +231,9 @@
     {/if}
     {#each suggestions.bookmarks as suggestion}
       <li class="menu-item" class:selected={selectedIndex === suggestion.index}>
-        <button  on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
+        <a href="#" on:mousedown|preventDefault={() => completeSuggestion(suggestion)}>
           {suggestion.label}
-        </button>
+        </a>
       </li>
     {/each}
   </ul>

diff --git a/bookmarks/frontend/components/TagAutocomplete.svelte b/bookmarks/frontend/components/TagAutocomplete.svelte
@@ -131,9 +131,9 @@
     <!-- menu list items -->
     {#each suggestions as tag,i}
       <li class="menu-item" class:selected={selectedIndex === i}>
-        <button on:mousedown|preventDefault={() => complete(tag)}>
+        <a href="#" on:mousedown|preventDefault={() => complete(tag)}>
           {tag.name}
-        </button>
+        </a>
       </li>
     {/each}
   </ul>

diff --git a/bookmarks/frontend/index.js b/bookmarks/frontend/index.js
@@ -1,10 +1,16 @@
-import './behaviors/bookmark-page';
-import './behaviors/bulk-edit';
-import './behaviors/confirm-button';
-import './behaviors/dropdown';
-import './behaviors/modal';
-import './behaviors/global-shortcuts';
-import './behaviors/tag-autocomplete';
-export { default as TagAutoComplete } from './components/TagAutocomplete.svelte';
-export { default as SearchAutoComplete } from './components/SearchAutoComplete.svelte';
-export { ApiClient } from './api';
+import TagAutoComplete from "./components/TagAutocomplete.svelte";
+import SearchAutoComplete from "./components/SearchAutoComplete.svelte";
+import { ApiClient } from "./api";
+import "./behaviors/bookmark-page";
+import "./behaviors/bulk-edit";
+import "./behaviors/confirm-button";
+import "./behaviors/dropdown";
+import "./behaviors/modal";
+import "./behaviors/global-shortcuts";
+import "./behaviors/tag-autocomplete";
+
+export default {
+  ApiClient,
+  TagAutoComplete,
+  SearchAutoComplete,
+};
diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile
@@ -1,8 +1,8 @@
-FROM node:20-alpine AS node-build
+FROM node:18.18.0-alpine AS node-build
 WORKDIR /etc/linkding
 # install build dependencies
-COPY rollup.config.mjs package.json package-lock.json ./
-RUN npm ci
+COPY rollup.config.js package.json package-lock.json ./
+RUN npm install
 # copy files needed for JS build
 COPY bookmarks/frontend ./bookmarks/frontend
 # run build

diff --git a/docker/default.Dockerfile b/docker/default.Dockerfile
@@ -1,8 +1,8 @@
-FROM node:20-alpine AS node-build
+FROM node:18.18.0-alpine AS node-build
 WORKDIR /etc/linkding
 # install build dependencies
-COPY rollup.config.mjs package.json package-lock.json ./
-RUN npm ci
+COPY rollup.config.js package.json package-lock.json ./
+RUN npm install
 # copy files needed for JS build
 COPY bookmarks/frontend ./bookmarks/frontend
 # run build