Browse Source

temp typings facto

sebavan 6 năm trước cách đây
mục cha
commit
30ef083ec9

+ 10 - 1
Tools/Config/config.js

@@ -16,6 +16,11 @@ const distES6Folder = path.join(tempFolder, config.build.distES6FolderName);
 const packageES6Folder = path.join(tempFolder, config.build.packageES6FolderName);
 const packageES6DevFolder = path.join(tempFolder, config.build.packageES6DevFolderName);
 
+const tempTypingsAMDFileName = config.tempTypingsAMDFileName;
+const tempTypingsFileName = tempTypingsAMDFileName.replace(".js", ".d.ts");
+const tempTypingsAMDFilePath = path.join(tempFolder, tempTypingsAMDFileName);
+const tempTypingsFilePath = path.join(tempFolder, tempTypingsFileName);
+
 config.computed = {
     rootFolder,
     tempFolder,
@@ -27,7 +32,11 @@ config.computed = {
     sourceES6Folder,
     distES6Folder,
     packageES6Folder,
-    packageES6DevFolder
+    packageES6DevFolder,
+    tempTypingsAMDFileName,
+    tempTypingsFileName,
+    tempTypingsAMDFilePath,
+    tempTypingsFilePath
 }
 
 config.additionalNpmPackages.forEach(package => {

+ 1 - 0
Tools/Config/config.json

@@ -2,6 +2,7 @@
     "build": {
         "outputDirectory": "../../dist/preview release",
         "tempDirectory": "./.temp/",
+        "tempTypingsAMDFileName": "tempTypings.js",
         "localDevES6FolderName": "localDevES6",
         "localDevUMDFolderName": "localDevUMD",
         "packageUMDFolderName": "packageUMD",

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

@@ -19,17 +19,9 @@ var commandLineOptions = minimist(process.argv.slice(2), {
     boolean: ["noNamespace"]
 });
 
-
 // Import Build Config
 var config = require("../../Config/config.js");
 
-// Constants
-const tempTypingsAMDFileName = "tempTypings.js";
-const tempTypingsFileName = tempTypingsAMDFileName.replace(".js", ".d.ts");
-
-const tempTypingsAMDFile = path.join(config.computed.tempFolder, tempTypingsAMDFileName);
-const tempTypingsFile = path.join(config.computed.tempFolder, tempTypingsFileName);
-
 /**
  * Clean shader ts files.
  */
@@ -102,7 +94,7 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
     let library = libraries[0];
     if (!library.preventLoadLibrary) {
         // Generate DTS the old way...
-        cp.execSync(`tsc --module amd --outFile "${tempTypingsAMDFile}" --emitDeclarationOnly true`, {
+        cp.execSync(`tsc --module amd --outFile "${config.computed.tempTypingsAMDFilePath}" --emitDeclarationOnly true`, {
             cwd: settings.computed.srcDirectory
         });
     }
@@ -114,8 +106,8 @@ var buildAMDDTSFiles = function(libraries, settings, cb) {
  */
 var appendLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
-        return gulp.src([tempTypingsFile, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])
-            .pipe(concat(tempTypingsFileName))
+        return gulp.src([config.computed.tempTypingsFilePath, path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])
+            .pipe(concat(config.computed.tempTypingsFileName))
             .pipe(gulp.dest(config.computed.tempFolder));
     }
     return Promise.resolve();
@@ -135,7 +127,7 @@ var processDTSFiles = function(libraries, settings, cb) {
         let fileLocation = path.join(outputDirectory, settings.build.umd.processDeclaration.filename);
 
         // Convert the tsc AMD BUNDLED declaration to our expected one
-        processAmdDeclarationToModule(tempTypingsFile, {
+        processAmdDeclarationToModule(config.computed.tempTypingsFilePath, {
             output: fileLocation,
             moduleName: settings.build.umd.packageName,
             entryPoint: library.entry,

+ 2 - 9
Tools/Gulp/tasks/gulpTasks-librariesES6.js

@@ -16,13 +16,6 @@ var del = require("del");
 // Import Build Config
 var config = require("../../Config/config.js");
 
-// Constants
-const tempTypingsAMDFileName = "tempTypings.js";
-const tempTypingsFileName = tempTypingsAMDFileName.replace(".js", ".d.ts");
-
-const tempTypingsAMDFile = path.join(config.computed.tempFolder, tempTypingsAMDFileName);
-const tempTypingsFile = path.join(config.computed.tempFolder, tempTypingsFileName);
-
 /**
  * Clean Source And Dist folders.
  */
@@ -164,7 +157,7 @@ var modifyTsConfig = function(settings, cb) {
 var concatLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
         return gulp.src([path.join(settings.computed.srcDirectory, settings.build.loseDTSFiles.glob)])
-            .pipe(concat(tempTypingsFileName))
+            .pipe(concat(config.computed.tempTypingsFileName))
             .pipe(processLooseDeclarations())
             .pipe(gulp.dest(config.computed.tempFolder));
     }
@@ -177,7 +170,7 @@ var concatLoseDTSFiles = function(settings) {
 var appendLoseDTSFiles = function(settings) {
     if (settings.build.loseDTSFiles) {
         const mainDeclarationFile = path.join(settings.computed.distES6Directory, settings.build.loseDTSFiles.destFileES6 || "index.d.ts");
-        return gulp.src([mainDeclarationFile, tempTypingsFile])
+        return gulp.src([mainDeclarationFile, config.computed.tempTypingsFilePath])
             .pipe(concat(settings.build.loseDTSFiles.destFileES6))
             .pipe(gulp.dest(settings.computed.distES6Directory));
     }