Browse Source

A bit of cleanup

sebastien 6 năm trước cách đây
mục cha
commit
19a95b9ff6

+ 2 - 1
Tools/Gulp/config.json

@@ -482,7 +482,8 @@
         "libraries": [
             {
                 "output": "babylon.inspector.bundle.js",
-                "entry": "././legacy/legacy.ts",
+                "maxOutput": "babylon.inspector.bundle.max.js",
+                "entry": "./legacy/legacy.ts",
                 "extendsRoot": true
             }
         ],

+ 5 - 4
Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -2,7 +2,6 @@
 var gulp = require("gulp");
 var webpack = require('webpack');
 var webpackStream = require("webpack-stream");
-var dtsBundle = require('dts-bundle');
 var cp = require('child_process');
 var merge2 = require("merge2");
 var path = require("path");
@@ -34,12 +33,14 @@ var buildExternalLibrariesMultiEntry = function(libraries, settings, cb) {
     const sequence = [];
     var outputDirectory = config.build.outputDirectory + settings.build.distOutputDirectory;
 
+    var isMinOutputName = libraries[0].output.indexOf(".min.") > -1;
+
     // Webpack Config.
     var wpConfig = require(settings.build.webpack);
     wpConfig.entry = { };
-    wpConfig.output.filename = settings.isCore ? '[name].js' : '[name].min.js';
+    wpConfig.output.filename = isMinOutputName ? '[name].js' : '[name].min.js';
     for (let library of settings.libraries) {
-        let name = library.output.replace(settings.isCore ? ".js" : ".min.js", "");
+        let name = library.output.replace(isMinOutputName ? ".js" : ".min.js", "");
         wpConfig.entry[name] = path.resolve(wpConfig.context, library.entry);
     }
 
@@ -51,7 +52,7 @@ var buildExternalLibrariesMultiEntry = function(libraries, settings, cb) {
     // Generate unminified file.
     wpConfig.mode = "development";
     // Allow babylon.max.js and babylon.js
-    wpConfig.output.filename = settings.isCore ? '[name].max.js' : '[name].js';
+    wpConfig.output.filename = isMinOutputName ? '[name].max.js' : '[name].js';
     //wpConfig.output.filename = library.maxOutput || wpConfig.output.filename.replace(".min", "");
     let wpBuildMax = webpackStream(wpConfig, webpack);
     let buildEventMax = wpBuildMax.pipe(gulp.dest(outputDirectory));

+ 0 - 1
Tools/Gulp/tasks/gulpTasks-viewerLibraries.js

@@ -1,7 +1,6 @@
 // Gulp Tools
 var gulp = require("gulp");
 var webpackStream = require("webpack-stream");
-var fs = require("fs");
 var dtsBundle = require('dts-bundle');
 var merge2 = require("merge2");
 var through = require('through2');

+ 0 - 1
loaders/webpack.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const DtsBundleWebpack = require('dts-bundle-webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {

+ 0 - 1
materialsLibrary/webpack.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const DtsBundleWebpack = require('dts-bundle-webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {

+ 0 - 2
package.json

@@ -58,12 +58,10 @@
         "css-loader": "^1.0.0",
         "del": "3.0.0",
         "dts-bundle": "^0.7.3",
-        "dts-bundle-webpack": "^1.0.0",
         "file-loader": "~2.0.0",
         "fs-extra": "^5.0.0",
         "gulp": "^4.0.0",
         "gulp-concat": "~2.6.1",
-        "gulp-debug": "^4.0.0",
         "gulp-filter": "^5.1.0",
         "gulp-optimize-js": "^1.1.0",
         "gulp-rename": "^1.4.0",

+ 0 - 1
postProcessLibrary/webpack.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const DtsBundleWebpack = require('dts-bundle-webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {

+ 0 - 9
proceduralTexturesLibrary/webpack.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const DtsBundleWebpack = require('dts-bundle-webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {
@@ -57,14 +56,6 @@ module.exports = {
             path.resolve(__dirname, './src/**/*.js'),
             path.resolve(__dirname, './src/**/*.map')
         ]),
-        // moved out of here due to the way gulp works...
-        /*new DtsBundleWebpack({
-            name: "babylonjs-gui",
-            main: path.resolve(__dirname, '../dist/preview release/gui/build/index.d.ts'),
-            out: path.resolve(__dirname, '../dist/preview release/gui/babylon.gui.module.d.ts'),
-            baseDir: path.resolve(__dirname, '../dist/preview release/gui/build/'),
-            headerText: "BabylonJS GUI"
-        }),*/
         new webpack.WatchIgnorePlugin([
             /\.js$/,
             /\.d\.ts$/,

+ 0 - 1
serializers/webpack.config.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const webpack = require('webpack');
-const DtsBundleWebpack = require('dts-bundle-webpack');
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 
 module.exports = {