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/src/drivers/webextension/js/driver.js b/src/drivers/webextension/js/driver.js index 4b9a40dc6..44089ec36 100644 --- a/src/drivers/webextension/js/driver.js +++ b/src/drivers/webextension/js/driver.js @@ -24,15 +24,9 @@ function getOption(name, defaultValue) { resolve(item.hasOwnProperty(name) ? item[name] : defaultValue); }; - try { - // Chrome, Firefox - browser.storage.local.get(name) - .then(callback) - .catch(error => wappalyzer.log(error, 'driver', 'error')); - } catch ( e ) { - // Edge - browser.storage.local.get(name, callback); - } + browser.storage.local.get(name) + .then(callback) + .catch(error => wappalyzer.log(error, 'driver', 'error')); }); } diff --git a/src/drivers/webextension/manifest.edge.json b/src/drivers/webextension/manifest.edge.json deleted file mode 100644 index 6c5d4c690..000000000 --- a/src/drivers/webextension/manifest.edge.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "name": "Wappalyzer", - "short_name": "Wappalyzer", - "author": "Elbert Alias", - "homepage_url": "https://www.wappalyzer.com/", - "description": "Identify web technologies", - "version": "5.1.6", - "default_locale": "en", - "manifest_version": 2, - "icons": { - "16": "images/icon_16.png", - "19": "images/icon_19.png", - "32": "images/icon_32.png", - "38": "images/icon_38.png", - "128": "images/icon_128.png" - }, - "page_action": { - "default_icon": { - "16": "images/icon_16.png", - "19": "images/icon_19.png", - "32": "images/icon_32.png", - "38": "images/icon_38.png", - "128": "images/icon_128.png" - }, - "default_title": "Wappalyzer", - "default_popup": "html/popup.html" - }, - "background": { - "page": "html/background.html", - "persistent": true - }, - "content_scripts": [ - { - "matches": [ - "http://*/*", - "https://*/*" - ], - "js": [ - "node_modules/webextension-polyfill/dist/browser-polyfill.js", - "js/content.js" - ], - "run_at": "document_idle" - }, - { - "matches": [ - "http://*/*", - "https://*/*" - ], - "js": [ - "js/browser-polyfill.js", - "js/iframe.js" - ], - "run_at": "document_start", - "all_frames": true - } - ], - "web_accessible_resources": [ - "js/inject.js" - ], - "options_page": "html/options.html", - "permissions": [ - "storage", - "tabs", - "webRequest", - "webNavigation", - "http://*/*", - "https://*/*" - ], - "content_security_policy": "script-src 'self'; object-src 'self'", - "-ms-preload": { - "backgroundScript": "js/ms_background_scripts_api_bridge.js", - "contentScript": "js/ms_content_scripts_api_bridge.js" - } -} -