瀏覽代碼

npm packages gulp granularity

sebavan 6 年之前
父節點
當前提交
2d86578ac0

+ 2 - 13
Tools/Gulp/gulpfile.js

@@ -1,11 +1,10 @@
 // Gulp Tools
 var gulp = require("gulp");
-// var optimisejs = require("gulp-optimize-js");
 
 // Import Gulp Tasks
+require("./tasks/gulpTasks-viewerLibraries");
 require("./tasks/gulpTasks-libraries");
 require("./tasks/gulpTasks-librariesES6");
-require("./tasks/gulpTasks-viewerLibraries");
 require("./tasks/gulpTasks-tsLint");
 require("./tasks/gulpTasks-netlify");
 require("./tasks/gulpTasks-whatsNew");
@@ -34,16 +33,6 @@ gulp.task("tsLint", gulp.series("typescript-libraries-tsLint"));
 gulp.task("typescript", gulp.series("core"));
 
 /**
- * Build all libs.
- */
-gulp.task("typescript-libraries", gulp.series(config.modules, config.viewerModules));
-
-/**
- * Build all es 6 libs.
- */
-gulp.task("typescript-es6", gulp.series(config.modules.map((module) => module + "-es6")));
-
-/**
  * Validate compile the code and check the comments and style case convention through typedoc
  */
 gulp.task("typedoc-check", gulp.series("core", "gui", "loaders", "serializers", "typedoc-generate", "typedoc-validate"));
@@ -66,7 +55,7 @@ gulp.task("tests-all", gulp.series("tests-unit", "tests-modules", "tests-validat
 /**
  * Get Ready to test Npm Packages.
  */
-gulp.task("npmPackages", gulp.series("typescript-libraries", "typescript-es6", "npmPackages-generate"));
+gulp.task("npmPackages", gulp.series("npmPackages-all"));
 
 /**
  * The default task, concat and min the main BJS files.

+ 6 - 1
Tools/Gulp/tasks/gulpTasks-libraries.js

@@ -169,4 +169,9 @@ function buildExternalLibraries(settings) {
 config.modules.map(function(module) {
     const settings = config[module];
     gulp.task(module, buildExternalLibraries(settings));
-});
+});
+
+/**
+ * Build all libs.
+ */
+gulp.task("typescript-libraries", gulp.series(config.modules, config.viewerModules));

+ 6 - 1
Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -288,4 +288,9 @@ function buildES6Library(settings, module) {
 config.modules.map(function(module) {
     const settings = config[module];
     gulp.task(module + "-es6", buildES6Library(settings, module));
-});
+});
+
+/**
+ * Build all es 6 libs.
+ */
+gulp.task("typescript-es6", gulp.series(config.modules.map((module) => module + "-es6")));

+ 23 - 3
Tools/Gulp/tasks/gulpTasks-npmPackages.js

@@ -5,9 +5,29 @@ var gulp = require("gulp");
 var publish = require("../../Publisher/tasks/main");
 
 /**
- * Generate local npm packages for npm link tests.
+ * Get Ready to test Npm Packages.
  */
-gulp.task("npmPackages-generate", function(cb) {
+gulp.task("npmPackages-es6", gulp.series("typescript-es6", function(cb) {
+    publish(false, {
+        es6: true
+    });
+    cb();
+}));
+
+/**
+ * Get Ready to test Npm Packages.
+ */
+gulp.task("npmPackages-UMD", gulp.series("typescript-libraries", function(cb) {
+    publish(false, {
+        umd: true
+    });
+    cb();
+}));
+
+/**
+ * Get Ready to test Npm Packages.
+ */
+gulp.task("npmPackages-all", gulp.series("typescript-libraries", "typescript-es6", function(cb) {
     publish(false);
     cb();
-});
+}));

+ 25 - 15
Tools/Publisher/tasks/main.js

@@ -15,28 +15,38 @@ const prepareEs6DevPackages = require("./prepareEs6DevPackages");
 // Path management.
 process.env.PATH += (path.delimiter + path.join(__dirname, '../node_modules', '.bin'));
 
-const createVersion = function(version) {
-    // Publish additional packages from the config.
-    processAdditionalPackages(version);
+const createVersion = function(version, options) {
+    options = options || {
+        additional: true,
+        umd: true,
+        es6: true
+    };
 
-    // Create the packages and publish if needed.
-    processLegacyPackages(version);
-
-    // Prepare es6 Dev Folder.
-    prepareUMDDevPackages();
+    if (options.additional) {
+        // Publish additional packages from the config.
+        processAdditionalPackages(version);
+    }
 
-    // Do not publish es6 yet.
-    process.env.BABYLONJSREALPUBLISH = false;
-    processEs6Packages(version);
+    if (options.umd) {
+        // Create the packages and publish if needed.
+        processLegacyPackages(version);
+        // Prepare umd Dev Folder.
+        prepareUMDDevPackages();
+    }
 
-    // Prepare es6 Dev Folder.
-    prepareEs6DevPackages();
+    if (options.es6) {
+        // Do not publish es6 yet.
+        process.env.BABYLONJSREALPUBLISH = false;
+        processEs6Packages(version);
+        // Prepare es6 Dev Folder.
+        prepareEs6DevPackages();
+    }
 }
 
 /**
  * Main function driving the publication.
  */
-module.exports = function(production) {
+module.exports = function(production, options) {
     if (production) {
         prompt.start();
 
@@ -56,7 +66,7 @@ module.exports = function(production) {
 
             process.env.BABYLONJSREALPUBLISH = true;
 
-            createVersion(version);
+            createVersion(version, options);
 
             // Invite user to tag with the new version.
             colorConsole.log("Done, please tag git with " + version);

+ 1 - 1
Tools/Publisher/tasks/versionNumberManager.js

@@ -5,7 +5,7 @@ const colorConsole = require("../../NodeHelpers/colorConsole");
 
 // Global Variables.
 const config = require("../../Config/config.js");
-const enginePath = path.join(config.core.computed.srcDirectory, "Engines/engine.ts");
+const enginePath = path.join(config.core.computed.mainDirectory, "Engines/engine.ts");
 
 /**
  * Get the version from the engine class for Babylon

+ 0 - 1
package.json

@@ -63,7 +63,6 @@
         "gulp-concat": "~2.6.1",
         "gulp-connect": "^5.6.1",
         "gulp-filter": "^5.1.0",
-        "gulp-optimize-js": "^1.1.0",
         "gulp-rename": "^1.4.0",
         "gulp-replace": "~1.0.0",
         "gulp-tslint": "^8.1.3",