m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Code

Merge pull request #3806 from MetaMask/build-dev-fix

Browse Source 
build - properly set GULP_METAMASK_DEBUG on dev
This commit is contained in:
Frankie 2018-03-30 15:50:00 -07:00 committed by GitHub
commit 641171eae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gulpfile.js
View File

@ -16,7 +16,6 @@ const eslint = require('gulp-eslint')
const fs = require('fs') const fs = require('fs')
const path = require('path') const path = require('path')
const manifest = require('./app/manifest.json') const manifest = require('./app/manifest.json')
const gulpif = require('gulp-if')
const replace = require('gulp-replace') const replace = require('gulp-replace')
const mkdirp = require('mkdirp') const mkdirp = require('mkdirp')
const asyncEach = require('async/each') const asyncEach = require('async/each')
@ -31,8 +30,6 @@ const debug = require('gulp-debug')
const pify = require('pify') const pify = require('pify')
const endOfStream = pify(require('end-of-stream')) const endOfStream = pify(require('end-of-stream'))
const disableDebugTools = gutil.env.disableDebugTools
const debugMode = gutil.env.debug
const browserPlatforms = [ const browserPlatforms = [
'firefox', 'firefox',
@ -181,12 +178,12 @@ gulp.task('manifest:production', function() {
],{base: './dist/'}) ],{base: './dist/'})
// Exclude chromereload script in production: // Exclude chromereload script in production:
.pipe(gulpif(!debugMode,jsoneditor(function(json) { .pipe(jsoneditor(function(json) {
json.background.scripts = json.background.scripts.filter((script) => { json.background.scripts = json.background.scripts.filter((script) => {
return !script.includes('chromereload') return !script.includes('chromereload')
}) })
return json return json
}))) }))
.pipe(gulp.dest('./dist/', { overwrite: true })) .pipe(gulp.dest('./dist/', { overwrite: true }))
}) })
@ -311,6 +308,7 @@ function createTasksForBuildJsExtension({ buildJsFiles, taskPrefix, devMode, bun
minifyBuild: !devMode, minifyBuild: !devMode,
buildWithFullPaths: devMode, buildWithFullPaths: devMode,
watch: devMode, watch: devMode,
devMode,
}, bundleTaskOpts) }, bundleTaskOpts)
createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1, buildPhase2 }) createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1, buildPhase2 })
} }
@ -326,6 +324,7 @@ function createTasksForBuildJsMascara({ taskPrefix, devMode, bundleTaskOpts = {}
minifyBuild: !devMode, minifyBuild: !devMode,
buildWithFullPaths: devMode, buildWithFullPaths: devMode,
watch: devMode, watch: devMode,
devMode,
}, bundleTaskOpts) }, bundleTaskOpts)
createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 }) createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 })
} }
@ -541,7 +540,7 @@ function bundleTask(opts) {
// convert bundle stream to gulp vinyl stream // convert bundle stream to gulp vinyl stream
.pipe(source(opts.filename)) .pipe(source(opts.filename))
// inject variables into bundle // inject variables into bundle
.pipe(replace('\'GULP_METAMASK_DEBUG\'', debugMode)) .pipe(replace('\'GULP_METAMASK_DEBUG\'', opts.devMode))
// buffer file contents (?) // buffer file contents (?)
.pipe(buffer()) .pipe(buffer())

1
package.json
View File

@ -221,7 +221,6 @@
"gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
"gulp-babel": "^7.0.0", "gulp-babel": "^7.0.0",
"gulp-eslint": "^4.0.0", "gulp-eslint": "^4.0.0",
"gulp-if": "^2.0.2",
"gulp-json-editor": "^2.2.1", "gulp-json-editor": "^2.2.1",
"gulp-livereload": "^3.8.1", "gulp-livereload": "^3.8.1",
"gulp-replace": "^0.6.1", "gulp-replace": "^0.6.1",