Browse Source

Merge branch 'libToModules' of https://github.com/BabylonJS/Babylon.js into libToModules

sebavan 6 năm trước cách đây
mục cha
commit
d988d062b4
2 tập tin đã thay đổi với 12 bổ sung6 xóa
  1. 11 5
      Tools/Gulp/tasks/gulpTasks-watchCore.js
  2. 1 1
      inspector/webpack.config.js

+ 11 - 5
Tools/Gulp/tasks/gulpTasks-watchCore.js

@@ -17,22 +17,28 @@ var module = "core";
 /**
  * Process shader ts files.
  */
-gulp.task("watchCore-cleanShaders", function startWatch(cb) {
+gulp.task("watchCore-cleanShaders", function startWatch() {
     var settings = config[module].computed;
 
     // Clean shaders.
-    del(settings.shaderTSGlob, { force: true });
-    
+    return del(settings.shaderTSGlob, { force: true });
+});
+
+gulp.task("watchCore-buildShaders", gulp.series("watchCore-cleanShaders", function buildShaders() {
+    var settings = config[module].computed;
+    uncommentShaders.displayName = "Uncomment";
+    processShaders.displayName = "Process";
+
     // Generate shaders.
     return gulp.src(settings.shaderGlob)
         .pipe(uncommentShaders())
         .pipe(processShaders(true));
-});
+}));
 
 /**
  * Watch ts files and fire repective tasks.
  */
-gulp.task("watchCore", gulp.series("watchCore-cleanShaders", function() {
+gulp.task("watchCore", gulp.series("watchCore-buildShaders", function watch() {
     var settings = config[module].computed;
     var library = config[module].libraries[0];
 

+ 1 - 1
inspector/webpack.config.js

@@ -7,7 +7,7 @@ var config = babylonWebpackConfig({
     resolve: {
         extensions: [".js", '.ts', ".tsx"],
         alias: {
-            "re-resizable$": path.resolve(__dirname, '../node_modules/re-resizable/lib/index.es5.js')
+            "re-resizable$": __dirname + "/../node_modules/re-resizable/lib/index.es5.js"
         }
     },
     moduleRules: [