Improve aliasify usage

ttakei · Mar 29, 2018 · 9fdde9f · 9fdde9f
1 parent 729fa55
commit 9fdde9f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/gulp/tasks/engine.js b/gulp/tasks/engine.js
@@ -47,6 +47,12 @@ var jsbSkipModules = [
     '../../cocos2d/audio/CCAudio',
     '../../external/box2d/box2d.js',
 ];
+var aliasifyConfig = {
+    replacements: {
+        '(.*)render-engine(.js)?': './cocos2d/core/renderer/render-engine.jsb'
+    },
+    verbose: false
+};
 
 exports.buildCocosJs = function (sourceFile, outputFile, excludes, opt_macroFlags, callback) {
     if (typeof opt_macroFlags === 'function') {
@@ -211,14 +217,9 @@ exports.buildJsb = function (sourceFile, outputFile, excludes, opt_macroFlags, c
     var outFile = Path.basename(outputFile);
     var outDir = Path.dirname(outputFile);
 
-    var aliasifyConfig = {
-        replacements: {
-            '(.*)render-engine(.js)?': './cocos2d/core/renderer/render-engine.jsb'
-        },
-        verbose: false
-    }
-
-    var bundler = createBundler(sourceFile, null, aliasifyConfig);
+    var bundler = createBundler(sourceFile, {
+        aliasifyConfig: aliasifyConfig
+    });
     excludes = excludes.concat(jsbSkipModules);
     excludes.forEach(function (module) {
         bundler.ignore(require.resolve(module));
@@ -248,14 +249,9 @@ exports.buildJsbMin = function (sourceFile, outputFile, excludes, opt_macroFlags
     var outFile = Path.basename(outputFile);
     var outDir = Path.dirname(outputFile);
 
-    var aliasifyConfig = {
-        replacements: {
-            '(.*)render-engine(.js)?': './cocos2d/core/renderer/render-engine.jsb'
-        },
-        verbose: false
-    }
-
-    var bundler = createBundler(sourceFile, null, aliasifyConfig);
+    var bundler = createBundler(sourceFile, {
+        aliasifyConfig: aliasifyConfig
+    });
     excludes = excludes.concat(jsbSkipModules);
     excludes.forEach(function (module) {
         bundler.ignore(require.resolve(module));

diff --git a/gulp/util/create-bundler.js b/gulp/util/create-bundler.js
@@ -55,7 +55,7 @@ function allowReturnOutsideFunctionInBrowserifyTransform () {
  * @param [options.babelifyOpt]
  * @param [options.aliasifyConfig]
  */
-module.exports = function createBundler(entryFiles, options, aliasifyConfig) {
+module.exports = function createBundler(entryFiles, options) {
     // https://github.com/substack/node-browserify#methods
     var browserifyOpt = {
         entries: [].concat(entryFiles),
@@ -133,5 +133,5 @@ module.exports = function createBundler(entryFiles, options, aliasifyConfig) {
             sourceMaps: true,
             compact: false
         })
-        .transform(aliasify, aliasifyConfig);
+        .transform(aliasify, (options && options.aliasifyConfig) || {});
 };
diff --git a/package.json b/package.json
@@ -44,6 +44,7 @@
     "jshint-stylish": "2.1.0",
     "multipipe": "0.3.0",
     "persistify": "^1.1.1",
+    "aliasify": "^2.1.0",
     "require-dir": "0.3.0",
     "uglify-es": "3.3.7",
     "vinyl": "1.1.0",