diff --git a/npm/package-update-script.js b/npm/package-update-script.js index b0938d3774..c01e88d8ee 100644 --- a/npm/package-update-script.js +++ b/npm/package-update-script.js @@ -1,12 +1,10 @@ - - const glob = require('glob'); var path = require('path'); const childProcess = require('child_process'); const { program } = require('commander'); program.version('0.0.1'); -program.option('-pr, --prerelase', 'whether version is prerelase'); +program.option('-pr, --prerelease', 'whether version is prerelease'); program.option('-rg, --registry ', 'target npm server registry'); program.parse(process.argv); @@ -17,7 +15,7 @@ const check = (pkgJsonPath) => { return childProcess .execSync( `ncu "/^@(${packages}).*$/" --packageFile ${pkgJsonPath} -u${ - program.prerelase ? ' --target newest' : '' + program.prerelease ? ' --target newest' : '' }${program.registry ? ` --registry ${program.registry}` : ''}` ) .toString(); @@ -42,4 +40,4 @@ glob(folder + '/**/package.json', {}, (er, files) => { console.log(check(file)); }); -}); \ No newline at end of file +}); diff --git a/npm/package.json b/npm/package.json index 2838e8eac0..d95fd400cf 100644 --- a/npm/package.json +++ b/npm/package.json @@ -5,7 +5,7 @@ "ncu": "ncu", "update-gulp": "node update-gulp.js", "replace-with-tilde": "node replace-with-tilde.js", - "update": "node package-update-script.js . abp" + "update": "node package-update-script.js" }, "devDependencies": { "@types/fs-extra": "^8.0.1", diff --git a/npm/publish-mvc.ps1 b/npm/publish-mvc.ps1 index 6fbeaf50c5..20e53d3fcc 100644 --- a/npm/publish-mvc.ps1 +++ b/npm/publish-mvc.ps1 @@ -18,7 +18,7 @@ if (-Not $Registry) { $PacksPublishCommand = "npm run lerna -- exec 'npm publish --registry $Registry'" -$IsPrerelase = $(node publish-utils.js --prerelase --customVersion $Version) -eq "true"; +$IsPrerelase = $(node publish-utils.js --prerelease --customVersion $Version) -eq "true"; if ($IsPrerelase) { $PacksPublishCommand = $PacksPublishCommand.Substring(0, $PacksPublishCommand.Length - 1) + " --tag next'" diff --git a/npm/publish-ng.ps1 b/npm/publish-ng.ps1 index 0ca666ae68..5d39f5ba53 100644 --- a/npm/publish-ng.ps1 +++ b/npm/publish-ng.ps1 @@ -17,14 +17,14 @@ if (-Not $Registry) { } $NgPacksPublishCommand = "npm run publish-packages -- --nextVersion $Version --skipGit --registry $Registry" -$UpdateGulpCommand = "npm run update-gulp" -$UpdateNgPacksCommand = "yarn update --registry $Registry" +$UpdateGulpCommand = "yarn update-gulp --registry $Registry" +$UpdateNgPacksCommand = "yarn update ./ng-packs abp --registry $Registry" -$IsPrerelase = $(node publish-utils.js --prerelase --customVersion $Version) -eq "true"; +$IsPrerelase = $(node publish-utils.js --prerelease --customVersion $Version) -eq "true"; if ($IsPrerelase) { - $UpdateGulpCommand += " -- --prerelase" - $UpdateNgPacksCommand += " --prerelase" + $UpdateGulpCommand += " --prerelease" + $UpdateNgPacksCommand += " --prerelease" } $commands = ( diff --git a/npm/publish-utils.js b/npm/publish-utils.js index a88f3ed238..d59f10a661 100644 --- a/npm/publish-utils.js +++ b/npm/publish-utils.js @@ -4,14 +4,14 @@ 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('-pr, --prerelease', 'whether version is prerelease'); program.option('-cv, --customVersion ', 'set exact version'); program.parse(process.argv); if (program.nextVersion) console.log(getVersion()); -if (program.prerelase) +if (program.prerelease) console.log(!!semverParse(getVersion()).prerelease?.length); function getVersion() { @@ -22,4 +22,4 @@ function getVersion() { const first = commonProps.indexOf(versionTag) + versionTag.length; const last = commonProps.indexOf(versionEndTag); return commonProps.substring(first, last); -} \ No newline at end of file +} diff --git a/npm/update-gulp.js b/npm/update-gulp.js index d9a7c469aa..0788e5bb13 100644 --- a/npm/update-gulp.js +++ b/npm/update-gulp.js @@ -6,7 +6,12 @@ const fse = require('fs-extra'); const { program } = require('commander'); program.version('0.0.1'); -program.option('-pr, --prerelase', 'whether version is prerelase'); +program.option('-pr, --prerelease', 'whether version is prerelease'); +program.option( + '-rg, --registry ', + 'NPM server registry', + 'https://registry.npmjs.org' +); program.parse(process.argv); const gulp = (folderPath) => { @@ -31,8 +36,8 @@ const updatePackages = (pkgJsonPath) => { const result = childProcess .execSync( `ncu "/^@abp.*$/" --packageFile ${pkgJsonPath} -u${ - program.prerelase ? ' --target newest' : '' - }` + program.prerelease ? ' --target newest' : '' + } --registry ${program.registry}` ) .toString(); console.log('\x1b[0m', result); diff --git a/npm/yarn.lock b/npm/yarn.lock index f7890cb73d..38e7e00716 100644 --- a/npm/yarn.lock +++ b/npm/yarn.lock @@ -76,11 +76,6 @@ unique-filename "^1.1.1" which "^1.3.1" -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== - "@lerna/add@3.18.4": version "3.18.4" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.18.4.tgz#0d97c75b64febc10a9a38546a3019f0f2c24b0e6" diff --git a/templates/app/angular/src/environments/environment.ts b/templates/app/angular/src/environments/environment.ts index 9f8c94036c..96f84eea43 100644 --- a/templates/app/angular/src/environments/environment.ts +++ b/templates/app/angular/src/environments/environment.ts @@ -14,8 +14,8 @@ export const environment = { redirectUri: baseUrl, clientId: 'MyProjectName_App', responseType: 'code', - scope: 'offline_access openid profile role email phone MyProjectName', - requireHttps: true + scope: 'offline_access MyProjectName', + requireHttps: true, }, apis: { default: {