Merge remote-tracking branch 'origin/deps'

pirxpilot · Sep 17, 2024 · 504bbae · 504bbae
2 parents 8e94655 + 240b7b4
commit 504bbae
Show file tree

Hide file tree

Showing 7 changed files with 250 additions and 381 deletions.
diff --git a/Makefile b/Makefile
@@ -60,7 +60,15 @@ all: lint test build
 		--output $@ $@
 
 %.min.css: %.css
-	$(NODE_BIN)/cleancss -O1 --output $@ $<
+	$(NODE_BIN)/esbuild \
+		--log-level=warning \
+		--color=false \
+		--minify \
+		--external:*.woff2 \
+		--sourcemap=external \
+		--sources-content=false \
+		--bundle $< \
+		--outfile=$@
 
 node_modules: package.json pnpm-lock.yaml
 	pnpm install -C $(@D) --silent --frozen-lockfile
@@ -78,10 +86,10 @@ $(BUILD_DIR):
 	mkdir -p $@
 
 $(BUILD_DIR)/$(PROJECT).js: lib/client/boot/index.js $(SRC) node_modules | $(BUILD_DIR)
-	NODE_PATH=lib/client:node_modules $(RUN_ESBUILD)
+	$(RUN_ESBUILD)
 
 $(BUILD_DIR)/$(PROJECT).min.js: lib/client/boot/index.js $(SRC) node_modules | $(BUILD_DIR)
-	NODE_PATH=lib/client:node_modules $(RUN_ESBUILD_MIN)
+	$(RUN_ESBUILD_MIN)
 
 $(BUILD_DIR)/$(PROJECT)-embed.js: lib/embed/index.js | $(BUILD_DIR)
 	$(RUN_ESBUILD)

diff --git a/biome.json b/biome.json
@@ -26,7 +26,9 @@
       "recommended": true,
       "correctness": {
         "all": true,
-        "noNodejsModules": "off"
+        "noNodejsModules": "off",
+        "useImportExtensions": "off"
+
       },
       "complexity": {
         "noForEach": "off",

diff --git a/lib/client/boot/index.js b/lib/client/boot/index.js
@@ -1,9 +1,9 @@
-const minimax = require('minimax');
-const resort = require('resort');
-const state = require('state');
-const tag = require('tag');
-const about = require('about');
-const stats = require('stats');
+const minimax = require('../minimax');
+const resort = require('../resort');
+const state = require('../state');
+const tag = require('../tag');
+const about = require('../about');
+const stats = require('../stats');
 const height = require('./height');
 const serviceWorker = require('./service-worker');
 

diff --git a/lib/client/resort/webcams.js b/lib/client/resort/webcams.js
@@ -1,5 +1,5 @@
-const swipe = require('swipe');
-const pager = require('pager');
+const swipe = require('@pirxpilot/swipe');
+const pager = require('tiny-pager');
 
 /*global setInterval,clearInterval */
 

diff --git a/lib/client/state/index.js b/lib/client/state/index.js
@@ -2,7 +2,7 @@ const cookie = require('js-cookie');
 
 /*global window*/
 
-const k = require('k')(window);
+const k = require('@pirxpilot/k')(window);
 
 module.exports = state;
 

diff --git a/package.json b/package.json
@@ -18,14 +18,6 @@
     "Makefile"
   ],
   "main": "app.js",
-  "browser": {
-    "el": "el-component",
-    "k": "@pirxpilot/k",
-    "load": "dynload",
-    "pager": "tiny-pager",
-    "rating": "ro-rating",
-    "swipe": "@pirxpilot/swipe"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/pirxpilot/liftie.git"
@@ -49,7 +41,7 @@
     "dynload": "^1.0.2",
     "el-component": "^1.0.1",
     "errorhandler": "^1.5.0",
-    "esbuild": "^0.20.1",
+    "esbuild": "^0.23.1",
     "express": "^4.16.2",
     "htmlparser2": "~9",
     "js-cookie": "^3.0.5",
@@ -58,15 +50,14 @@
     "morgan": "^1.9.0",
     "qs": "^6.3.0",
     "ro-rating": "^1.0.2",
-    "superagent": "~9",
+    "superagent": "~10.1.0",
     "tiny-pager": "^1.0.0",
     "to-title-case": "^1.0.0"
   },
   "devDependencies": {
     "@biomejs/biome": "^1.5.1",
     "@pirxpilot/replay": "^2.2.1",
-    "clean-css-cli": "^5.6.3",
-    "commander": "~12.0.0",
+    "commander": "~12",
     "postcss": "~8",
     "postcss-cachify": "^4.0.0",
     "postcss-cli-simple": "~4.0.0",