Skip to content

Commit 2f8258b

Browse files
committed
adds rollup to bundle background scripts
1 parent 2da562a commit 2f8258b

File tree

8 files changed

+559
-9
lines changed

8 files changed

+559
-9
lines changed

.babelrc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": [ "es2015" ]
3+
}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
node_modules/
2+
dist/

manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Collective bargaining for netizens",
55
"manifest_version": 2,
66
"background": {
7-
"scripts": ["src/picket/picket.js"],
7+
"scripts": ["dist/picket.js"],
88
"persistent": true
99
},
1010
"permissions": [

package-lock.json

+541
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+8-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"description": "",
55
"main": "index.js",
66
"scripts": {
7-
"test": "mocha src/**/*.spec.js"
7+
"build": "rollup src/picket/picket.js --file dist/picket.js --format iife",
8+
"test": "mocha src/**/*.spec.js --require babel-register --require babel-polyfill"
89
},
910
"repository": {
1011
"type": "git",
@@ -17,7 +18,13 @@
1718
},
1819
"homepage": "https://github.com/NetizensAssociation/picket#readme",
1920
"devDependencies": {
21+
"babel-polyfill": "^6.26.0",
22+
"babel-preset-es2015": "^6.24.1",
23+
"babel-register": "^6.26.0",
2024
"chai": "^4.2.0",
2125
"mocha": "^5.2.0"
26+
},
27+
"dependencies": {
28+
"rollup": "^0.68.2"
2229
}
2330
}

src/picket/applyRules.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ const matchesRulePattern = (url) => ({ sites }) => {
66
return sites.some(pattern => new RegExp(pattern.replace('*', '.*')).test(url))
77
}
88

9-
const applyRules = (rules) => (url) => {
9+
export default (rules) => (url) => {
1010
return rules
1111
.filter(matchesRulePattern(url))
1212
.reduce((acc, rule) => {
1313
if (rule.actions.find(a => a.action === 'block')) return blockRequest()
1414
return {}
1515
}, {})
1616
}
17-
18-
module.exports = applyRules

src/picket/picket.spec.js renamed to src/picket/applyRules.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
const { expect } = require('chai')
2-
const applyRules = require('./applyRules.js')
1+
import { expect } from 'chai'
2+
import applyRules from './applyRules.js'
33

44
describe('applyRules', () => {
55
it('cancels blocked url', () => {

src/picket/picket.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
const applyRules = require('./applyRules.js')
1+
import applyRules from './applyRules.js'
22

33
const fetchRulesFromStorage = () => {
44
return new Promise((resolve) => {
5-
chrome.storage.sync.get(['rules'], resolve)
5+
chrome.storage.sync.get(['rules'], ({ rules }) => resolve(rules))
66
})
77
}
88

0 commit comments

Comments
 (0)