From c7608e6fe935c2b16c41bb0ff27eeeb50e8a2eb3 Mon Sep 17 00:00:00 2001 From: Mark Stacey Date: Thu, 4 Jul 2019 11:54:10 -0300 Subject: Remove `disc` (#6801) The `disc` gulp command no longer works. I wasn't able to fix this easily, so instead it has been removed. We can probably find something better to replace it with. --- .gitignore | 1 - gulpfile.js | 38 ------------ package-lock.json | 172 ------------------------------------------------------ package.json | 2 - 4 files changed, 213 deletions(-) diff --git a/.gitignore b/.gitignore index 4ee0c1c62..c879976d4 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,6 @@ app/.DS_Store coverage/ dist builds/ -disc/ builds.zip docs/jsdocs diff --git a/gulpfile.js b/gulpfile.js index 40f93f45c..659111eeb 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,7 +1,6 @@ const watchify = require('watchify') const browserify = require('browserify') const envify = require('envify/custom') -const disc = require('disc') const gulp = require('gulp') const source = require('vinyl-source-stream') const buffer = require('vinyl-buffer') @@ -13,10 +12,7 @@ const zip = require('gulp-zip') const assign = require('lodash.assign') const livereload = require('gulp-livereload') const del = require('del') -const fs = require('fs') -const path = require('path') const manifest = require('./app/manifest.json') -const mkdirp = require('mkdirp') const sass = require('gulp-sass') const autoprefixer = require('gulp-autoprefixer') const gulpStylelint = require('gulp-stylelint') @@ -377,14 +373,6 @@ function createTasksForBuildJs ({ rootDir, taskPrefix, bundleTaskOpts, destinati gulp.task(taskPrefix, gulp.series(subtasks)) } -// disc bundle analyzer tasks - -buildJsFiles.forEach((jsFile) => { - gulp.task(`disc:${jsFile}`, discTask({ label: jsFile, filename: `${jsFile}.js` })) -}) - -gulp.task('disc', gulp.parallel(buildJsFiles.map(jsFile => `disc:${jsFile}`))) - // clean dist gulp.task('clean', function clean () { @@ -536,32 +524,6 @@ function generateBundler (opts, performBundle) { return bundler } -function discTask (opts) { - opts = Object.assign({ - buildWithFullPaths: true, - }, opts) - - const bundler = generateBundler(opts, performBundle) - // output build logs to terminal - bundler.on('log', gutil.log) - - return performBundle - - function performBundle () { - // start "disc" build - const discDir = path.join(__dirname, 'disc') - mkdirp.sync(discDir) - const discPath = path.join(discDir, `${opts.label}.html`) - - return ( - bundler.bundle() - .pipe(disc()) - .pipe(fs.createWriteStream(discPath)) - ) - } -} - - function bundleTask (opts) { const bundler = generateBundler(opts, performBundle) // output build logs to terminal diff --git a/package-lock.json b/package-lock.json index e9fb8bfba..1ad7ad48e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7986,11 +7986,6 @@ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==" }, - "async-reduce": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/async-reduce/-/async-reduce-0.0.1.tgz", - "integrity": "sha1-sja183bW+uOBze2QBqp/LHOxfzE=" - }, "async-settle": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz", @@ -10402,50 +10397,6 @@ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" }, - "browser-pack": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-5.0.1.tgz", - "integrity": "sha1-QZdxmyDG4KqglFHFER5T77b7wY0=", - "requires": { - "JSONStream": "^1.0.3", - "combine-source-map": "~0.6.1", - "defined": "^1.0.0", - "through2": "^1.0.0", - "umd": "^3.0.0" - }, - "dependencies": { - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" - }, - "readable-stream": { - "version": "1.1.14", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", - "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.1", - "isarray": "0.0.1", - "string_decoder": "~0.10.x" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" - }, - "through2": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz", - "integrity": "sha1-CEfLxESfNAVXTb3M2buEG4OsNUU=", - "requires": { - "readable-stream": ">=1.1.13-1 <1.2.0-0", - "xtend": ">=4.0.0 <4.1.0-0" - } - } - } - }, "browser-passworder": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/browser-passworder/-/browser-passworder-2.0.3.tgz", @@ -10483,17 +10434,6 @@ "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", "dev": true }, - "browser-unpack": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browser-unpack/-/browser-unpack-1.2.0.tgz", - "integrity": "sha1-NXruMfxGeDFoTQY+Q1XgcKeClw0=", - "requires": { - "acorn": "^4.0.3", - "browser-pack": "^5.0.1", - "concat-stream": "^1.5.0", - "minimist": "^1.1.1" - } - }, "browserify": { "version": "16.2.3", "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.2.3.tgz", @@ -10873,11 +10813,6 @@ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", "dev": true }, - "builtins": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.3.tgz", - "integrity": "sha1-XQBhZtpxYQvCvPcwGfDwzEMwl1U=" - }, "bytes": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", @@ -12216,32 +12151,6 @@ "wcwidth": "^1.0.0" } }, - "combine-source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz", - "integrity": "sha1-m0oJwxYDPXaODxHgKfonMOB5rZY=", - "requires": { - "convert-source-map": "~1.1.0", - "inline-source-map": "~0.5.0", - "lodash.memoize": "~3.0.3", - "source-map": "~0.4.2" - }, - "dependencies": { - "lodash.memoize": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", - "integrity": "sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=" - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", @@ -12267,11 +12176,6 @@ "integrity": "sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==", "dev": true }, - "commondir": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz", - "integrity": "sha1-ifAP3NUbUZxXhzP+xWPmptp/W+I=" - }, "commoner": { "version": "0.10.8", "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz", @@ -13874,34 +13778,6 @@ } } }, - "disc": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/disc/-/disc-1.3.3.tgz", - "integrity": "sha512-ui/kegr2k3tDr2EU7cA9Ag+YofgmB3shwSFJuuf6r6Epom2cyHhd5jBtCOhwXKSDFMlYEMeSadujjRS2uSqRsw==", - "requires": { - "bl": "^1.2.0", - "browser-unpack": "^1.2.0", - "builtins": "0.0.3", - "commondir": "0.0.1", - "d3": "^3.4.3", - "duplexer": "^0.1.1", - "file-tree": "^1.0.0", - "flatten": "0.0.1", - "map-async": "^0.1.1", - "opener": "^1.3.0", - "optimist": "^0.6.1", - "plucker": "0.0.0", - "through": "^2.3.4", - "uniq": "^1.0.0" - }, - "dependencies": { - "d3": { - "version": "3.5.17", - "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz", - "integrity": "sha1-vEZ0gAQ3iyGjYMn8fPUjF5B2L7g=" - } - } - }, "discontinuous-range": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz", @@ -19100,16 +18976,6 @@ } } }, - "file-tree": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-tree/-/file-tree-1.0.0.tgz", - "integrity": "sha1-/a2ZnLf6REODULUUx4+TWzBuk+M=", - "requires": { - "async-reduce": "0.0.1", - "commondir": "0.0.1", - "flat": "~1.0.0" - } - }, "file-uri-to-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", @@ -19649,11 +19515,6 @@ "integrity": "sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=", "dev": true }, - "flat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-1.0.0.tgz", - "integrity": "sha1-Ad/dW8vBScZrNe1AHh11PxqtjVk=" - }, "flat-cache": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz", @@ -19703,11 +19564,6 @@ "integrity": "sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==", "dev": true }, - "flatten": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz", - "integrity": "sha1-VURAdm2goNYDmZ9DNFP2wvxqdcE=" - }, "fluent-syntax": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/fluent-syntax/-/fluent-syntax-0.13.0.tgz", @@ -36440,24 +36296,6 @@ "resolved": "https://registry.npmjs.org/inject-css/-/inject-css-0.1.1.tgz", "integrity": "sha1-7z/8eOwCbJbiNV2g3zKRfjUmQVw=" }, - "inline-source-map": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz", - "integrity": "sha1-Skxd2OT7Xps82mDIIt+tyu5m4K8=", - "requires": { - "source-map": "~0.4.0" - }, - "dependencies": { - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } - } - } - }, "inline-style-prefixer": { "version": "3.0.8", "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz", @@ -39246,11 +39084,6 @@ "p-defer": "^1.0.0" } }, - "map-async": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/map-async/-/map-async-0.1.1.tgz", - "integrity": "sha1-yJfARJ+Fhkx0taPxlu20IVZDF0U=" - }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -43622,11 +43455,6 @@ } } }, - "plucker": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/plucker/-/plucker-0.0.0.tgz", - "integrity": "sha1-L/ok4Dqyz/pOda3B33DyViPEXQk=" - }, "plugin-error": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", diff --git a/package.json b/package.json index bf0ddd53a..7ef930a40 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "lint:fix": "eslint . --fix", "mozilla-lint": "addons-linter dist/firefox", "watch": "cross-env METAMASK_ENV=test mocha --watch --require test/setup.js --reporter min --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"", - "disc": "gulp disc --debug", "announce": "node development/announcer.js", "version:bump": "node development/run-version-bump.js", "storybook": "start-storybook -p 6006 -c .storybook", @@ -74,7 +73,6 @@ "deep-extend": "^0.5.1", "detect-node": "^2.0.3", "detectrtc": "^1.3.6", - "disc": "^1.3.2", "dnode": "^1.2.2", "end-of-stream": "^1.1.0", "eth-block-tracker": "^4.1.0", -- cgit