Merge pull request #13629 from apache/fix/build-scripts

fix(build): fix some compatibility issues of build scripts in Windows.
apache · Nov 17, 2020 · 1eaea81 · 1eaea81
2 parents 82b8368 + a7fc2f8
commit 1eaea81
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/build/config.js b/build/config.js
@@ -37,7 +37,7 @@ function preparePlugins(
     // if (zrRealPath !== zrNodeModulePath) {
     //     include.push(zrRealPath + '/**/*.ts');
     // }
-    include.push(zrRealPath + '/**/*.ts');
+    include.push(zrRealPath + '/src/**/*.ts');
 
     if (clean) {
         console.log('Built in clean mode without cache.');

diff --git a/build/pre-publish.js b/build/pre-publish.js
@@ -311,10 +311,10 @@ function transformRootFolderInEntry(entryFile, replacement) {
  * Transform `zrender/src` to `zrender/esm` in all files
  */
 async function transformDistributionFiles(rooltFolder, replacement) {
-    const files = await globby([
-        rooltFolder + '/**/*.js',
-        rooltFolder + '/**/*.d.ts',
-    ]);
+    const files = await readFilePaths({
+        patterns: ['**/*.js', '**/*.d.ts'],
+        cwd: rooltFolder
+    });
     // Simple regex replacement
     // TODO More robust way?
     for (let fileName of files) {

diff --git a/build/release.js b/build/release.js
@@ -19,7 +19,7 @@
 * under the License.
 */
 
-const {spawn} = require('child_process');
+const spawn = require('cross-spawn');
 const path = require('path');
 const chalk = require('chalk');
 const fsExtra = require('fs-extra');
@@ -78,4 +78,4 @@ function release() {
     });
 }
 
-release();
+release();
diff --git a/src/util/time.ts b/src/util/time.ts
@@ -45,7 +45,7 @@ const fullDayFormatter = '{yyyy}-{MM}-{dd}';
 
 export const fullLeveledFormatter = {
     year: '{yyyy}',
-    month: '{yyyy}:{MM}',
+    month: '{yyyy}-{MM}',
     day: fullDayFormatter,
     hour: fullDayFormatter + ' ' + defaultLeveledFormatter.hour,
     minute: fullDayFormatter + ' ' + defaultLeveledFormatter.minute,