From e30433cfa5237b55490da593361944c78ad49616 Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Tue, 21 Sep 2021 14:19:34 +0300 Subject: [PATCH 1/5] handle prelease identifiers --- npm/ng-packs/scripts/package.json | 3 ++- npm/ng-packs/scripts/publish.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/npm/ng-packs/scripts/package.json b/npm/ng-packs/scripts/package.json index 3984a00b14..b0961239bb 100644 --- a/npm/ng-packs/scripts/package.json +++ b/npm/ng-packs/scripts/package.json @@ -17,7 +17,8 @@ "execa": "^2.0.3", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "prompt-confirm": "^2.0.4" + "prompt-confirm": "^2.0.4", + "semver": "^7.3.5" }, "devDependencies": { "@types/fs-extra": "^8.0.1", diff --git a/npm/ng-packs/scripts/publish.ts b/npm/ng-packs/scripts/publish.ts index 75f677b4b9..9ff2057093 100644 --- a/npm/ng-packs/scripts/publish.ts +++ b/npm/ng-packs/scripts/publish.ts @@ -2,6 +2,7 @@ import program from 'commander'; import execa from 'execa'; import fse from 'fs-extra'; import replaceWithPreview from './replace-with-preview'; +const semverParse = require('semver/functions/parse'); program .option( @@ -50,7 +51,7 @@ program.parse(process.argv); let tag: string; if (program.preview) tag = 'preview'; - if (program.rc) tag = 'next'; + else if (program.rc || semverParse(program.nextVersion).prerelease?.length) tag = 'next'; await execa( 'yarn', From 92c5f613480c78fa9d04a56ec50f4698739ba09e Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Tue, 21 Sep 2021 14:19:44 +0300 Subject: [PATCH 2/5] reinstall packages --- npm/ng-packs/package.json | 4 ++-- npm/ng-packs/scripts/yarn.lock | 19 +++++++++++++++++++ npm/ng-packs/yarn.lock | 2 +- npm/publish.ps1 | 2 -- 4 files changed, 22 insertions(+), 5 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index d8718d737f..6ba0a57603 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -48,7 +48,7 @@ "@abp/ng.tenant-management": "~4.4.2", "@abp/ng.theme.basic": "~4.4.2", "@abp/ng.theme.shared": "~4.4.2", - "@abp/utils": "^4.4.2", + "@abp/utils": "~4.4.2", "@angular-devkit/build-angular": "~12.2.0", "@angular-devkit/build-ng-packagr": "^0.1002.0", "@angular-devkit/schematics-cli": "~12.2.0", @@ -115,4 +115,4 @@ "typescript": "~4.3.5", "zone.js": "~0.11.4" } -} +} \ No newline at end of file diff --git a/npm/ng-packs/scripts/yarn.lock b/npm/ng-packs/scripts/yarn.lock index 975620872f..0bee64a70e 100644 --- a/npm/ng-packs/scripts/yarn.lock +++ b/npm/ng-packs/scripts/yarn.lock @@ -834,6 +834,13 @@ loose-envify@^1.0.0: dependencies: js-tokens "^3.0.0 || ^4.0.0" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -1060,6 +1067,13 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + set-getter@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/set-getter/-/set-getter-0.1.1.tgz#a3110e1b461d31a9cfc8c5c9ee2e9737ad447102" @@ -1263,6 +1277,11 @@ wrappy@1: resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" diff --git a/npm/ng-packs/yarn.lock b/npm/ng-packs/yarn.lock index ccd80d41f1..1d605fa81a 100644 --- a/npm/ng-packs/yarn.lock +++ b/npm/ng-packs/yarn.lock @@ -118,7 +118,7 @@ chart.js "^2.9.3" tslib "^2.0.0" -"@abp/utils@^4.4.2": +"@abp/utils@^4.4.2", "@abp/utils@~4.4.2": version "4.4.2" resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-4.4.2.tgz#33d1a8c1199241e0c926fb3fd2f439d2925d5db1" integrity sha512-o/1XGKSOPB+yQH6c+yyMNSr/r8rzb3PoHkxKqDNEGEf79L6EwJ8Wm+4wKaoHjVrYQtn+d/40PLEdvGEwQxVvCw== diff --git a/npm/publish.ps1 b/npm/publish.ps1 index 486c6c6f4e..fddd8f2acd 100644 --- a/npm/publish.ps1 +++ b/npm/publish.ps1 @@ -23,8 +23,6 @@ $UpdateNgPacksCommand = "yarn update --registry $Registry" $IsRc = $(node publish-utils.js --rc --customVersion $Version) -eq "true"; - - if ($IsRc) { $NgPacksPublishCommand += " --rc" $UpdateGulpCommand += " -- --rc" From a7d8017d68fe76662371a4bbc3829f89332a4bf2 Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Tue, 21 Sep 2021 21:20:38 +0300 Subject: [PATCH 3/5] handle prerelase identifiers --- npm/ng-packs/scripts/publish.ts | 3 +-- npm/package-update-script.js | 34 ++++++++++++------------- npm/package.json | 3 ++- npm/publish-utils.js | 22 +++++++++-------- npm/publish.ps1 | 13 +++++----- npm/update-gulp.js | 44 ++++++++++++++++----------------- 6 files changed, 60 insertions(+), 59 deletions(-) diff --git a/npm/ng-packs/scripts/publish.ts b/npm/ng-packs/scripts/publish.ts index 9ff2057093..ecc0408f2b 100644 --- a/npm/ng-packs/scripts/publish.ts +++ b/npm/ng-packs/scripts/publish.ts @@ -11,7 +11,6 @@ program ) .option('-r, --registry ', 'target npm server registry') .option('-p, --preview', 'publishes with preview tag') - .option('-r, --rc', 'publishes with next tag') .option('-g, --skipGit', 'skips git push'); program.parse(process.argv); @@ -51,7 +50,7 @@ program.parse(process.argv); let tag: string; if (program.preview) tag = 'preview'; - else if (program.rc || semverParse(program.nextVersion).prerelease?.length) tag = 'next'; + else if (semverParse(program.nextVersion).prerelease?.length) tag = 'next'; await execa( 'yarn', diff --git a/npm/package-update-script.js b/npm/package-update-script.js index 58e24db554..8ca0180eb1 100644 --- a/npm/package-update-script.js +++ b/npm/package-update-script.js @@ -1,39 +1,39 @@ -const glob = require('glob'); -var path = require('path'); -const childProcess = require('child_process'); -const { program } = require('commander'); +const glob = require("glob"); +var path = require("path"); +const childProcess = require("child_process"); +const { program } = require("commander"); -program.version('0.0.1'); -program.option('-r, --rc', 'whether version is rc'); -program.option('-rg, --registry ', 'target npm server registry') +program.version("0.0.1"); +program.option("-r, --prerelase", "whether version is prerelase"); +program.option("-rg, --registry ", "target npm server registry"); program.parse(process.argv); -const packages = (process.argv[3] || 'abp').split(',').join('|'); +const packages = (process.argv[3] || "abp").split(",").join("|"); const check = (pkgJsonPath) => { try { return childProcess .execSync( `ncu "/^@(${packages}).*$/" --packageFile ${pkgJsonPath} -u${ - program.rc ? ' --target greatest' : '' - }${program.registry ? ` --registry ${program.registry}` : ''}` + program.prerelase ? " --target greatest" : "" + }${program.registry ? ` --registry ${program.registry}` : ""}` ) .toString(); } catch (error) { - console.log('exec error: ' + error.message); + console.log("exec error: " + error.message); process.exit(error.status); } }; -const folder = process.argv[2] || '.'; +const folder = process.argv[2] || "."; -glob(folder + '/**/package.json', {}, (er, files) => { +glob(folder + "/**/package.json", {}, (er, files) => { files.forEach((file) => { if ( - file.includes('node_modules') || - file.includes('ng-packs/dist') || - file.includes('wwwroot') || - file.includes('bin/Debug') + file.includes("node_modules") || + file.includes("ng-packs/dist") || + file.includes("wwwroot") || + file.includes("bin/Debug") ) { return; } diff --git a/npm/package.json b/npm/package.json index 724b0f7be1..6de0301e60 100644 --- a/npm/package.json +++ b/npm/package.json @@ -16,6 +16,7 @@ "dependencies": { "commander": "^6.0.0", "execa": "^3.4.0", - "fs-extra": "^8.1.0" + "fs-extra": "^8.1.0", + "semver": "^7.3.5" } } diff --git a/npm/publish-utils.js b/npm/publish-utils.js index 395045c374..ff97d3e6d9 100644 --- a/npm/publish-utils.js +++ b/npm/publish-utils.js @@ -1,22 +1,24 @@ -const { program } = require('commander'); -const fse = require('fs-extra'); +const { program } = require("commander"); +const fse = require("fs-extra"); +const semverParse = require("semver/functions/parse"); -program.version('0.0.1'); -program.option('-n, --nextVersion', 'version in common.props'); -program.option('-r, --rc', 'whether version is rc'); -program.option('-cv, --customVersion ', 'set exact version'); +program.version("0.0.1"); +program.option("-n, --nextVersion", "version in common.props"); +program.option("-pr, --prerelase", "whether version is prerelase"); +program.option("-cv, --customVersion ", "set exact version"); program.parse(process.argv); if (program.nextVersion) console.log(getVersion()); -if (program.rc) console.log(getVersion().includes('rc')); +if (program.prerelase) + console.log(!!semverParse(getVersion()).prerelease?.length); function getVersion() { if (program.customVersion) return program.customVersion; - const commonProps = fse.readFileSync('../common.props').toString(); - const versionTag = ''; - const versionEndTag = ''; + const commonProps = fse.readFileSync("../common.props").toString(); + const versionTag = ""; + const versionEndTag = ""; const first = commonProps.indexOf(versionTag) + versionTag.length; const last = commonProps.indexOf(versionEndTag); return commonProps.substring(first, last); diff --git a/npm/publish.ps1 b/npm/publish.ps1 index fddd8f2acd..e563fc1fef 100644 --- a/npm/publish.ps1 +++ b/npm/publish.ps1 @@ -3,7 +3,7 @@ param( [string]$Registry ) -npm install +yarn install $NextVersion = $(node publish-utils.js --nextVersion) $RootFolder = (Get-Item -Path "./" -Verbose).FullName @@ -21,13 +21,12 @@ $PacksPublishCommand = "npm run lerna -- exec 'npm publish --registry $Registry' $UpdateGulpCommand = "npm run update-gulp" $UpdateNgPacksCommand = "yarn update --registry $Registry" -$IsRc = $(node publish-utils.js --rc --customVersion $Version) -eq "true"; +$IsPrerelase = $(node publish-utils.js --prerelase --customVersion $Version) -eq "true"; -if ($IsRc) { - $NgPacksPublishCommand += " --rc" - $UpdateGulpCommand += " -- --rc" +if ($IsPrerelase) { + $UpdateGulpCommand += " -- --prerelase" $PacksPublishCommand = $PacksPublishCommand.Substring(0, $PacksPublishCommand.Length - 1) + " --tag next'" - $UpdateNgPacksCommand += " --rc" + $UpdateNgPacksCommand += " --prerelase" } $commands = ( @@ -36,7 +35,7 @@ $commands = ( $PacksPublishCommand, $UpdateNgPacksCommand, "cd ng-packs\scripts", - "npm install", + "yarn install", $NgPacksPublishCommand, "cd ../../", "cd scripts", diff --git a/npm/update-gulp.js b/npm/update-gulp.js index d6076978eb..d090de4dae 100644 --- a/npm/update-gulp.js +++ b/npm/update-gulp.js @@ -1,27 +1,27 @@ -const glob = require('glob'); -var path = require('path'); -const childProcess = require('child_process'); -const execa = require('execa'); -const fse = require('fs-extra'); -const { program } = require('commander'); +const glob = require("glob"); +var path = require("path"); +const childProcess = require("child_process"); +const execa = require("execa"); +const fse = require("fs-extra"); +const { program } = require("commander"); -program.version('0.0.1'); -program.option('-r, --rc', 'whether version is rc'); +program.version("0.0.1"); +program.option("-pr, --prerelase", "whether version is prerelase"); program.parse(process.argv); const gulp = (folderPath) => { if ( - !fse.existsSync(folderPath + 'gulpfile.js') || - !glob.sync(folderPath + '*.csproj').length + !fse.existsSync(folderPath + "gulpfile.js") || + !glob.sync(folderPath + "*.csproj").length ) { return; } try { - execa.sync(`yarn`, ['install'], { cwd: folderPath, stdio: 'inherit' }); - execa.sync(`yarn`, ['gulp'], { cwd: folderPath, stdio: 'inherit' }); + execa.sync(`yarn`, ["install"], { cwd: folderPath, stdio: "inherit" }); + execa.sync(`yarn`, ["gulp"], { cwd: folderPath, stdio: "inherit" }); } catch (error) { - console.log('\x1b[31m', 'Error: ' + error.message); + console.log("\x1b[31m", "Error: " + error.message); } }; @@ -30,30 +30,30 @@ const updatePackages = (pkgJsonPath) => { const result = childProcess .execSync( `ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u${ - program.rc ? ' --target greatest' : '' + program.prerelase ? " --target greatest" : "" }` ) .toString(); - console.log('\x1b[0m', result); + console.log("\x1b[0m", result); } catch (error) { - console.log('\x1b[31m', 'Error: ' + error.message); + console.log("\x1b[31m", "Error: " + error.message); } }; console.time(); -glob('../**/package.json', {}, (er, files) => { +glob("../**/package.json", {}, (er, files) => { files = files.filter( (f) => f && - !f.includes('node_modules') && - !f.includes('wwwroot') && - !f.includes('bin') && - !f.includes('obj') + !f.includes("node_modules") && + !f.includes("wwwroot") && + !f.includes("bin") && + !f.includes("obj") ); files.forEach((file) => { updatePackages(file); - gulp(file.replace('package.json', '')); + gulp(file.replace("package.json", "")); }); console.timeEnd(); }); From 1b44dfb98ade28abe12bbd248facb642d9ae2f16 Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Wed, 22 Sep 2021 08:29:42 +0300 Subject: [PATCH 4/5] format script files via prettier --- npm/package-update-script.js | 34 ++++++++++++++-------------- npm/publish-utils.js | 20 ++++++++-------- npm/update-gulp.js | 44 ++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/npm/package-update-script.js b/npm/package-update-script.js index 8ca0180eb1..27930f096c 100644 --- a/npm/package-update-script.js +++ b/npm/package-update-script.js @@ -1,39 +1,39 @@ -const glob = require("glob"); -var path = require("path"); -const childProcess = require("child_process"); -const { program } = require("commander"); +const glob = require('glob'); +var path = require('path'); +const childProcess = require('child_process'); +const { program } = require('commander'); -program.version("0.0.1"); -program.option("-r, --prerelase", "whether version is prerelase"); -program.option("-rg, --registry ", "target npm server registry"); +program.version('0.0.1'); +program.option('-pr, --prerelase', 'whether version is prerelase'); +program.option('-rg, --registry ', 'target npm server registry'); program.parse(process.argv); -const packages = (process.argv[3] || "abp").split(",").join("|"); +const packages = (process.argv[3] || 'abp').split(',').join('|'); const check = (pkgJsonPath) => { try { return childProcess .execSync( `ncu "/^@(${packages}).*$/" --packageFile ${pkgJsonPath} -u${ - program.prerelase ? " --target greatest" : "" - }${program.registry ? ` --registry ${program.registry}` : ""}` + program.prerelase ? ' --target greatest' : '' + }${program.registry ? ` --registry ${program.registry}` : ''}` ) .toString(); } catch (error) { - console.log("exec error: " + error.message); + console.log('exec error: ' + error.message); process.exit(error.status); } }; -const folder = process.argv[2] || "."; +const folder = process.argv[2] || '.'; -glob(folder + "/**/package.json", {}, (er, files) => { +glob(folder + '/**/package.json', {}, (er, files) => { files.forEach((file) => { if ( - file.includes("node_modules") || - file.includes("ng-packs/dist") || - file.includes("wwwroot") || - file.includes("bin/Debug") + file.includes('node_modules') || + file.includes('ng-packs/dist') || + file.includes('wwwroot') || + file.includes('bin/Debug') ) { return; } diff --git a/npm/publish-utils.js b/npm/publish-utils.js index ff97d3e6d9..f3fb83c155 100644 --- a/npm/publish-utils.js +++ b/npm/publish-utils.js @@ -1,11 +1,11 @@ -const { program } = require("commander"); -const fse = require("fs-extra"); -const semverParse = require("semver/functions/parse"); +const { program } = require('commander'); +const fse = require('fs-extra'); +const semverParse = require('semver/functions/parse'); -program.version("0.0.1"); -program.option("-n, --nextVersion", "version in common.props"); -program.option("-pr, --prerelase", "whether version is prerelase"); -program.option("-cv, --customVersion ", "set exact version"); +program.version('0.0.1'); +program.option('-n, --nextVersion', 'version in common.props'); +program.option('-pr, --prerelase', 'whether version is prerelase'); +program.option('-cv, --customVersion ', 'set exact version'); program.parse(process.argv); @@ -16,9 +16,9 @@ if (program.prerelase) function getVersion() { if (program.customVersion) return program.customVersion; - const commonProps = fse.readFileSync("../common.props").toString(); - const versionTag = ""; - const versionEndTag = ""; + const commonProps = fse.readFileSync('../common.props').toString(); + const versionTag = ''; + const versionEndTag = ''; const first = commonProps.indexOf(versionTag) + versionTag.length; const last = commonProps.indexOf(versionEndTag); return commonProps.substring(first, last); diff --git a/npm/update-gulp.js b/npm/update-gulp.js index d090de4dae..6f95dfb8a1 100644 --- a/npm/update-gulp.js +++ b/npm/update-gulp.js @@ -1,27 +1,27 @@ -const glob = require("glob"); -var path = require("path"); -const childProcess = require("child_process"); -const execa = require("execa"); -const fse = require("fs-extra"); -const { program } = require("commander"); +const glob = require('glob'); +var path = require('path'); +const childProcess = require('child_process'); +const execa = require('execa'); +const fse = require('fs-extra'); +const { program } = require('commander'); -program.version("0.0.1"); -program.option("-pr, --prerelase", "whether version is prerelase"); +program.version('0.0.1'); +program.option('-pr, --prerelase', 'whether version is prerelase'); program.parse(process.argv); const gulp = (folderPath) => { if ( - !fse.existsSync(folderPath + "gulpfile.js") || - !glob.sync(folderPath + "*.csproj").length + !fse.existsSync(folderPath + 'gulpfile.js') || + !glob.sync(folderPath + '*.csproj').length ) { return; } try { - execa.sync(`yarn`, ["install"], { cwd: folderPath, stdio: "inherit" }); - execa.sync(`yarn`, ["gulp"], { cwd: folderPath, stdio: "inherit" }); + execa.sync('yarn', ['install'], { cwd: folderPath, stdio: 'inherit' }); + execa.sync('yarn', ['gulp'], { cwd: folderPath, stdio: 'inherit' }); } catch (error) { - console.log("\x1b[31m", "Error: " + error.message); + console.log('\x1b[31m', 'Error: ' + error.message); } }; @@ -30,30 +30,30 @@ const updatePackages = (pkgJsonPath) => { const result = childProcess .execSync( `ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u${ - program.prerelase ? " --target greatest" : "" + program.prerelase ? ' --target greatest' : '' }` ) .toString(); - console.log("\x1b[0m", result); + console.log('\x1b[0m', result); } catch (error) { - console.log("\x1b[31m", "Error: " + error.message); + console.log('\x1b[31m', 'Error: ' + error.message); } }; console.time(); -glob("../**/package.json", {}, (er, files) => { +glob('../**/package.json', {}, (er, files) => { files = files.filter( (f) => f && - !f.includes("node_modules") && - !f.includes("wwwroot") && - !f.includes("bin") && - !f.includes("obj") + !f.includes('node_modules') && + !f.includes('wwwroot') && + !f.includes('bin') && + !f.includes('obj') ); files.forEach((file) => { updatePackages(file); - gulp(file.replace("package.json", "")); + gulp(file.replace('package.json', '')); }); console.timeEnd(); }); From 5d6b99c529f168411d0dab8188db15cd9bb9d2bb Mon Sep 17 00:00:00 2001 From: Mehmet Erim Date: Wed, 22 Sep 2021 10:21:30 +0300 Subject: [PATCH 5/5] use fast-glob instead of regular glob package --- npm/package.json | 1 + npm/update-gulp.js | 14 +++++++++----- npm/yarn.lock | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/npm/package.json b/npm/package.json index 6de0301e60..2838e8eac0 100644 --- a/npm/package.json +++ b/npm/package.json @@ -16,6 +16,7 @@ "dependencies": { "commander": "^6.0.0", "execa": "^3.4.0", + "fast-glob": "^3.2.7", "fs-extra": "^8.1.0", "semver": "^7.3.5" } diff --git a/npm/update-gulp.js b/npm/update-gulp.js index 6f95dfb8a1..678c6a043b 100644 --- a/npm/update-gulp.js +++ b/npm/update-gulp.js @@ -1,4 +1,4 @@ -const glob = require('glob'); +const glob = require('fast-glob'); var path = require('path'); const childProcess = require('child_process'); const execa = require('execa'); @@ -18,6 +18,7 @@ const gulp = (folderPath) => { } try { + fse.removeSync(`${folderPath}/wwwroot/libs`); execa.sync('yarn', ['install'], { cwd: folderPath, stdio: 'inherit' }); execa.sync('yarn', ['gulp'], { cwd: folderPath, stdio: 'inherit' }); } catch (error) { @@ -40,8 +41,9 @@ const updatePackages = (pkgJsonPath) => { } }; -console.time(); -glob('../**/package.json', {}, (er, files) => { +(async () => { + console.time(); + let files = await glob('../**/package.json'); files = files.filter( (f) => f && @@ -53,7 +55,9 @@ glob('../**/package.json', {}, (er, files) => { files.forEach((file) => { updatePackages(file); - gulp(file.replace('package.json', '')); + const folderPath = file.replace('package.json', ''); + gulp(folderPath); }); + console.timeEnd(); -}); +})(); diff --git a/npm/yarn.lock b/npm/yarn.lock index 5924e105bb..38e7e00716 100644 --- a/npm/yarn.lock +++ b/npm/yarn.lock @@ -2266,7 +2266,7 @@ fast-glob@^2.2.6: merge2 "^1.2.3" micromatch "^3.1.10" -fast-glob@^3.1.1: +fast-glob@^3.1.1, fast-glob@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==