Bläddra i källkod

removing unneeded dependencies, parallel when possible

Raanan Weber 7 år sedan
förälder
incheckning
27a241d4c0
2 ändrade filer med 9 tillägg och 20 borttagningar
  1. 6 10
      Tools/Gulp/gulpfile.js
  2. 3 10
      Tools/Gulp/package.json

+ 6 - 10
Tools/Gulp/gulpfile.js

@@ -22,7 +22,6 @@ var expect = require("gulp-expect-file");
 var optimisejs = require("gulp-optimize-js");
 var webserver = require("gulp-webserver");
 var path = require("path");
-var sass = require("gulp-sass");
 const webpack = require('webpack');
 var webpackStream = require("webpack-stream");
 var typedoc = require("gulp-typedoc");
@@ -206,7 +205,7 @@ gulp.task("workers", function (cb) {
 /**
  * Build tasks to concat minify uflify optimise the BJS js in different flavor (workers...).
  */
-gulp.task("buildWorker", gulp.series("workers", "shaders", function () {
+gulp.task("buildWorker", gulp.series(gulp.parallel("workers", "shaders"), function () {
     var filesToProcess = determineFilesToProcess("files");
     return merge2(
         gulp.src(filesToProcess).
@@ -402,7 +401,7 @@ var buildExternalLibrary = function (library, settings, watch) {
 
     var outputDirectory = config.build.outputDirectory + settings.build.distOutputDirectory;
 
-    let cssTask;
+    /*let cssTask;
 
     if (library.sassFiles && library.sassFiles.length) {
         cssTask = gulp.src(library.sassFiles)
@@ -410,7 +409,7 @@ var buildExternalLibrary = function (library, settings, watch) {
             .pipe(concat(library.output.replace(".js", ".css")))
             .pipe(gulp.dest(outputDirectory));
         tasks.push(cssTask);
-    }
+    }*/
 
 
     if (watch) {
@@ -481,9 +480,9 @@ var buildExternalLibrary = function (library, settings, watch) {
 
         var waitAll;
         let waitAllTasks = [];
-        if (cssTask) {
+        /*if (cssTask) {
             waitAllTasks.push(cssTask);
-        }
+        }*/
 
         if (dev) {
             waitAllTasks.push(dev);
@@ -523,7 +522,7 @@ var buildExternalLibrary = function (library, settings, watch) {
                     if (!out.minified) {
                         wpConfig.mode = "development";
                     }
-                    let wpBuild = webpackStream(wpConfig, webpack);
+                    let wpBuild = webpackStream(wpConfig, require("webpack"));
 
                     //shoud dtsBundle create the declaration?
                     if (settings.build.dtsBundle) {
@@ -592,9 +591,6 @@ var buildExternalLibrary = function (library, settings, watch) {
                     sequence.push(build);
 
                 });
-
-
-
             } else {
 
                 let wpBuild = webpackStream(require(library.webpack), webpack);

+ 3 - 10
Tools/Gulp/package.json

@@ -9,12 +9,9 @@
     "readme": "https://github.com/BabylonJS/Babylon.js/edit/master/readme.md",
     "license": "(Apache-2.0)",
     "devDependencies": {
-        "@types/node": "^8.10.21",
-        "base64-image-loader": "^1.2.1",
+        "@types/node": "^8.10.22",
         "chai": "^4.1.2",
         "color-support": "^1.1.3",
-        "css-loader": "^1.0.0",
-        "deepmerge": "^2.1.1",
         "del": "3.0.0",
         "gulp": "^4.0.0",
         "gulp-clean-ts-extends": "~0.1.1",
@@ -25,15 +22,11 @@
         "gulp-optimize-js": "^1.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "~1.0.0",
-        "gulp-sass": "^4.0.1",
         "gulp-sourcemaps": "~2.6.4",
         "gulp-typedoc": "^2.2.0",
         "gulp-typescript": "4.0.2",
         "gulp-uglify": "^3.0.1",
         "gulp-webserver": "^0.9.1",
-        "handlebars": "^4.0.11",
-        "html-loader": "^0.5.5",
-        "json-loader": "^0.5.7",
         "karma": "^2.0.5",
         "karma-browserstack-launcher": "^1.3.0",
         "karma-chai": "^0.1.0",
@@ -51,8 +44,8 @@
         "ts-loader": "^4.4.2",
         "typedoc": "^0.11.0",
         "typescript": "^2.9.2",
-        "webpack": "^4.16.2",
-        "webpack-stream": "^5.0.0"
+        "webpack": "^4.16.3",
+        "webpack-stream": "5.0.0"
     },
     "scripts": {
         "install": "cd ../../gui && npm install && cd ../Tools/Gulp/ &&  cd ../../inspector && npm install && cd ../Tools/Gulp/ && npm --prefix ../../Playground/ install ../../Playground/ && npm --prefix ../../tests/unit/ install ../../tests/unit/ && npm --prefix ../../Viewer/tests/ install ../../Viewer/tests/ && cd ../../Viewer && npm install && cd ../Tools/Gulp/ && gulp deployLocalDev"