From 253e9cb9f43a8987b1acf8652e7822020e60dead Mon Sep 17 00:00:00 2001 From: Alex Eagle Date: Thu, 11 Jul 2019 16:58:34 -0700 Subject: [PATCH] fix(builtin): use a local mod to revert a browserify change This is needed so that --preserve-symlinks browserify option also applies to the main --- internal/npm_install/browserify-wrapped.js | 3 ++- internal/npm_install/test/browserify.spec.js | 10 ++++++++-- package.json | 2 +- scripts/vendor_browserify.sh | 3 +++ third_party/github.com/browserify/browserify/index.js | 2 +- .../github.com/browserify/browserify/index.min.js | 2 +- yarn.lock | 8 ++++---- 7 files changed, 20 insertions(+), 10 deletions(-) diff --git a/internal/npm_install/browserify-wrapped.js b/internal/npm_install/browserify-wrapped.js index c8f6f9df71..535081c65a 100644 --- a/internal/npm_install/browserify-wrapped.js +++ b/internal/npm_install/browserify-wrapped.js @@ -36,7 +36,7 @@ browserify-wrapped: running with // browserify is ncc bundled & terser minified into third_party const browserify = require.resolve( - 'build_bazel_rules_nodejs/third_party/github.com/browserify/browserify/index.min.js'); + `build_bazel_rules_nodejs/third_party/github.com/browserify/browserify/index.${DEBUG ? '' : 'min.'}js`); // named-amd plugin is vendored in under third_party const namedAmd = require.resolve( @@ -44,6 +44,7 @@ browserify-wrapped: running with const args = [ browserify, entryPoint, + '--preserve-symlinks', // Supply the name to use for the AMD define with named-amd plugin '-p', '[', namedAmd, '--name', packageName, ']', // Output a stand-alone UMD bundle. Sanitized version the supplied name is used for diff --git a/internal/npm_install/test/browserify.spec.js b/internal/npm_install/test/browserify.spec.js index ac97ee492e..8953c4eb61 100644 --- a/internal/npm_install/test/browserify.spec.js +++ b/internal/npm_install/test/browserify.spec.js @@ -1,5 +1,7 @@ const fs = require('fs'); +const path = require('path'); const mainFile = 'build_bazel_rules_nodejs/third_party/github.com/browserify/browserify/index.min.js'; +const directory = 'build_bazel_rules_nodejs/internal/npm_install/test'; describe('our bundled, vendored browserify binary', () => { it('should preserve licenses', () => { @@ -9,12 +11,16 @@ describe('our bundled, vendored browserify binary', () => { expect(idxFile).toContain('The Dojo Foundation'); }); it('should have a named AMD module', () => { - const minimistUmd = require.resolve('build_bazel_rules_nodejs/internal/npm_install/test/minimist.umd.js'); + const minimistUmd = require.resolve(path.join(directory, 'minimist.umd.js')); expect(fs.readFileSync(minimistUmd, {encoding: 'utf-8'})).toContain(`define('minimist'`); }); it('should work', () => { - const minimist = require('build_bazel_rules_nodejs/internal/npm_install/test/minimist.umd.js'); + const minimist = require(path.join(directory, 'minimist.umd.js')); const result = minimist('h'); expect(result._[0]).toBe('h'); }); + it('should work for package that imports built-ins ' + + '(regression test for #771)', () => { + const coreUtilIsUmd = require(path.join(directory, 'core-util-is.umd.js')); + }); }); \ No newline at end of file diff --git a/package.json b/package.json index 1126a6cfaf..808755c32d 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@bazel/ibazel": "0.10.1", "@commitlint/cli": "^8.0.0", "@commitlint/config-conventional": "^8.0.0", - "@zeit/ncc": "0.20.2", + "@zeit/ncc": "^0.20.4", "bazel_workspaces": "file:./tools/npm_packages/bazel_workspaces", "browserify": "16.2.3", "clang-format": "1.2.2", diff --git a/scripts/vendor_browserify.sh b/scripts/vendor_browserify.sh index 6e78e18792..4f0cc8a4dd 100755 --- a/scripts/vendor_browserify.sh +++ b/scripts/vendor_browserify.sh @@ -8,6 +8,9 @@ set -eu -o pipefail echo "Compiling browserify with ncc" ./node_modules/.bin/ncc build node_modules/browserify/bin/cmd.js -o third_party/github.com/browserify/browserify +echo "Local mod: revert https://github.com/browserify/browserify/pull/1801" +sed -i 's#parent.id !== self._mdeps.top.id#parent.id#' third_party/github.com/browserify/browserify/index.js + echo "Copy LICENSE" cp -f ./node_modules/browserify/LICENSE ./third_party/github.com/browserify/browserify diff --git a/third_party/github.com/browserify/browserify/index.js b/third_party/github.com/browserify/browserify/index.js index 61be8909ed..4f10bca51e 100755 --- a/third_party/github.com/browserify/browserify/index.js +++ b/third_party/github.com/browserify/browserify/index.js @@ -24936,7 +24936,7 @@ Browserify.prototype._createDeps = function (opts) { } if (err) cb(err, file, pkg) else if (file) { - if (opts.preserveSymlinks && parent.id !== self._mdeps.top.id) { + if (opts.preserveSymlinks && parent.id) { return cb(err, path.resolve(file), pkg, file) } diff --git a/third_party/github.com/browserify/browserify/index.min.js b/third_party/github.com/browserify/browserify/index.min.js index 425022a3b4..b14ebbaf22 100644 --- a/third_party/github.com/browserify/browserify/index.min.js +++ b/third_party/github.com/browserify/browserify/index.min.js @@ -187,7 +187,7 @@ var n=r(822),i=Object.keys||function(e){var t=[];for(var r in e)t.push(r);return * Licensed under the New BSD license. See LICENSE or: * http://opensource.org/licenses/BSD-3-Clause */ -var n=r(41),i=r(606),s=r(875).ArraySet,o=r(359).MappingList;function a(e){e||(e={}),this._file=i.getArg(e,"file",null),this._sourceRoot=i.getArg(e,"sourceRoot",null),this._skipValidation=i.getArg(e,"skipValidation",!1),this._sources=new s,this._names=new s,this._mappings=new o,this._sourcesContents=null}a.prototype._version=3,a.fromSourceMap=function(e){var t=e.sourceRoot,r=new a({file:e.file,sourceRoot:t});return e.eachMapping(function(e){var n={generated:{line:e.generatedLine,column:e.generatedColumn}};null!=e.source&&(n.source=e.source,null!=t&&(n.source=i.relative(t,n.source)),n.original={line:e.originalLine,column:e.originalColumn},null!=e.name&&(n.name=e.name)),r.addMapping(n)}),e.sources.forEach(function(t){var n=e.sourceContentFor(t);null!=n&&r.setSourceContent(t,n)}),r},a.prototype.addMapping=function(e){var t=i.getArg(e,"generated"),r=i.getArg(e,"original",null),n=i.getArg(e,"source",null),s=i.getArg(e,"name",null);this._skipValidation||this._validateMapping(t,r,n,s),null!=n&&(n=String(n),this._sources.has(n)||this._sources.add(n)),null!=s&&(s=String(s),this._names.has(s)||this._names.add(s)),this._mappings.add({generatedLine:t.line,generatedColumn:t.column,originalLine:null!=r&&r.line,originalColumn:null!=r&&r.column,source:n,name:s})},a.prototype.setSourceContent=function(e,t){var r=e;null!=this._sourceRoot&&(r=i.relative(this._sourceRoot,r)),null!=t?(this._sourcesContents||(this._sourcesContents=Object.create(null)),this._sourcesContents[i.toSetString(r)]=t):this._sourcesContents&&(delete this._sourcesContents[i.toSetString(r)],0===Object.keys(this._sourcesContents).length&&(this._sourcesContents=null))},a.prototype.applySourceMap=function(e,t,r){var n=t;if(null==t){if(null==e.file)throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, or the source map\'s "file" property. Both were omitted.');n=e.file}var o=this._sourceRoot;null!=o&&(n=i.relative(o,n));var a=new s,u=new s;this._mappings.unsortedForEach(function(t){if(t.source===n&&null!=t.originalLine){var s=e.originalPositionFor({line:t.originalLine,column:t.originalColumn});null!=s.source&&(t.source=s.source,null!=r&&(t.source=i.join(r,t.source)),null!=o&&(t.source=i.relative(o,t.source)),t.originalLine=s.line,t.originalColumn=s.column,null!=s.name&&(t.name=s.name))}var c=t.source;null==c||a.has(c)||a.add(c);var l=t.name;null==l||u.has(l)||u.add(l)},this),this._sources=a,this._names=u,e.sources.forEach(function(t){var n=e.sourceContentFor(t);null!=n&&(null!=r&&(t=i.join(r,t)),null!=o&&(t=i.relative(o,t)),this.setSourceContent(t,n))},this)},a.prototype._validateMapping=function(e,t,r,n){if(t&&"number"!=typeof t.line&&"number"!=typeof t.column)throw new Error("original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.");if((!(e&&"line"in e&&"column"in e&&e.line>0&&e.column>=0)||t||r||n)&&!(e&&"line"in e&&"column"in e&&t&&"line"in t&&"column"in t&&e.line>0&&e.column>=0&&t.line>0&&t.column>=0&&r))throw new Error("Invalid mapping: "+JSON.stringify({generated:e,source:r,original:t,name:n}))},a.prototype._serializeMappings=function(){for(var e,t,r,s,o=0,a=1,u=0,c=0,l=0,h=0,p="",f=this._mappings.toArray(),d=0,g=f.length;d0){if(!i.compareByGeneratedPositionsInflated(t,f[d-1]))continue;e+=","}e+=n.encode(t.generatedColumn-o),o=t.generatedColumn,null!=t.source&&(s=this._sources.indexOf(t.source),e+=n.encode(s-h),h=s,e+=n.encode(t.originalLine-1-c),c=t.originalLine-1,e+=n.encode(t.originalColumn-u),u=t.originalColumn,null!=t.name&&(r=this._names.indexOf(t.name),e+=n.encode(r-l),l=r)),p+=e}return p},a.prototype._generateSourcesContent=function(e,t){return e.map(function(e){if(!this._sourcesContents)return null;null!=t&&(e=i.relative(t,e));var r=i.toSetString(e);return Object.prototype.hasOwnProperty.call(this._sourcesContents,r)?this._sourcesContents[r]:null},this)},a.prototype.toJSON=function(){var e={version:this._version,sources:this._sources.toArray(),names:this._names.toArray(),mappings:this._serializeMappings()};return null!=this._file&&(e.file=this._file),null!=this._sourceRoot&&(e.sourceRoot=this._sourceRoot),this._sourcesContents&&(e.sourcesContent=this._generateSourcesContent(e.sources,e.sourceRoot)),e},a.prototype.toString=function(){return JSON.stringify(this.toJSON())},t.SourceMapGenerator=a},856:function(e,t,r){function n(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.alphasort=c,t.alphasorti=u,t.setopts=function(e,t,r){r||(r={});if(r.matchBase&&-1===t.indexOf("/")){if(r.noglobstar)throw new Error("base matching requires globstar");t="**/"+t}e.silent=!!r.silent,e.pattern=t,e.strict=!1!==r.strict,e.realpath=!!r.realpath,e.realpathCache=r.realpathCache||Object.create(null),e.follow=!!r.follow,e.dot=!!r.dot,e.mark=!!r.mark,e.nodir=!!r.nodir,e.nodir&&(e.mark=!0);e.sync=!!r.sync,e.nounique=!!r.nounique,e.nonull=!!r.nonull,e.nosort=!!r.nosort,e.nocase=!!r.nocase,e.stat=!!r.stat,e.noprocess=!!r.noprocess,e.absolute=!!r.absolute,e.maxLength=r.maxLength||1/0,e.cache=r.cache||Object.create(null),e.statCache=r.statCache||Object.create(null),e.symlinks=r.symlinks||Object.create(null),function(e,t){e.ignore=t.ignore||[],Array.isArray(e.ignore)||(e.ignore=[e.ignore]);e.ignore.length&&(e.ignore=e.ignore.map(l))}(e,r),e.changedCwd=!1;var s=process.cwd();n(r,"cwd")?(e.cwd=i.resolve(r.cwd),e.changedCwd=e.cwd!==s):e.cwd=s;e.root=r.root||i.resolve(e.cwd,"/"),e.root=i.resolve(e.root),"win32"===process.platform&&(e.root=e.root.replace(/\\/g,"/"));e.cwdAbs=o(e.cwd)?e.cwd:h(e,e.cwd),"win32"===process.platform&&(e.cwdAbs=e.cwdAbs.replace(/\\/g,"/"));e.nomount=!!r.nomount,r.nonegate=!0,r.nocomment=!0,e.minimatch=new a(t,r),e.options=e.minimatch.options},t.ownProp=n,t.makeAbs=h,t.finish=function(e){for(var t=e.nounique,r=t?[]:Object.create(null),n=0,i=e.matches.length;n=0?n():t._external.indexOf(e.file)>=0?n():(s=e.id,("win32"===process.platform?/^\w:/:/^\//).test(s)&&(e.id="/"+T(i,e.file)),Object.keys(e.deps||{}).forEach(function(t){e.deps[t]="/"+T(i,e.deps[t])}),this.push(e),void n());var s}))}return n},A.prototype._createDeps=function(e){var t=this,r=g(e),s=y(e.basedir,process.cwd());r.expose=this._expose,r.extensions=[".js",".json"].concat(r.extensions||[]),t._extensions=r.extensions,r.transform=[],r.transformKey=y(e.transformKey,["browserify","transform"]),r.postFilter=function(r,n,i){return!(e.postFilter&&!e.postFilter(r,n,i))&&(!(t._external.indexOf(n)>=0)&&(!(t._exclude.indexOf(n)>=0)&&(i&&i.browserify&&i.browserify.transform&&(i.browserify.transform=[].concat(i.browserify.transform).filter(Boolean).filter(t._filterTransform)),!0)))},r.filter=function(r){return!(e.filter&&!e.filter(r))&&(!(t._external.indexOf(r)>=0)&&(!(t._exclude.indexOf(r)>=0)&&(!1!==e.bundleExternal||!j(r))))},r.resolve=function(r,i,o){if(t._ignore.indexOf(r)>=0)return o(null,C.empty,{});t._bresolve(r,i,function(r,a,u){if(a&&t._ignore.indexOf(a)>=0)return o(null,C.empty,{});if(a&&t._ignore.length){var c=a.replace(/\\/g,"/").split("/node_modules/")[1];if(c&&(c=c.split("/")[0],t._ignore.indexOf(c)>=0))return o(null,C.empty,{})}if(a){var l="/"+T(s,a);if(t._external.indexOf(l)>=0)return o(null,l);if(t._exclude.indexOf(l)>=0)return o(null,l);if(t._ignore.indexOf(l)>=0)return o(null,C.empty,{})}if(r)o(r,a,u);else if(a){if(e.preserveSymlinks&&i.id!==t._mdeps.top.id)return o(r,n.resolve(a),u,a);S.realpath(a,function(e,t){o(e,t,u,a)})}else o(r,null,u)})},!1===e.builtins?(r.modules={},t._exclude.push.apply(t._exclude,Object.keys(c))):e.builtins&&m(e.builtins)?(r.modules={},e.builtins.forEach(function(e){r.modules[e]=c[e]})):e.builtins&&"object"==typeof e.builtins?r.modules=e.builtins:r.modules=g(c),Object.keys(c).forEach(function(e){v(r.modules,e)||t._exclude.push(e)}),r.globalTransform=[],this._bundled||this.once("bundle",function(){t.pipeline.write({transform:l,global:!0,options:{}})});var o=[].concat(e.noParse).filter(Boolean),u=o.filter(function(e){return"string"==typeof e}).map(function(e){return n.resolve(s,e)});function l(t){if(!1===e.detectGlobals)return h();if(!0===e.noParse)return h();if(o.indexOf(t)>=0)return h();if(u.indexOf(t)>=0)return h();for(var r=t.replace(/\\/g,"/").split("/node_modules/"),i=0;i=0?s():t._external.indexOf("/"+T(r,e.id))>=0?s():t._external.indexOf(e.file)>=0?s():(e.index&&(e.id=e.index),t.emit("label",o,e.id),e.indexDeps&&(e.deps=e.indexDeps||{}),Object.keys(e.deps).forEach(function(i){if(t._expose[i])e.deps[i]=i;else{var s=n.resolve(n.dirname(e.file),i),o="/"+T(r,s);if(t._external.indexOf(o)>=0&&(e.deps[i]=o),t._external.indexOf(s)>=0&&(e.deps[i]=o),t._external.indexOf(i)>=0)e.deps[i]=i;else for(var a=0;a=0){e.deps[i]=o+u;break}}}}),(e.entry||e.expose)&&(t._bpack.standaloneModule=e.id),this.push(e),void s())})},A.prototype._emitDeps=function(){var e=this;return h.obj(function(t,r,n){e.emit("dep",t),this.push(t),n()})},A.prototype._debug=function(e){var t=y(e.basedir,process.cwd());return h.obj(function(r,n,i){e.debug&&(r.sourceRoot="file://localhost",r.sourceFile=T(t,r.file)),this.push(r),i()})},A.prototype.reset=function(e){e||(e={});var t=this._bpack.hasExports;this.pipeline=this._createPipeline(g(e,this._options)),this._bpack.hasExports=t,this._entryOrder=0,this._bundled=!1,this.emit("reset")},A.prototype.bundle=function(e){var t=this;if(e&&"object"==typeof e)throw new Error("bundle() no longer accepts option arguments.\nMove all option arguments to the browserify() constructor.");if(this._bundled){var r=this._recorded;this.reset(),r.forEach(function(e){t.pipeline.write(e)})}var n=E(this.pipeline);function i(){t.emit("bundle",n),t.pipeline.end()}return e&&(n.on("error",e),n.pipe(p(function(t){e(null,t)}))),0===this._pending?i():this.once("_ready",i),this._bundled=!0,n}},872:function(e,t,r){ +var n=r(41),i=r(606),s=r(875).ArraySet,o=r(359).MappingList;function a(e){e||(e={}),this._file=i.getArg(e,"file",null),this._sourceRoot=i.getArg(e,"sourceRoot",null),this._skipValidation=i.getArg(e,"skipValidation",!1),this._sources=new s,this._names=new s,this._mappings=new o,this._sourcesContents=null}a.prototype._version=3,a.fromSourceMap=function(e){var t=e.sourceRoot,r=new a({file:e.file,sourceRoot:t});return e.eachMapping(function(e){var n={generated:{line:e.generatedLine,column:e.generatedColumn}};null!=e.source&&(n.source=e.source,null!=t&&(n.source=i.relative(t,n.source)),n.original={line:e.originalLine,column:e.originalColumn},null!=e.name&&(n.name=e.name)),r.addMapping(n)}),e.sources.forEach(function(t){var n=e.sourceContentFor(t);null!=n&&r.setSourceContent(t,n)}),r},a.prototype.addMapping=function(e){var t=i.getArg(e,"generated"),r=i.getArg(e,"original",null),n=i.getArg(e,"source",null),s=i.getArg(e,"name",null);this._skipValidation||this._validateMapping(t,r,n,s),null!=n&&(n=String(n),this._sources.has(n)||this._sources.add(n)),null!=s&&(s=String(s),this._names.has(s)||this._names.add(s)),this._mappings.add({generatedLine:t.line,generatedColumn:t.column,originalLine:null!=r&&r.line,originalColumn:null!=r&&r.column,source:n,name:s})},a.prototype.setSourceContent=function(e,t){var r=e;null!=this._sourceRoot&&(r=i.relative(this._sourceRoot,r)),null!=t?(this._sourcesContents||(this._sourcesContents=Object.create(null)),this._sourcesContents[i.toSetString(r)]=t):this._sourcesContents&&(delete this._sourcesContents[i.toSetString(r)],0===Object.keys(this._sourcesContents).length&&(this._sourcesContents=null))},a.prototype.applySourceMap=function(e,t,r){var n=t;if(null==t){if(null==e.file)throw new Error('SourceMapGenerator.prototype.applySourceMap requires either an explicit source file, or the source map\'s "file" property. Both were omitted.');n=e.file}var o=this._sourceRoot;null!=o&&(n=i.relative(o,n));var a=new s,u=new s;this._mappings.unsortedForEach(function(t){if(t.source===n&&null!=t.originalLine){var s=e.originalPositionFor({line:t.originalLine,column:t.originalColumn});null!=s.source&&(t.source=s.source,null!=r&&(t.source=i.join(r,t.source)),null!=o&&(t.source=i.relative(o,t.source)),t.originalLine=s.line,t.originalColumn=s.column,null!=s.name&&(t.name=s.name))}var c=t.source;null==c||a.has(c)||a.add(c);var l=t.name;null==l||u.has(l)||u.add(l)},this),this._sources=a,this._names=u,e.sources.forEach(function(t){var n=e.sourceContentFor(t);null!=n&&(null!=r&&(t=i.join(r,t)),null!=o&&(t=i.relative(o,t)),this.setSourceContent(t,n))},this)},a.prototype._validateMapping=function(e,t,r,n){if(t&&"number"!=typeof t.line&&"number"!=typeof t.column)throw new Error("original.line and original.column are not numbers -- you probably meant to omit the original mapping entirely and only map the generated position. If so, pass null for the original mapping instead of an object with empty or null values.");if((!(e&&"line"in e&&"column"in e&&e.line>0&&e.column>=0)||t||r||n)&&!(e&&"line"in e&&"column"in e&&t&&"line"in t&&"column"in t&&e.line>0&&e.column>=0&&t.line>0&&t.column>=0&&r))throw new Error("Invalid mapping: "+JSON.stringify({generated:e,source:r,original:t,name:n}))},a.prototype._serializeMappings=function(){for(var e,t,r,s,o=0,a=1,u=0,c=0,l=0,h=0,p="",f=this._mappings.toArray(),d=0,g=f.length;d0){if(!i.compareByGeneratedPositionsInflated(t,f[d-1]))continue;e+=","}e+=n.encode(t.generatedColumn-o),o=t.generatedColumn,null!=t.source&&(s=this._sources.indexOf(t.source),e+=n.encode(s-h),h=s,e+=n.encode(t.originalLine-1-c),c=t.originalLine-1,e+=n.encode(t.originalColumn-u),u=t.originalColumn,null!=t.name&&(r=this._names.indexOf(t.name),e+=n.encode(r-l),l=r)),p+=e}return p},a.prototype._generateSourcesContent=function(e,t){return e.map(function(e){if(!this._sourcesContents)return null;null!=t&&(e=i.relative(t,e));var r=i.toSetString(e);return Object.prototype.hasOwnProperty.call(this._sourcesContents,r)?this._sourcesContents[r]:null},this)},a.prototype.toJSON=function(){var e={version:this._version,sources:this._sources.toArray(),names:this._names.toArray(),mappings:this._serializeMappings()};return null!=this._file&&(e.file=this._file),null!=this._sourceRoot&&(e.sourceRoot=this._sourceRoot),this._sourcesContents&&(e.sourcesContent=this._generateSourcesContent(e.sources,e.sourceRoot)),e},a.prototype.toString=function(){return JSON.stringify(this.toJSON())},t.SourceMapGenerator=a},856:function(e,t,r){function n(e,t){return Object.prototype.hasOwnProperty.call(e,t)}t.alphasort=c,t.alphasorti=u,t.setopts=function(e,t,r){r||(r={});if(r.matchBase&&-1===t.indexOf("/")){if(r.noglobstar)throw new Error("base matching requires globstar");t="**/"+t}e.silent=!!r.silent,e.pattern=t,e.strict=!1!==r.strict,e.realpath=!!r.realpath,e.realpathCache=r.realpathCache||Object.create(null),e.follow=!!r.follow,e.dot=!!r.dot,e.mark=!!r.mark,e.nodir=!!r.nodir,e.nodir&&(e.mark=!0);e.sync=!!r.sync,e.nounique=!!r.nounique,e.nonull=!!r.nonull,e.nosort=!!r.nosort,e.nocase=!!r.nocase,e.stat=!!r.stat,e.noprocess=!!r.noprocess,e.absolute=!!r.absolute,e.maxLength=r.maxLength||1/0,e.cache=r.cache||Object.create(null),e.statCache=r.statCache||Object.create(null),e.symlinks=r.symlinks||Object.create(null),function(e,t){e.ignore=t.ignore||[],Array.isArray(e.ignore)||(e.ignore=[e.ignore]);e.ignore.length&&(e.ignore=e.ignore.map(l))}(e,r),e.changedCwd=!1;var s=process.cwd();n(r,"cwd")?(e.cwd=i.resolve(r.cwd),e.changedCwd=e.cwd!==s):e.cwd=s;e.root=r.root||i.resolve(e.cwd,"/"),e.root=i.resolve(e.root),"win32"===process.platform&&(e.root=e.root.replace(/\\/g,"/"));e.cwdAbs=o(e.cwd)?e.cwd:h(e,e.cwd),"win32"===process.platform&&(e.cwdAbs=e.cwdAbs.replace(/\\/g,"/"));e.nomount=!!r.nomount,r.nonegate=!0,r.nocomment=!0,e.minimatch=new a(t,r),e.options=e.minimatch.options},t.ownProp=n,t.makeAbs=h,t.finish=function(e){for(var t=e.nounique,r=t?[]:Object.create(null),n=0,i=e.matches.length;n=0?n():t._external.indexOf(e.file)>=0?n():(s=e.id,("win32"===process.platform?/^\w:/:/^\//).test(s)&&(e.id="/"+T(i,e.file)),Object.keys(e.deps||{}).forEach(function(t){e.deps[t]="/"+T(i,e.deps[t])}),this.push(e),void n());var s}))}return n},A.prototype._createDeps=function(e){var t=this,r=g(e),s=y(e.basedir,process.cwd());r.expose=this._expose,r.extensions=[".js",".json"].concat(r.extensions||[]),t._extensions=r.extensions,r.transform=[],r.transformKey=y(e.transformKey,["browserify","transform"]),r.postFilter=function(r,n,i){return!(e.postFilter&&!e.postFilter(r,n,i))&&(!(t._external.indexOf(n)>=0)&&(!(t._exclude.indexOf(n)>=0)&&(i&&i.browserify&&i.browserify.transform&&(i.browserify.transform=[].concat(i.browserify.transform).filter(Boolean).filter(t._filterTransform)),!0)))},r.filter=function(r){return!(e.filter&&!e.filter(r))&&(!(t._external.indexOf(r)>=0)&&(!(t._exclude.indexOf(r)>=0)&&(!1!==e.bundleExternal||!j(r))))},r.resolve=function(r,i,o){if(t._ignore.indexOf(r)>=0)return o(null,C.empty,{});t._bresolve(r,i,function(r,a,u){if(a&&t._ignore.indexOf(a)>=0)return o(null,C.empty,{});if(a&&t._ignore.length){var c=a.replace(/\\/g,"/").split("/node_modules/")[1];if(c&&(c=c.split("/")[0],t._ignore.indexOf(c)>=0))return o(null,C.empty,{})}if(a){var l="/"+T(s,a);if(t._external.indexOf(l)>=0)return o(null,l);if(t._exclude.indexOf(l)>=0)return o(null,l);if(t._ignore.indexOf(l)>=0)return o(null,C.empty,{})}if(r)o(r,a,u);else if(a){if(e.preserveSymlinks&&i.id)return o(r,n.resolve(a),u,a);S.realpath(a,function(e,t){o(e,t,u,a)})}else o(r,null,u)})},!1===e.builtins?(r.modules={},t._exclude.push.apply(t._exclude,Object.keys(c))):e.builtins&&m(e.builtins)?(r.modules={},e.builtins.forEach(function(e){r.modules[e]=c[e]})):e.builtins&&"object"==typeof e.builtins?r.modules=e.builtins:r.modules=g(c),Object.keys(c).forEach(function(e){v(r.modules,e)||t._exclude.push(e)}),r.globalTransform=[],this._bundled||this.once("bundle",function(){t.pipeline.write({transform:l,global:!0,options:{}})});var o=[].concat(e.noParse).filter(Boolean),u=o.filter(function(e){return"string"==typeof e}).map(function(e){return n.resolve(s,e)});function l(t){if(!1===e.detectGlobals)return h();if(!0===e.noParse)return h();if(o.indexOf(t)>=0)return h();if(u.indexOf(t)>=0)return h();for(var r=t.replace(/\\/g,"/").split("/node_modules/"),i=0;i=0?s():t._external.indexOf("/"+T(r,e.id))>=0?s():t._external.indexOf(e.file)>=0?s():(e.index&&(e.id=e.index),t.emit("label",o,e.id),e.indexDeps&&(e.deps=e.indexDeps||{}),Object.keys(e.deps).forEach(function(i){if(t._expose[i])e.deps[i]=i;else{var s=n.resolve(n.dirname(e.file),i),o="/"+T(r,s);if(t._external.indexOf(o)>=0&&(e.deps[i]=o),t._external.indexOf(s)>=0&&(e.deps[i]=o),t._external.indexOf(i)>=0)e.deps[i]=i;else for(var a=0;a=0){e.deps[i]=o+u;break}}}}),(e.entry||e.expose)&&(t._bpack.standaloneModule=e.id),this.push(e),void s())})},A.prototype._emitDeps=function(){var e=this;return h.obj(function(t,r,n){e.emit("dep",t),this.push(t),n()})},A.prototype._debug=function(e){var t=y(e.basedir,process.cwd());return h.obj(function(r,n,i){e.debug&&(r.sourceRoot="file://localhost",r.sourceFile=T(t,r.file)),this.push(r),i()})},A.prototype.reset=function(e){e||(e={});var t=this._bpack.hasExports;this.pipeline=this._createPipeline(g(e,this._options)),this._bpack.hasExports=t,this._entryOrder=0,this._bundled=!1,this.emit("reset")},A.prototype.bundle=function(e){var t=this;if(e&&"object"==typeof e)throw new Error("bundle() no longer accepts option arguments.\nMove all option arguments to the browserify() constructor.");if(this._bundled){var r=this._recorded;this.reset(),r.forEach(function(e){t.pipeline.write(e)})}var n=E(this.pipeline);function i(){t.emit("bundle",n),t.pipeline.end()}return e&&(n.on("error",e),n.pipe(p(function(t){e(null,t)}))),0===this._pending?i():this.once("_ready",i),this._bundled=!0,n}},872:function(e,t,r){ /* * Copyright 2011 Mozilla Foundation and contributors * Licensed under the New BSD license. See LICENSE or: diff --git a/yarn.lock b/yarn.lock index dd2b33a726..28ca5dbcb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -245,10 +245,10 @@ dependencies: "@types/node" "*" -"@zeit/ncc@0.20.2": - version "0.20.2" - resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.2.tgz#5f5f67b51d6bd1f92e334c4aeed799dc9625a459" - integrity sha512-pLc/iJ68//djAW3jE2xMm5vauAuN0wuq9bv4ha/AAlVOBhJXHrx7GBo8SITTZq11nT8wWzYrY0eotw4UfZBiiw== +"@zeit/ncc@^0.20.4": + version "0.20.4" + resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.20.4.tgz#00f0a25a88cac3712af4ba66561d9e281c6f05c9" + integrity sha512-fmq+F/QxPec+k/zvT7HiVpk7oiGFseS6brfT/AYqmCUp6QFRK7vZf2Ref46MImsg/g2W3g5X6SRvGRmOAvEfdA== JSONStream@^1.0.3, JSONStream@^1.0.4: version "1.3.5"