kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Alan Hamlett
2021-01-06 11:33:36 -08:00
parent c2ca70e8ad 0a5dab11bb
commit 4057b8663e
5 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devtools.html
View File

@@ -1,2 +1,3 @@
<!DOCTYPE html> <!DOCTYPE html>
<script src="public/js/browser-polyfill.min.js"></script>
<script src="public/js/devtools.js"></script> <script src="public/js/devtools.js"></script>

10
gulpfile.js
View File

@@ -23,13 +23,9 @@ gulp.task('webextension',function(cb){
!fs.existsSync('public') && fs.mkdirSync('public'); !fs.existsSync('public') && fs.mkdirSync('public');
fs.mkdirSync('public/js'); fs.mkdirSync('public/js');
} }
exec('npm install',{
cwd: 'node_modules/webextension-polyfill/' fs.copyFileSync('node_modules/webextension-polyfill/dist/browser-polyfill.min.js', 'public/js/browser-polyfill.min.js');
},function(){ fs.copyFileSync('node_modules/webextension-polyfill/dist/browser-polyfill.min.js.map', 'public/js/browser-polyfill.min.js.map');
var stream = fs.createWriteStream('public/js/browser-polyfill.min.js');
stream.on('done',cb);
fs.createReadStream('node_modules/webextension-polyfill/dist/browser-polyfill.min.js').pipe(stream);
});
}); });
/* /*

1
options.html
View File

@@ -12,6 +12,7 @@
<div id="wakatime-options"></div> <div id="wakatime-options"></div>
<script src="public/js/browser-polyfill.min.js"></script>
<script src="public/js/options.js"></script> <script src="public/js/options.js"></script>
</body> </body>
</html> </html>

14
package.json
View File

@@ -10,18 +10,12 @@
"postinstall": "gulp postinstall", "postinstall": "gulp postinstall",
"validate": "npm ls" "validate": "npm ls"
}, },
"pre-commit": [ "pre-commit": ["lint"],
"lint"
],
"jest": { "jest": {
"testFileExtensions": [ "testFileExtensions": ["jest.js"],
"jest.js"
],
"scriptPreprocessor": "<rootDir>/node_modules/babel-jest", "scriptPreprocessor": "<rootDir>/node_modules/babel-jest",
"testDirectoryName": "tests", "testDirectoryName": "tests",
"unmockedModulePathPatterns": [ "unmockedModulePathPatterns": ["<rootDir>/node_modules/react"]
"<rootDir>/node_modules/react"
]
}, },
"private": true, "private": true,
"devDependencies": { "devDependencies": {
@@ -54,7 +48,7 @@
"react": "^16.2.0", "react": "^16.2.0",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
"react-transition-group": "^1.0.0", "react-transition-group": "^1.0.0",
"webextension-polyfill": "^0.2.1" "webextension-polyfill": "^0.4.0"
}, },
"jshintConfig": { "jshintConfig": {
"asi": false, "asi": false,

2
popup.html
View File

@@ -7,12 +7,12 @@
<title>WakaTime</title> <title>WakaTime</title>
<link href="public/css/app.css" rel="stylesheet"> <link href="public/css/app.css" rel="stylesheet">
<script src="public/js/browser-polyfill.min.js"></script>
</head> </head>
<body> <body>
<div id="wakatime"></div> <div id="wakatime"></div>
<script src="public/js/browser-polyfill.min.js"></script>
<script src="public/js/app.js"></script> <script src="public/js/app.js"></script>
</body> </body>
</html> </html>