dochne · max-ostapenko · Sep 22, 2023 · Sep 22, 2023 · Sep 25, 2023 · Sep 25, 2023
diff --git a/.github/ISSUE_TEMPLATE/technology-request.md b/.github/ISSUE_TEMPLATE/technology-request.md
@@ -7,4 +7,4 @@ assignees: ''
 
 ---
 
-You may request a new technology to be added but chances of having it included are greatly improved if you submit a pull request. Please refer to the [contributing guide](https://github.com/AliasIO/wappalyzer/blob/master/CONTRIBUTING.md).
+You may request a new technology to be added but chances of having it included are greatly improved if you submit a pull request. Please refer to the [contributing guide](https://github.com/HTTPArchive/wappalyzer/blob/main/CONTRIBUTING.md).
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -1,6 +1,8 @@
 name: Validate
 on:
   push:
+    branches:
+      - main
   pull_request:
 
 permissions:

diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,10 @@
 /build/*
 /src/images/icons/converted/*
-/src/manifest.json
-/src/manifest.bak.json
-
 node_modules
 package-lock.json
-
-!.gitkeep
-
 Thumbs.db
 Desktop.ini
 *.DS_Store
 *.log
 ._*
-tags
-tags.*
 .idea
-/nbproject/private/
-src/out.json
-
-keys.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,10 +1,10 @@
 # Contributing
 
-Wappalyzer is an [GPLv3 licensed](https://github.com/wappalyzer/wappalyzer/blob/master/LICENSE), open source project written in JavaScript. Anyone is welcome to contribute.
+Wappalyzer is an [GPLv3 licensed](https://github.com/HTTPArchive/wappalyzer/blob/main/LICENSE), open source project written in JavaScript. Anyone is welcome to contribute.
 
 ## Getting started
 
-To get started, see the [README](https://github.com/wappalyzer/wappalyzer/blob/master/README.md).
+To get started, see the [README](https://github.com/HTTPArchive/wappalyzer/blob/main/README.md).
 
 ## Submitting changes
 
@@ -15,23 +15,19 @@ To get started, see the [README](https://github.com/wappalyzer/wappalyzer/blob/m
 
 ## Adding a new technology
 
-Wappalyzer uses [regular expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) to fingerprint technologies. Refer to the [specification](https://github.com/wappalyzer/wappalyzer/blob/master/README.md#specification) for detail.
+Wappalyzer uses [regular expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) to fingerprint technologies. Refer to the [specification](https://github.com/HTTPArchive/wappalyzer/blob/main/README.md#specification) for detail.
 
-- Add a new block to [`src/technologies/*.json`](https://github.com/wappalyzer/wappalyzer/blob/master/src/technologies). The filename should match the first letter of the technology name (a-z). Use `_.json` if the first character is a number or symbol.
-- Add an icon to [`src/images/icons`](https://github.com/wappalyzer/wappalyzer/tree/master/src/images/icons). The image must be square, either SVG or PNG (32 x 32 pixels).
+- Add a new block to [`src/technologies/*.json`](https://github.com/HTTPArchive/wappalyzer/blob/main/src/technologies). The filename should match the first letter of the technology name (a-z). Use `_.json` if the first character is a number or symbol.
+- Add an icon to [`src/images/icons`](https://github.com/HTTPArchive/wappalyzer/tree/master/src/images/icons). The image must be square, either SVG or PNG (32 x 32 pixels).
 
 Only widely used technologies are accepted. When creating a pull request, include ten or more links to websites that use the application, a GitHub page with at least 1,000 stars or anything that will help establish the size of the user base.
 
 ## Adding a new category
 
-Please [open an issue on GitHub](https://github.com/wappalyzer/wappalyzer/issues) first to discuss the need for a new category.
+Please [open an issue on GitHub](https://github.com/HTTPArchive/wappalyzer/issues) first to discuss the need for a new category.
 
-To add a category, edit [`src/categories.json`](https://github.com/wappalyzer/wappalyzer/blob/master/src/categories.json) and update every [locale](https://github.com/wappalyzer/wappalyzer/tree/master/src/_locales). You may use the English category name in all of them.
-
-## Adding a new translation
-
-To add a new translation, copy the `en` folder in [`src/_locales`](https://github.com/wappalyzer/wappalyzer/tree/master/src/_locales), rename it to the relevant two-letter country code and update the containing `messages.json` file.
+To add a category, edit [`src/categories.json`](https://github.com/HTTPArchive/wappalyzer/blob/main/src/categories.json) and update every [locale](https://github.com/HTTPArchive/wappalyzer/tree/master/src/_locales). You may use the English category name in all of them.
 
 ## Adding a new feature
 
-Please [open an issue on GitHub](https://github.com/wappalyzer/wappalyzer/issues) first. New features and large changes are rarely accepted without prior discussion.
+Please [open an issue on GitHub](https://github.com/HTTPArchive/wappalyzer/issues) first. New features and large changes are rarely accepted without prior discussion.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Validate](https://github.com/wappalyzer/wappalyzer/actions/workflows/validate.yml/badge.svg)](https://github.com/wappalyzer/wappalyzer/actions/workflows/validate.yml)
+[![Validate](https://github.com/HTTPArchive/wappalyzer/actions/workflows/validate.yml/badge.svg)](https://github.com/HTTPArchive/wappalyzer/actions/workflows/validate.yml)
 [![Github Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&link=https://github.com/sponsors/AliasIO)](https://github.com/sponsors/AliasIO)
 
 <a href="https://www.wappalyzer.com/?utm_source=readme&utm_medium=github&utm_campaign=wappalyzer"><img src="https://www.wappalyzer.com/images/logo/icon_192.png" height="72" alt="Wappalyzer" align="left" /></a>
@@ -13,12 +13,11 @@
 
 - [Git](https://git-scm.com)
 - [Node.js](https://nodejs.org) version 14 or higher
-- [Yarn](https://yarnpkg.com)
 
 ## Quick start
 
 ```sh
-git clone https://github.com/wappalyzer/wappalyzer.git
+git clone https://github.com/HTTPArchive/wappalyzer.git
 cd wappalyzer
 yarn install
 ```
@@ -27,24 +26,18 @@ yarn install
 
 ### Chrome extension
 
-- Go to `about:extensions`
+- Go to `chrome:extensions`
 - Enable 'Developer mode'
 - Click 'Load unpacked'
 - Select `src`
 
-### Firefox extension
-
-- Go to `about:debugging#/runtime/this-firefox`
-- Click 'Load Temporary Add-on'
-- Select `src/manifest.json`
-
 ## Specification
 
 A long list of [regular expressions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions) is used to identify technologies on web pages. Wappalyzer inspects HTML code, as well as JavaScript variables, response headers and more.
 
-Patterns (regular expressions) are kept in [`src/technologies/`](https://github.com/wappalyzer/wappalyzer/blob/master/src/technologies). The following is an example of an application fingerprint.
+Patterns (regular expressions) are kept in [`src/technologies/`](https://github.com/HTTPArchive/wappalyzer/tree/main/src/technologies). The following is an example of an application fingerprint.
 
-#### Example
+### Example
 
 ```json
 "Example": {
@@ -104,7 +97,7 @@ Patterns (regular expressions) are kept in [`src/technologies/`](https://github.
 
 ## JSON fields
 
-Find the JSON schema at [`schema.json`](https://github.com/wappalyzer/wappalyzer/blob/master/schema.json).
+Find the JSON schema at [`schema.json`](https://github.com/HTTPArchive/wappalyzer/blob/main/schema.json).
 
 ### Required properties
 

diff --git a/bin/build.js b/bin/build.js
@@ -2,7 +2,7 @@ const fs = require('fs')
 const Zip = require('adm-zip')
 
 const currentVersion = JSON.parse(
-  fs.readFileSync('./src/manifest-v3.json')
+  fs.readFileSync('./src/manifest.json')
 ).version
 
 const version = process.argv[2]
@@ -16,30 +16,16 @@ if (!version) {
   process.exit(1)
 }
 
-;['./src/manifest-v2.json', './src/manifest-v3.json'].forEach((file) => {
+;['./src/manifest.json'].forEach((file) => {
   const json = JSON.parse(fs.readFileSync(file))
 
   json.version = version
 
   fs.writeFileSync(file, JSON.stringify(json, null, 2))
 })
 
-fs.copyFileSync(`./src/manifest.json`, './src/manifest.bak.json')
-
-fs.copyFileSync(`./src/manifest-v2.json`, './src/manifest.json')
-
-let zip = new Zip()
-
-zip.addLocalFolder('./src', '')
-
-zip.writeZip('./build/webextension-v2.zip')
-
-fs.copyFileSync(`./src/manifest-v3.json`, './src/manifest.json')
-
-zip = new Zip()
+const zip = new Zip()
 
 zip.addLocalFolder('./src', '')
 
-zip.writeZip('./build/webextension-v3.zip')
-
-fs.copyFileSync(`./src/manifest.bak.json`, './src/manifest.json')
+zip.writeZip('./build/webextension.zip')
diff --git a/bin/manifest.js b/bin/manifest.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@prantlf/jsonlint": "^10.2.0",
+    "@prantlf/jsonlint": "^14.0.3",
     "adm-zip": "^0.4.16",
     "convert-svg-to-png": "^0.5.0"
   },
@@ -17,11 +17,10 @@
     "terminal-overwrite": "^2.0.1"
   },
   "scripts": {
-    "lint": "eslint src/**/*.{js,json}",
-    "lint:fix": "eslint --fix src/**/*.{js,json}",
-    "validate": "yarn run lint && jsonlint -qV ./schema.json ./src/technologies/ && node ./bin/validate.js",
+    "lint": "eslint src/**/*.{js,json} && jsonlint -jsV ./schema.json --trim-trailing-commas --enforce-double-quotes ./src/technologies/ && jsonlint -js --trim-trailing-commas --enforce-double-quotes ./src/categories.json",
+    "lint:fix": "eslint --fix src/**/*.{js,json} && jsonlint -isV ./schema.json --trim-trailing-commas --enforce-double-quotes ./src/technologies/ && jsonlint -is --trim-trailing-commas --enforce-double-quotes ./src/categories.json",
+    "validate": "yarn run lint && node ./bin/validate.js",
     "convert": "node --no-warnings ./bin/convert.js",
-    "prettify": "jsonlint -si --trim-trailing-commas --enforce-double-quotes ./src/categories.json ./src/technologies/*.json",
     "build": "yarn run validate && yarn run prettify && yarn run convert && node ./bin/build.js",
     "build:safari": "xcrun safari-web-extension-converter --swift --project-location build --force src",
     "manifest": "node ./bin/manifest.js"

diff --git a/schema.json b/schema.json
@@ -8,6 +8,7 @@
   },
   "type": "object",
   "additionalProperties": {
+    "type": "object",
     "additionalProperties": false,
     "required": ["cats","website"],
     "properties": {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ assignees: ''

		---

		You may request a new technology to be added but chances of having it included are greatly improved if you submit a pull request. Please refer to the [contributing guide](https://github.com/AliasIO/wappalyzer/blob/master/CONTRIBUTING.md).
		You may request a new technology to be added but chances of having it included are greatly improved if you submit a pull request. Please refer to the [contributing guide](https://github.com/HTTPArchive/wappalyzer/blob/main/CONTRIBUTING.md).