m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00
Code

Build - refactor background process to use html (#10769)

Browse Source 
* build - declare background as html

* build - fill in empty file when a missing file is expected

* lint - fix

* Update development/build/manifest.js

Co-authored-by: Mark Stacey <markjstacey@gmail.com>

* Update development/build/manifest.js

Co-authored-by: Mark Stacey <markjstacey@gmail.com>

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
This commit is contained in:
kumavis 2021-03-31 11:12:28 +08:00 committed by GitHub
parent 2dadf4374a
commit 952adbce44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.js
View File

@ -26,7 +26,7 @@ module.exports = {
'test-*/**', 'test-*/**',
'docs/**', 'docs/**',
'coverage/', 'coverage/',
'app/scripts/chromereload.js', 'development/chromereload.js',
'app/vendor/**', 'app/vendor/**',
'test/e2e/send-eth-with-private-key-test/**', 'test/e2e/send-eth-with-private-key-test/**',
'nyc_output/**', 'nyc_output/**',

15
app/background.html Normal file
View File

@ -0,0 +1,15 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
</head>
<body>
<script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
<script src="./initSentry.js" type="text/javascript" charset="utf-8"></script>
<script src="./lockdown.js" type="text/javascript" charset="utf-8"></script>
<script src="./runLockdown.js" type="text/javascript" charset="utf-8"></script>
<script src="./bg-libs.js" type="text/javascript" charset="utf-8"></script>
<script src="./background.js" type="text/javascript" charset="utf-8"></script>
<script src="./chromereload.js" type="text/javascript" charset="utf-8"></script>
</body>
</html>

9
app/manifest/_base.json
View File

@ -1,14 +1,7 @@
{ {
"author": "https://metamask.io", "author": "https://metamask.io",
"background": { "background": {
"scripts": [ "page": "background.html",
"globalthis.js",
"initSentry.js",
"lockdown.js",
"runLockdown.js",
"bg-libs.js",
"background.js"
],
"persistent": true "persistent": true
}, },
"browser_action": { "browser_action": {

24
development/build/manifest.js
View File

@ -8,10 +8,6 @@ const { createTask, composeSeries } = require('./task');
module.exports = createManifestTasks; module.exports = createManifestTasks;
const scriptsToExcludeFromBackgroundDevBuild = {
'bg-libs.js': true,
};
function createManifestTasks({ browserPlatforms }) { function createManifestTasks({ browserPlatforms }) {
// merge base manifest with per-platform manifests // merge base manifest with per-platform manifests
const prepPlatforms = async () => { const prepPlatforms = async () => {
@ -35,29 +31,13 @@ function createManifestTasks({ browserPlatforms }) {
); );
}; };
// dev: remove bg-libs, add chromereload, add perms // dev: add perms
const envDev = createTaskForModifyManifestForEnvironment((manifest) => { const envDev = createTaskForModifyManifestForEnvironment((manifest) => {
const scripts = manifest.background.scripts.filter(
(scriptName) => !scriptsToExcludeFromBackgroundDevBuild[scriptName],
);
scripts.push('chromereload.js');
manifest.background = {
...manifest.background,
scripts,
};
manifest.permissions = [...manifest.permissions, 'webRequestBlocking']; manifest.permissions = [...manifest.permissions, 'webRequestBlocking'];
}); });
// testDev: remove bg-libs, add perms // testDev: add perms
const envTestDev = createTaskForModifyManifestForEnvironment((manifest) => { const envTestDev = createTaskForModifyManifestForEnvironment((manifest) => {
const scripts = manifest.background.scripts.filter(
(scriptName) => !scriptsToExcludeFromBackgroundDevBuild[scriptName],
);
scripts.push('chromereload.js');
manifest.background = {
...manifest.background,
scripts,
};
manifest.permissions = [ manifest.permissions = [
...manifest.permissions, ...manifest.permissions,
'webRequestBlocking', 'webRequestBlocking',

23
development/build/static.js
View File

@ -80,13 +80,34 @@ const copyTargetsDev = [
pattern: '/chromereload.js', pattern: '/chromereload.js',
dest: ``, dest: ``,
}, },
// empty files to suppress missing file errors
{
src: './development/',
pattern: '/empty.js',
dest: `bg-libs.js`,
},
{
src: './development/',
pattern: '/empty.js',
dest: `ui-libs.js`,
},
];
const copyTargetsProd = [
...copyTargets,
// empty files to suppress missing file errors
{
src: './development/',
pattern: '/empty.js',
dest: `chromereload.js`,
},
]; ];
function createStaticAssetTasks({ livereload, browserPlatforms }) { function createStaticAssetTasks({ livereload, browserPlatforms }) {
const prod = createTask( const prod = createTask(
'static:prod', 'static:prod',
composeSeries( composeSeries(
...copyTargets.map((target) => { ...copyTargetsProd.map((target) => {
return async function copyStaticAssets() { return async function copyStaticAssets() {
await performCopy(target); await performCopy(target);
}; };

0
app/scripts/chromereload.js → development/chromereload.js
View File

1
development/empty.js Normal file
View File

@ -0,0 +1 @@
// this file intentionally left blank : )