Skip to content

Commit 550e387

Browse files
WebExp0528WebExp0528
authored
Merge pull request #31 from WebExp0528/development
Development
2 parents 9ddb497 + ee221cc commit 550e387

File tree

10 files changed

+5104
-135
lines changed

10 files changed

+5104
-135
lines changed

‎.babelrc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,5 @@
99
],
1010
"@babel/preset-react"
1111
],
12-
"plugins": [
13-
[
14-
"@babel/plugin-proposal-class-properties",
15-
{
16-
"loose": true
17-
}
18-
]
19-
]
12+
"plugins": [["@babel/plugin-proposal-class-properties"]]
2013
}

‎.eslintrc

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
{
22
"parser": "@babel/eslint-parser",
3+
"parserOptions": {
4+
"ecmaVersion": 2020, // Allows for the parsing of modern ECMAScript features
5+
"sourceType": "module", // Allows for the use of imports
6+
"ecmaFeatures": {
7+
"jsx": true // Allows for the parsing of JSX
8+
}
9+
},
10+
"settings": {
11+
"react": {
12+
"version": "detect" // Tells eslint-plugin-react to automatically detect the version of React to use
13+
}
14+
},
315
"plugins": ["prettier"],
416
"rules": {
517
"prettier/prettier": "error"
618
},
7-
"extends": ["prettier", "prettier/prettier", "prettier/react"]
19+
"extends": ["plugin:react/recommended", "prettier"]
820
}

‎jsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"compilerOptions": {
33
"baseUrl": "./src",
44
"jsx": "react",
5+
"moduleResolution": "node",
6+
"resolveJsonModule": true,
57
"paths": {
68
"utils": ["src/utils"],
79
"popup": ["src/popup"],

‎package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,41 @@
1111
},
1212
"author": "Web Dev",
1313
"dependencies": {
14-
"@babel/core": "^7.12.13",
15-
"@babel/eslint-parser": "^7.12.13",
16-
"@babel/plugin-proposal-class-properties": "^7.12.13",
17-
"@babel/preset-env": "^7.12.13",
18-
"@babel/preset-react": "^7.12.13",
14+
"@babel/core": "^7.14.3",
15+
"@babel/eslint-parser": "^7.14.3",
16+
"@babel/plugin-proposal-class-properties": "^7.13.0",
17+
"@babel/preset-env": "^7.14.2",
18+
"@babel/preset-react": "^7.13.13",
1919
"babel-loader": "^8.2.2",
2020
"clean-webpack-plugin": "^3.0.0",
21-
"copy-webpack-plugin": "^7.0.0",
22-
"core-js": "^3.8.3",
23-
"css-loader": "^5.0.1",
24-
"eslint": "^7.19.0",
25-
"eslint-config-airbnb": "^18.2.1",
26-
"eslint-config-prettier": "^7.2.0",
27-
"eslint-plugin-babel": "^5.3.1",
28-
"eslint-plugin-import": "^2.22.1",
29-
"eslint-plugin-jsx-a11y": "^6.4.1",
30-
"eslint-plugin-prettier": "^3.3.1",
31-
"eslint-plugin-react": "^7.22.0",
32-
"eslint-plugin-react-hooks": "^4.2.0",
33-
"eslint-webpack-plugin": "^2.4.3",
34-
"html-webpack-plugin": "^4.5.1",
35-
"node-sass": "^5.0.0",
21+
"copy-webpack-plugin": "^8.1.1",
22+
"core-js": "^3.12.1",
23+
"css-loader": "^5.2.5",
24+
"html-webpack-plugin": "^5.3.1",
25+
"node-sass": "^6.0.0",
3626
"prop-types": "^15.7.2",
37-
"react": "^17.0.1",
38-
"react-dom": "^17.0.1",
39-
"sass-loader": "^10.1.1",
27+
"react": "^17.0.2",
28+
"react-dom": "^17.0.2",
29+
"sass-loader": "^11.1.1",
4030
"style-loader": "^2.0.0",
41-
"terser-webpack-plugin": "^5.1.1",
42-
"webpack": "^5.20.0",
43-
"webpack-cli": "^4.5.0",
31+
"terser-webpack-plugin": "^5.1.2",
32+
"webextension-polyfill": "^0.8.0",
33+
"webpack": "^5.37.1",
34+
"webpack-cli": "^4.7.0",
4435
"zip-webpack-plugin": "^4.0.1"
4536
},
4637
"devDependencies": {
47-
"prettier": "^2.2.1"
38+
"eslint": "^7.26.0",
39+
"eslint-config-airbnb": "^18.2.1",
40+
"eslint-config-prettier": "^8.3.0",
41+
"eslint-plugin-babel": "^5.3.1",
42+
"eslint-plugin-import": "^2.23.2",
43+
"eslint-plugin-jsx-a11y": "^6.4.1",
44+
"eslint-plugin-prettier": "^3.4.0",
45+
"eslint-plugin-react": "^7.23.2",
46+
"eslint-plugin-react-hooks": "^4.2.0",
47+
"eslint-webpack-plugin": "^2.5.4",
48+
"prettier": "^2.3.0"
4849
},
4950
"license": "SEE LICENSE IN LICENSE",
5051
"repository": {

‎src/background/index.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ext from "utils/ext";
1+
import browser from "webextension-polyfill";
22

33
/**
44
* Define content script functions
@@ -17,23 +17,23 @@ class Background {
1717
console.log("loaded Background Scripts");
1818

1919
//When extension installed
20-
ext.runtime.onInstalled.addListener(() => this.onInstalled());
20+
browser.runtime.onInstalled.addListener(() => this.onInstalled());
2121

2222
//Add message listener in Browser.
23-
ext.runtime.onMessage.addListener((message, sender, reply) =>
23+
browser.runtime.onMessage.addListener((message, sender, reply) =>
2424
this.onMessage(message, sender, reply)
2525
);
2626

2727
//Add message listener from Extension
28-
ext.extension.onConnect.addListener((port) => this.onConnect(port));
28+
browser.extension.onConnect.addListener((port) => this.onConnect(port));
2929

3030
//Add Update listener for tab
31-
ext.tabs.onUpdated.addListener((tabId, changeInfo, tab) =>
31+
browser.tabs.onUpdated.addListener((tabId, changeInfo, tab) =>
3232
this.onUpdatedTab(tabId, changeInfo, tab)
3333
);
3434

3535
//Add New tab create listener
36-
ext.tabs.onCreated.addListener((tab) => this.onCreatedTab(tab));
36+
browser.tabs.onCreated.addListener((tab) => this.onCreatedTab(tab));
3737
};
3838

3939
//TODO: Listeners
@@ -106,7 +106,7 @@ class Background {
106106
*/
107107
getURLFromTab = (tabid) => {
108108
return new Promise(function (resolve, reject) {
109-
ext.tabs.get(tabid, function (tab) {
109+
browser.tabs.get(tabid, function (tab) {
110110
resolve(tab.url ? tab.url : "");
111111
});
112112
});
@@ -119,7 +119,7 @@ class Background {
119119
*/
120120
openNewTab = (url) => {
121121
return new Promise((resolve, reject) =>
122-
ext.tabs.create({ url }, function (tab) {
122+
browser.tabs.create({ url }, function (tab) {
123123
resolve(tab);
124124
})
125125
);
@@ -131,7 +131,7 @@ class Background {
131131
*/
132132
closeTab = (tab) => {
133133
return new Promise((resolve, reject) =>
134-
ext.tabs.remove(tab.id, () => {
134+
browser.tabs.remove(tab.id, () => {
135135
resolve();
136136
})
137137
);
@@ -142,7 +142,7 @@ class Background {
142142
*/
143143
updateTab = (tab, options) => {
144144
return new Promise((resolve, reject) => {
145-
ext.tabs.update(tab.id, options, function (updateTab) {
145+
browser.tabs.update(tab.id, options, function (updateTab) {
146146
resolve(updateTab);
147147
});
148148
});
@@ -164,7 +164,7 @@ class Background {
164164
*/
165165
sendMessage = (tab, msg) => {
166166
return new Promise((resolve, reject) =>
167-
ext.tabs.sendMessage(tab.id, msg, function (response) {
167+
browser.tabs.sendMessage(tab.id, msg, function (response) {
168168
resolve(response);
169169
})
170170
);

‎src/content/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import React from "react";
44
import ReactDOM from "react-dom";
5-
import ext from "utils/ext";
5+
import browser from "webextension-polyfill";
66
import MessageListener from "./messageListener";
77

88
// import "./content.css";
99

10-
ext.runtime.onMessage.addListener(MessageListener);
10+
browser.runtime.onMessage.addListener(MessageListener);
1111

1212
class Main extends React.Component {
1313
render() {

‎src/popup/services/comunicationManager.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import ext from "../../utils/ext";
1+
import browser from "webextension-polyfill";
22

33
export default function sendMessage(message, data) {
4-
ext.tabs.query({ active: true, currentWindow: true }, (tabs) => {
4+
browser.tabs.query({ active: true, currentWindow: true }).then((tabs) => {
55
const activeTab = tabs[0];
6-
ext.tabs.sendMessage(activeTab.id, { action: message, data });
6+
browser.tabs.sendMessage(activeTab.id, { action: message, data });
77
});
88
}

‎src/utils/ext.js

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎src/utils/sendMessages.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import ext from "./ext";
1+
import browser from "webextension-polyfill";
22

33
/**
44
* MSG Types
@@ -21,7 +21,7 @@ export const sendMessage = async (msgType, message) => {
2121
console.log("===== Sending Message => ", msg);
2222
return new Promise((resolve, reject) => {
2323
try {
24-
ext.runtime.sendMessage(msg, (response) => {
24+
browser.runtime.sendMessage(msg, (response) => {
2525
resolve(response);
2626
});
2727
} catch (e) {

0 commit comments

Comments
 (0)