Skip to content

Commit

Permalink
Merge branch 'feature/refactor' into develop
Browse files Browse the repository at this point in the history
* feature/refactor:
  Fix unsupported matchAboutBlank in Firefox, improve script execution stability
  Convert a few files to helper classes
  Fix call to create context menus, note unfixed workaround
  Use promise-based webextensions api
  Switch calls to webextensions
  Add webextension polyfill
  Split packaging between Chrome and WebExtensions
  Make code compatible with WebExtensions, primarily Firefox
  Add eslint-plugin-compat to check Chrome features
  Switch to ES2015 modules using rollup
  Split up source files
  • Loading branch information
joelpurra committed Mar 17, 2017
2 parents 1c2b5a3 + c7c6f4f commit 42e747b
Show file tree
Hide file tree
Showing 51 changed files with 4,056 additions and 2,151 deletions.
1 change: 1 addition & 0 deletions .eslintignore
@@ -1 +1,2 @@
node_modules/
lib/
10 changes: 9 additions & 1 deletion .eslintrc
@@ -1,15 +1,23 @@
{
"env": {
"browser": true,
"es6": true
},
"plugins": [
"compat"
],
"extends": ["standard"],
"extends": [
"standard"
],
"globals": {
"browser": false,
},
"rules": {
"block-scoped-var": "error",
"brace-style": "off",
"camelcase": "error",
"comma-dangle": ["error", "always-multiline"],
"compat/compat": "error",
"complexity": ["off", 5],
"consistent-this": ["error", "self"],
"curly": "error",
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
@@ -1,3 +1,4 @@
node_modules/
.package/
package/
*.zip
dist/
14 changes: 11 additions & 3 deletions DEVELOP.md
Expand Up @@ -108,8 +108,16 @@ git checkout develop
# Start a new feature. Us a descriptive "<feature-name>", such as "automatic-language-detection".
git flow feature start <feature-name>

# Watch the source files for changes; one command per terminal.
npm run --silent watch:background
npm run --silent watch:popup
npm run --silent watch:options

# Code your feature and add the files.

# Make sure the code builds.
npm run --silent rebuild

# Fix any warnings and errors before committing.
npm run --silent test

Expand All @@ -136,9 +144,6 @@ These steps are only done by the project owner.
# Finish up any features, switch to develop.
git checkout develop

# Fix any warnings and errors before committing.
npm run --silent test

# Ensure all strings have been translated.
# Check the diff as well as the final per-key message string count.
npm run --silent messages:translate
Expand All @@ -147,6 +152,9 @@ npm run --silent messages:translate
# This includes new code files/translations/resources added/removed since the last release.
cat extension-files.txt

# Fix any warnings and errors before committing.
npm run --silent prepackage

# The "<release-version>" needs to follow semantic versioning, such as "v1.0.0".
# http://semver.org/
git flow release start <release-version>
Expand Down
15 changes: 6 additions & 9 deletions extension-files.txt
Expand Up @@ -11,6 +11,10 @@ _locales/ru/messages.json
_locales/sv/messages.json
_locales/zh/messages.json
CLA.md
dist/background.js
dist/options.js
dist/popup.js
lib/browser-polyfill.js
LICENSE
manifest.json
README.md
Expand All @@ -35,12 +39,5 @@ resources/icon/icon-stop/icon-96x96.png
resources/style/options.css
resources/style/popup.css
resources/style/shared.css
src/background.js
src/language.js
src/options.html
src/options.js
src/popup-start.html
src/popup-start.js
src/shared-frontend.js
src/shared.js
src/tabrow.js
src/options/options.html
src/popup/popup.html

0 comments on commit 42e747b

Please sign in to comment.