diff --git a/gulpfile.js b/gulpfile.js index fd54cbc19b..c423946f31 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -91,7 +91,7 @@ gulp.task('build-jsb-extends-dev', function (done) { ], './bin/jsb_polyfill.dev.js', jsbSkipModules, done); }); -gulp.task('build-jsb-extends-min', function () { +gulp.task('build-jsb-extends-min', function (done) { Engine.buildJsbMin([ './jsb/index.js', './extends.js' @@ -110,7 +110,7 @@ gulp.task('build-min', ['build-html5', 'build-jsb']); gulp.task('clean-test', function (done) { Test.clean([ './bin/cocos2d-js-extends-for-test.js', - 'bin/cocos2d-js-for-test.js' + './bin/cocos2d-js-for-test.js' ], done); }); diff --git a/index.js b/index.js index e8a2723955..0054173420 100644 --- a/index.js +++ b/index.js @@ -51,7 +51,11 @@ if (!isMainProcess) { try { require('./bin/modular-cocos2d'); } catch (error) { - require('./bin/modular-cocos2d-cut'); + if (error.code === 'MODULE_NOT_FOUND') { + require('./bin/modular-cocos2d-cut'); + } else { + throw error; + } } } else { diff --git a/module.json b/modules.json similarity index 83% rename from module.json rename to modules.json index 3e729eae5c..20110ca0d8 100644 --- a/module.json +++ b/modules.json @@ -2,145 +2,145 @@ { "name": "Core", "locked": true, - "includes": [] + "entries": [] }, { "name": "Canvas", "locked": true, - "includes": [ + "entries": [ "./cocos2d/core/components/CCCanvas.js" ] }, { "name": "Sprite", "locked": true, - "includes": [ + "entries": [ "./cocos2d/core/components/CCSprite.js" ] }, { "name": "Label", - "includes": [ + "entries": [ "./cocos2d/core/components/CCLabel.js" ] }, { "name": "Mask", - "includes": [ + "entries": [ "./cocos2d/core/components/CCMask.js" ] }, { "name": "CCSpriteDistortion", - "includes": [ + "entries": [ "./cocos2d/core/components/CCSpriteDistortion.js" ] }, { "name": "LabelOutline", - "includes": [ + "entries": [ "./cocos2d/core/components/CCLabelOutline.js" ] }, { "name": "ParticleSystem", - "includes": [ + "entries": [ "./cocos2d/particle.CCParticleSystem.js" ] }, { "name": "TiledMap", - "includes": [ + "entries": [ "./cocos2d/tilemap/CCTiledMap.js" ] }, { "name": "Spine Skeleton", - "includes": [ + "entries": [ "./extensions/spine/index.js" ] }, { "name": "Widget", - "includes": [ + "entries": [ "./cocos2d/core/components/CCWidget.js" ] }, { "name": "Button", - "includes": [ + "entries": [ "./cocos2d/core/components/CCButton.js" ] }, { "name": "ProgressBar", - "includes": [ + "entries": [ "./cocos2d/core/components/CCProgressBar.js" ] }, { "name": "ScrollBar", - "includes": [ + "entries": [ "./cocos2d/core/components/CCScrollBar.js" ] }, { "name": "ScrollView", - "includes": [ + "entries": [ "./cocos2d/core/components/CCScrollView.js" ] }, { "name": "Layout", - "includes": [ + "entries": [ "./cocos2d/core/components/CCLayout.js" ] }, { "name": "EditorBox", - "includes": [ + "entries": [ "./cocos2d/core/components/CCEditBox.js" ] }, { "name": "VideoPlayer", - "includes": [ + "entries": [ "./cocos2d/core/components/CCVideoPlayer.js" ] }, { "name": "AudioSource", - "includes": [ + "entries": [ "./cocos2d/core/components/CCAudioSource.js" ] }, { "name": "Animation", - "includes": [ + "entries": [ "./cocos2d/core/components/CCAnimation.js" ] }, { "name": "MotionStreak", - "includes": [ + "entries": [ "./cocos2d/motion-streak/CCMotionStreak.js" ] }, { "name": "BoxCollider", - "includes": [ + "entries": [ "./cocos2d/core/collider/CCBoxCollider.js" ] }, { "name": "CircleCollider", - "includes": [ + "entries": [ "./cocos2d/core/collider/CCCircleCollider.js" ] }, { "name": "PolygonCollider", - "includes": [ + "entries": [ "./cocos2d/core/collider/CCPolygonCollider.js" ] }