C. Scott Ananian has submitted this change and it was merged.
Change subject: Smash the global promise
......................................................................
Smash the global promise
* Also, allow me to override what node is named.
Change-Id: If8904b24530f2bf066cc84f9caa1577dd60f5a25
---
M Makefile
M unify-package-json.js
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
C. Scott Ananian: Verified; Looks good to me, approved
diff --git a/Makefile b/Makefile
index 5532455..b591b28 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,12 @@
+NODE?=/usr/bin/env nodejs
+
all: debug
core:
export LINK=g++
rm -f ./package.json
npm install prfun semver
- ./unify-package-json.js
+ $(NODE) ./unify-package-json.js
npm install
npm update
npm dedupe
diff --git a/unify-package-json.js b/unify-package-json.js
index 74254f2..9dbfaf0 100755
--- a/unify-package-json.js
+++ b/unify-package-json.js
@@ -18,7 +18,7 @@
util = require( 'util' );
try {
- require('prfun');
+ require('prfun/smash');
} catch ( err ) {
console.err( "The 'prfun' library could not be loaded. Please `npm
install prfun`")
}
--
To view, visit https://gerrit.wikimedia.org/r/308118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If8904b24530f2bf066cc84f9caa1577dd60f5a25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
