Skip to content

Commit

Permalink
v0.3.0: TS, legacy DB, external addons, bugfixes, etc (#143)
Browse files Browse the repository at this point in the history
* initial conversion to typescript

* Working create-chrome-ext wth typescript build

* Bring back makefile for firefox

* Update readme

* Add id for firefox

* Fix images in readme

* bump manifest version 0.3.0

* Fix the check for gold check marks (#116)

Check for all blockable types when checking if an account should be blocked.

* poc

* db works, did some fixins for some other shit, idea for extension integration too

* use fetch

* a bunch of small things tracked on pull 126 comment

* remove set options

* popup stuff

* add search fix

* some misc changes before I head to bed

* integration button

* fix some things in the critical point logic

* add unblocked logic

* misc js files and final tab conversions

* use await so that future integrations can be added easily

* fix manifest and builder

* cleanup some dev stuff

* fix the repeated blocking issue

* better consumer logic

* fix queue page lock

* return from soupcan integration on success

* only show integration if enabled

* update editor config

* use indexeddb as well as fix message listeners

* fix users queued before 0.3.0

* fix queue locking

* make queue interval assignable

* don't add undefined headers and cleanup some block/unblock logic

* add changes to changelog

---------

Co-authored-by: Jared Kotoff <[email protected]>
  • Loading branch information
kheina and jaredcat authored Jun 26, 2023
1 parent ea345cf commit e648c47
Show file tree
Hide file tree
Showing 57 changed files with 4,321 additions and 1,191 deletions.
26 changes: 26 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# EditorConfig is awesome: https://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true

# Matches multiple files with brace expansion notation
# Set default charset
[*.{js,jsx,ts,tsx,md}]
charset = utf-8
indent_style = tab
indent_size = 4
tab_width = 4
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true


# Matches the exact files either package.json or .travis.yml
[{package.json,.travis.yml}]
indent_style = tab
indent_size = 4
21 changes: 21 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,23 @@
# built package files
build
*.zip
firefox-manifest.json

# dependencies
node_modules

# testing
coverage

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
.history
*.log
vite.config.ts.*

# secrets
secrets.*.js
27 changes: 27 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# OS
.DS_Store

# ignore node dependency directories & lock
node_modules
yarn.lock
pnpm-lock.yaml
package-lock.json

# ignore log files and local
*.log
*.local
.env.local
.env.development.local
.env.test.local
.env.production.local
.history

# ignore compiled files
build
types
coverage
*.zip

# ignore ide settings
.idea
.vscode
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Ignore artifacts:
build
coverage
node_modules
pnpm-lock.yaml
pnpm-workspace.yaml
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"jsxSingleQuote": false,
"singleQuote": true,
"trailingComma": "all",
"endOfLine": "lf",
"printWidth": 100,
"semi": true,
"tabWidth": 4,
"useTabs": true
}
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# CHANGELOG
```txt
Summary
1. document grouping follow 'SemVer2.0' protocol
2. use 'PATCH' as a minimum granularity
3. use concise descriptions
4. type: feat \ fix \ update \ perf \ remove \ docs \ chore
5. version timestamp follow the yyyy.MM.dd format
```

## v0.3.0 [2023.06.26]
- chore: migrate to create-chrome-ext with typescript
- chore: also check profile shape to detect nft avatars (#130)
- feat: use travis brown's verified db to check legacy verifications (#134)
- feat: integration with soupcan (#139)
- fix: queue locking and overly fast blocking (#66)
- fix: critical point logic in queue and counter new generate ref ids per lock
- fix: ignore error responses from twitter (#142)
- perf: change user object in queue to be slimmer
Binary file removed assets/icon.png
Binary file not shown.
49 changes: 0 additions & 49 deletions constants.js

This file was deleted.

54 changes: 0 additions & 54 deletions firefox-manifest.json

This file was deleted.

10 changes: 0 additions & 10 deletions main.js

This file was deleted.

63 changes: 27 additions & 36 deletions makefile
Original file line number Diff line number Diff line change
@@ -1,47 +1,38 @@
VERSION := $(shell cat manifest.json | jq .version)

NULL := $(shell rm -rf build && npm run build)
VERSION := $(shell cat build/manifest.json | jq .version)

.PHONY: firefox
firefox:
# ifneq (,$(wildcard blue-blocker-firefox-$(VERSION).zip))
# rm "blue-blocker-firefox-${VERSION}.zip"
# endif
# ifneq (,$(wildcard blue-blocker-firefox-$(VERSION).zip))
# rm "blue-blocker-firefox-${VERSION}.zip"
# endif

# create temp copy of chrome manifest
cp build/manifest.json firefox-manifest.json
# change version to 2
jq '.manifest_version = 2' firefox-manifest.json >tmp.json && mv tmp.json firefox-manifest.json
# change background object to use script instead of service worker
jq '.background = {"scripts": ["service-worker-loader.js"],"type": "module"}' firefox-manifest.json >tmp.json && mv tmp.json firefox-manifest.json
# make web_accessible_resources an array of strings
jq '.web_accessible_resources = .web_accessible_resources[0].resources' firefox-manifest.json >tmp.json && mv tmp.json firefox-manifest.json
# move action to browser_action
jq '.["browser_action"] = .action | del(.action)' firefox-manifest.json >tmp.json && mv tmp.json firefox-manifest.json
# replace chrome manifest with firefox manifest
jq '.browser_specific_settings = {"gecko": {"id": "{119be3f3-597c-4f6a-9caf-627ee431d374}"}}' firefox-manifest.json >tmp.json && mv tmp.json firefox-manifest.json
mv firefox-manifest.json build/manifest.json

mv manifest.json chrome-manifest.json
mv firefox-manifest.json manifest.json
zip "blue-blocker-firefox-${VERSION}.zip" \
assets/icon-128-greyscale.png \
assets/icon-128.png \
assets/icon.png \
assets/error.png \
injected/* \
models/* \
parsers/* \
popup/* \
pages/* \
manifest.json \
build/* \
LICENSE \
readme.md \
*.js
mv manifest.json firefox-manifest.json
mv chrome-manifest.json manifest.json
README.md

.PHONY: chrome
chrome:
# ifneq (,$(wildcard blue-blocker-chrome-$(VERSION).zip))
# rm "blue-blocker-chrome-${VERSION}.zip"
# endif
# ifneq (,$(wildcard blue-blocker-chrome-$(VERSION).zip))
# rm "blue-blocker-chrome-${VERSION}.zip"
# endif
zip "blue-blocker-chrome-${VERSION}.zip" \
assets/icon-128-greyscale.png \
assets/icon-128.png \
assets/icon.png \
assets/error.png \
injected/* \
models/* \
parsers/* \
popup/* \
pages/* \
manifest.json \
build/* \
LICENSE \
readme.md \
*.js
README.md

49 changes: 0 additions & 49 deletions manifest.json

This file was deleted.

Loading

0 comments on commit e648c47

Please sign in to comment.