diff --git a/.travis.yml b/.travis.yml index bcb0ff4..26cf336 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,8 @@ before_deploy: - > if ! [ "$BEFORE_DEPLOY_RUN" ]; then export BEFORE_DEPLOY_RUN=1; - openssl aes-256-cbc -K $encrypted_351cc0f0ed5f_key -iv $encrypted_351cc0f0ed5f_iv -in burlesco-pkcs8-key.pem.enc -out burlesco-pkcs8-key.pem -d; + openssl aes-256-cbc -K $encrypted_094982294358_key -iv $encrypted_094982294358_iv + -in burlesco-pkcs8-key.pem.enc -out burlesco-pkcs8-key.pem -d make build; bash scripts/gen-gh-pages.sh; fi diff --git a/Makefile b/Makefile index 20d5d96..72d8a99 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,9 @@ all: clean lint pre-build clean: rm -rf "$(DIST_DIR)" lint: - find . -name '*.json' -exec python -c 'import json; json.load(open("{}"))' \; - npx eslint src + set -e ; \ + find . -path ./node_modules -prune -false -o -name '*.json' -exec python -c 'import json; json.load(open("{}"))' \; ;\ + npx eslint src; pre-build: clean set -e ; \ for i in $(BROWSERS) ; do \ @@ -30,9 +31,6 @@ build: pre-build DIR="$(DIST_DIR)/$$i" ; \ FILE=burlesco-$$i.zip ; \ if [ $$i = "chromium" ]; then \ - if [ ! -f "$(CRX3_KEY)" ]; then \ - openssl genpkey -out "$(CRX3_KEY)" -algorithm RSA -pkeyopt rsa_keygen_bits:2048 2>/dev/null ; \ - fi ; \ zip -jr9X "$$DIR/$$FILE" $$DIR/src/* ; \ cat "$$DIR/$$FILE" | crx3 --crxPath="$$DIR/burlesco-chromium.crx" \ --keyPath="$(CRX3_KEY)" ; \ diff --git a/burlesco-pkcs8-key.pem.enc b/burlesco-pkcs8-key.pem.enc index b178395..76aa1c0 100644 Binary files a/burlesco-pkcs8-key.pem.enc and b/burlesco-pkcs8-key.pem.enc differ diff --git a/package-lock.json b/package-lock.json index 05f2ced..a4655f8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -638,6 +638,15 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==" }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", @@ -946,6 +955,7 @@ "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1" } } @@ -1273,9 +1283,9 @@ } }, "crx3": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/crx3/-/crx3-1.0.1.tgz", - "integrity": "sha512-gCPa3rJ4/bFuxVjdTtsMvnxzptx56pVk6jIWLsEWmjGuU4DIg1/mYztsqbF9k2ilaTo9zq1SAQU0Xb00EwoXPA==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/crx3/-/crx3-1.1.2.tgz", + "integrity": "sha512-EYp/rDiA7RbvsUJDAYaiUMEh2unG4bS6jX+4Qtv+JjuMf5CqFmGK0StdlKpSy06kgg7iosb8EtijznCsg5rnjw==", "requires": { "mri": "^1.1.4", "pbf": "^3.2.0", @@ -2025,6 +2035,12 @@ "flat-cache": "^2.0.1" } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -3334,9 +3350,9 @@ "optional": true }, "mri": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.4.tgz", - "integrity": "sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz", + "integrity": "sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==" }, "ms": { "version": "2.1.1", @@ -3788,9 +3804,9 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "pbf": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.0.tgz", - "integrity": "sha512-98Eh7rsJNJF/Im6XYMLaOW3cLnNyedlOd6hu3iWMD5I7FZGgpw8yN3vQBrmLbLodu7G784Irb9Qsv2yFrxSAGw==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", + "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", "requires": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -3882,9 +3898,9 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==" }, "protocol-buffers-schema": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz", - "integrity": "sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w==" + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.4.0.tgz", + "integrity": "sha512-G/2kcamPF2S49W5yaMGdIpkG6+5wZF0fzBteLKgEHjbNzqjZQ85aAs1iJGto31EJaSTkNvHs5IXuHSaTLWBAiA==" }, "psl": { "version": "1.8.0", diff --git a/package.json b/package.json index 47c82b6..c466e48 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "", "dependencies": { "crx": "^4.0.1", - "crx3": "^1.0.1", + "crx3": "^1.1.2", "crypto": "^1.0.1", "eslint": "^5.16.0", "web-ext": "^4.3.0"