Options
- -- - - -
- -- -
-diff --git a/bin/build b/bin/build index ea7ad0cc8..2bdd89fa1 100755 --- a/bin/build +++ b/bin/build @@ -54,7 +54,6 @@ zip -qr ../../../build/wappalyzer_webextension.zip . \ -x images/icon_50.png \ -x images/icon_150.png \ -x js/ms_\*.js \ - -x manifest.edge.json \ -x \*.log \ -x \*.lock \ -x \*.gitignore \ @@ -68,46 +67,4 @@ zip -qr ../../../build/wappalyzer_webextension.zip . \ popd > /dev/null -# Edge -#echo "Building Edge application..." -# -#pushd build > /dev/null -# -#webextension_dir="../$webextension_dir" -#manifest_dir="Wappalyzer/edgeextension/manifest" -# -#mv $webextension_dir/manifest.json $webextension_dir/manifest.webextension.json -#mv $webextension_dir/manifest.edge.json $webextension_dir/manifest.json -# -#sed -i "s/\"version\": \"[^\"]*\"/\"version\": \"$version\"/" $webextension_dir/manifest.json -# -#manifoldjs -l debug -p edgeextension -f edgeextension -m $webextension_dir/manifest.json -# -## Replace symlinks with actual files -#rm $manifest_dir/Extension/images/icons -# -#cp ../src/apps.json $manifest_dir/Extension -#cp ../src/wappalyzer.js $manifest_dir/Extension/js -#cp -r ../src/icons $manifest_dir/Extension/images -# -#mv $webextension_dir/manifest.json $webextension_dir/manifest.edge.json -#mv $webextension_dir/manifest.webextension.json $webextension_dir/manifest.json -# -#sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-NAME-HERE/1591Wappalyzer.Wappalyzer/' $manifest_dir/appxmanifest.xml -#sed -i 's/INSERT-YOUR-PACKAGE-IDENTITY-PUBLISHER-HERE/D240C22F-A6C1-45DF-BF7B-4C835064DF51/' $manifest_dir/appxmanifest.xml -#sed -i 's/INSERT-YOUR-PACKAGE-PROPERTIES-PUBLISHERDISPLAYNAME-HERE/Wappalyzer/' $manifest_dir/appxmanifest.xml -#sed -i 's/Version="0.\([^"]\+\)/Version="\1.0/' $manifest_dir/appxmanifest.xml -# -#cp $webextension_dir/images/icon_44.png $manifest_dir/Assets/Square44x44Logo.png -#cp $webextension_dir/images/icon_150.png $manifest_dir/Assets/Square150x150Logo.png -#cp $webextension_dir/images/icon_50.png $manifest_dir/Assets/StoreLogo.png -# -#manifoldjs -l debug -p edgeextension package $manifest_dir -# -#mv Wappalyzer/edgeextension/package/edgeExtension.appx wappalyzer_edge.appx -# -#rm -rf Wappalyzer -# -#popd > /dev/null - echo "Done (v$version)." diff --git a/bin/validate b/bin/validate index 1d6587600..dd9b12729 100755 --- a/bin/validate +++ b/bin/validate @@ -6,7 +6,7 @@ set -eu echo "Validating apps.json..." -jsonlint-cli -s schema.json src/apps.json +jsonlint-cli -tps schema.json src/apps.json > /tmp/apps.json && mv /tmp/apps.json src/apps.json echo "Validating regular expressions..." diff --git a/package.json b/package.json index 2148f0f67..cdb767828 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "dependencies": { - "file-type": "3.8.*", - "is-svg": "2.0.*", - "read-chunk": "2.0.*" + "file-type": "7.4.*", + "is-svg": "2.1.*", + "read-chunk": "2.1.*" } } diff --git a/schema.json b/schema.json index ac366218f..e66f71303 100644 --- a/schema.json +++ b/schema.json @@ -3,6 +3,9 @@ "type": "object", "additionalProperties": false, "properties": { + "$schema": { + "type": "string" + }, "categories": { "type": "object", "required": true, @@ -13,7 +16,7 @@ "required": true, "properties": { "priority": { - "type": "string" + "type": "number" }, "name": { "type": "string" @@ -31,13 +34,13 @@ "cats": { "type": "array", "items": { - "type": "string" + "type": "number" }, "required": true }, - "env": { - "type": [ "string", "array" ], - "items": { + "js": { + "type": "object", + "additionalProperties": { "type": "string" } }, @@ -48,19 +51,28 @@ } }, "html": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } }, "excludes": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } }, "implies": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } @@ -72,7 +84,10 @@ } }, "script": { - "type": [ "string", "array" ], + "type": [ + "string", + "array" + ], "items": { "type": "string" } diff --git a/src/apps.json b/src/apps.json index 349376559..2dcff4fba 100644 --- a/src/apps.json +++ b/src/apps.json @@ -1,11291 +1,12468 @@ { - "apps": { - "1&1": { - "cats": [ - "6" - ], - "icon": "1and1.svg", - "implies": "PHP", - "url": "/shop/catalog/browse\\?sessid=", - "website": "http://1and1.com" - }, - "1C-Bitrix": { - "cats": [ - "1" - ], - "headers": { - "Set-Cookie": "^BITRIX_", - "X-Powered-CMS": "^Bitrix Site Manager" - }, - "html": "(?:]+components/bitrix|(?:src|href)=\"/bitrix/(?:js|templates))", - "icon": "1C-Bitrix.png", - "implies": "PHP", - "script": "1c-bitrix", - "website": "http://www.1c-bitrix.ru" - }, - "2z Project": { - "cats": [ - "1" - ], - "icon": "2z Project.png", - "meta": { - "generator": "2z project ([\\d.]+)\\;version:\\1" - }, - "website": "http://2zproject-cms.ru" - }, - "3DM": { - "cats": [ - "19" - ], - "html": "
- - - -
- -- -
-+ + + +
+ ++ + + +
+