Merge pull request highcharts#22249 from highcharts/tools/fix-compile…

…d-bundles Tools: Fixed compiled bundles
miqdigital · Nov 29, 2024 · 1d5b0e6 · 1d5b0e6
2 parents 6b204a7 + 3da3f5a
commit 1d5b0e6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/tools/gulptasks/dist-release.js b/tools/gulptasks/dist-release.js
@@ -7,7 +7,7 @@ const gulp = require('gulp');
 const log = require('../libs/log');
 const fs = require('fs-extra');
 // const fs = require('fs');
-// const libFS = require('../libs/fs');
+// const fsLib = require('../libs/fs');
 const { join } = require('path');
 const readline = require('readline');
 const argv = require('yargs').argv;
@@ -141,7 +141,7 @@ function updateJSONFiles(version, name) {
         const json = JSON.parse(fileData);
         json.types = (
             json.main ?
-                json.main.replace(/\.js$/, '.d.ts') :
+                json.main.replace(/\.js$/u, '.d.ts') :
                 'highcharts.d.ts'
         );
         json.version = version;
@@ -304,6 +304,12 @@ function checkIfLoggedInOnNpm() {
 async function release() {
     const products = await getProductsJs();
     const version = products[PRODUCT_NAME].nr;
+
+    if (!fs.existsSync('code/highcharts.js')) {
+        log.starting('Compiling one more time.');
+        await gulp.series('scripts', 'scripts-compile');
+    }
+
     log.starting(`Initiating release of ${PRODUCT_NAME} version ${version}.`);
 
     if (argv.push) {

diff --git a/tools/gulptasks/dist.js b/tools/gulptasks/dist.js
@@ -29,11 +29,7 @@ Gulp.task(
             Gulp.series(
                 'lint-ts',
                 'scripts-clean',
-                'scripts-css',
-                'scripts-ts',
-                'scripts-js',
-                'scripts-code',
-                'scripts-es5',
+                'scripts',
                 'scripts-compile',
                 'dist-clean',
                 'dist-copy',
@@ -47,10 +43,7 @@ Gulp.task(
             Gulp.series(
                 'lint-ts',
                 'scripts-clean',
-                'scripts-css',
-                'scripts-ts',
-                'scripts-code',
-                'scripts-webpack',
+                'scripts',
                 'scripts-compile',
                 'dist-clean',
                 'dist-copy',

diff --git a/tools/gulptasks/scripts.js b/tools/gulptasks/scripts.js
@@ -161,14 +161,16 @@ function task() {
             shouldRun() ||
             processLib.isRunning('scripts_incomplete')
         ) {
-            fsLib.deleteDirectory('code', true);
-
             processLib.isRunning('scripts_incomplete', true, true);
 
+            fsLib.deleteDirectory('code', true);
+
             gulp.series(
-                'scripts-ts',
                 'scripts-css',
-                argv.assembler ? 'scripts-js' : 'scripts-webpack'
+                'scripts-ts',
+                'scripts-es5',
+                argv.assembler ? 'scripts-js' : 'scripts-webpack',
+                'scripts-code'
             )(
                 function (error) {