Refactor package.json2.2.0

1 files changed, 12 insertions, 22 deletions

diff --git a/package.json b/package.json
index 70f0159..3c4aa8f 100644
--- a/package.json
+++ b/package.json
@@ -1,32 +1,22 @@
 {
   "name": "abridge-bundle",
-  "version": "1.2.2",
-  "description": "Abridge - bundle and minify js",
+  "version": "2.0.0",
+  "description": "Abridge - set PWA cache files list, bundle and minify js",
   "author": "Jake G <106644+Jieiku@users.noreply.github.com>",
   "license": "MIT",
   "homepage": "https://github.com/Jieiku/abridge",
   "scripts": {
-    "all": "npm run theme && npm run theme-light && npm run katex-bundle && npm run search-elasticlunr && npm run search-stork && npm run search-tinysearch && npm run abridge-bundle-nosearch && npm run abridge-bundle-elasticlunr && npm run pwa-minify",
-    "nonbundles": "npm run theme && npm run theme-light && npm run pwa-minify && npm run katex-bundle && npm run search-elasticlunr && npm run search-stork && npm run search-tinysearch",
-    "theme": "uglifyjs static/js/theme.js -c -m -o static/js/theme.min.js",
-    "theme-light": "uglifyjs static/js/theme_light.js -c -m -o static/js/theme_light.min.js",
-    "pwa-cache": "h_abridge_css=$(shasum -a256 'public/abridge.css'|cut -d' ' -f1|cut -c1-20) && h_abridge=$(shasum -a256 'public/js/abridge.min.js'|cut -d' ' -f1|cut -c1-20) && h_abridge_nosearch=$(shasum -a256 'public/js/abridge_nosearch.min.js'|cut -d' ' -f1|cut -c1-20) && h_katexbundle=$(shasum -a256 'public/js/katexbundle.min.js'|cut -d' ' -f1|cut -c1-20) && CACHEFILES=$(find public -type f | sed 's/^public//' | sed 's/^\\/sw\\..*//' | sed 's/.*sw_load.*//' | sed 's/index.html//' | sort | uniq | sed '/^$/d' | sed \"s/\\(.*\\)/'\\1'/\" | tr '\\n' ',' | uniq | sed 's/.$//' | sed \"s/\\(.*\\)/\\[\\1\\]/\") && CACHEFILES=$(echo $CACHEFILES | sed \"s|abridge\\.css|abridge\\.css\\?h=$h_abridge_css|\") && CACHEFILES=$(echo $CACHEFILES | sed \"s|abridge\\.min\\.js|abridge\\.min\\.js\\?h=$h_abridge|\") && CACHEFILES=$(echo $CACHEFILES | sed \"s|abridge_nosearch\\.min\\.js|abridge_nosearch\\.min\\.js\\?h=$h_abridge_nosearch|\") && CACHEFILES=$(echo $CACHEFILES | sed \"s|katexbundle\\.min\\.js|katexbundle\\.min\\.js\\?h=$h_katexbundle|\") && sed -i \"s|BASE_CACHE_FILES =.*|BASE_CACHE_FILES = $CACHEFILES\\;|\" 'static/sw.js'",
-    "pwa-minify": "uglifyjs static/js/sw_load.js -c -m -o static/js/sw_load.min.js && uglifyjs static/sw.js -c -m -o static/sw.min.js",
-    "pwa": "npm run pwa-cache && npm run pwa-minify",
-    "katex-bundle": "uglifyjs static/js/katex.min.js static/js/mathtex-script-type.min.js static/js/katex-auto-render.min.js static/js/katexoptions.js -c -m -o static/js/katexbundle.min.js",
-    "search-elasticlunr": "uglifyjs static/js/elasticlunr.min.js static/js/search.js -c -m -o static/js/search_elasticlunr.min.js",
-    "search-stork": "uglifyjs static/js/stork.js static/js/stork_config.js -c -m -o static/js/search_stork.min.js",
-    "search-tinysearch": "uglifyjs static/js/tinysearch.js -c -m -o static/js/search_tinysearch.min.js",
-    "abridge-bundle-nosearch": "uglifyjs static/js/prestyle.js static/js/theme_button.js static/js/email.js static/js/codecopy.js -c -m -o static/js/abridge_nosearch.min.js",
-    "abridge-bundle-elasticlunr": "uglifyjs static/js/prestyle.js static/js/theme_button.js static/js/search_elasticlunr.min.js static/js/email.js static/js/codecopy.js -c -m -o static/js/abridge.min.js",
-    "abridge-bundle-tinysearch": "uglifyjs static/js/prestyle.js static/js/theme_button.js static/js/search_tinysearch.min.js static/js/email.js static/js/codecopy.js -c -m -o static/js/abridge.min.js",
-    "abridge-bundle-stork": "uglifyjs static/js/prestyle.js static/js/theme_button.js static/js/search_stork.min.js static/js/email.js static/js/codecopy.js -c -m -o static/js/abridge.min.js",
-    "nosearch": "npm run nonbundles && npm run abridge-bundle-nosearch && sed -i \"s|^build_search_index.*|build_search_index = false|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = false|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build",
-    "elasticlunr": "npm run nonbundles && npm run abridge-bundle-elasticlunr && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'elasticlunr'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build",
-    "tinysearch": "npm run nonbundles && npm run abridge-bundle-tinysearch && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'tinysearch'|\" 'config.toml' && sed -i \"s|^draft.*|draft = false|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = true|\" 'content/static/stork_toml.md' && zola build && mkdir -p tmp && tinysearch --optimize --path tmp public/data_tinysearch/index.html && rsync -avz tmp/*.wasm static/ && rm -rf tmp",
-    "stork": "npm run nonbundles && npm run abridge-bundle-stork && sed -i \"s|^build_search_index.*|build_search_index = true|\" 'config.toml' && sed -i \"s|^search_library.*|search_library = 'stork'|\" 'config.toml' && sed -i \"s|^draft.*|draft = true|\" 'content/static/tinysearch_json.md' && sed -i \"s|^draft.*|draft = false|\" 'content/static/stork_toml.md' && zola build && stork build --input public/data_stork/index.html --output static/stork.st"
+    "abridge": "node package_abridge.js",
+    "build": "zola build && npm run abridge && zola build",
+    "serve": "zola build && npm run abridge && zola serve",
+    "tinysearch": "mkdir -p tmp && tinysearch --optimize --path tmp public/data_tinysearch/index.html && rsync -avz tmp/*.wasm static/ && rm -rf tmp",
+    "stork": "stork build --input public/data_stork/index.html --output static/stork.st"
   },
   "dependencies": {
-    "uglify-js": "^3.15.4"
+    "jq": "^1.7.2",
+    "fast-toml": "^0.5.4",
+    "uglify-js": "^3.17.4",
+    "jsonminify": "^0.4.2",
+    "replace-in-file": "^7.0.1"
   }
 }