Browse Source

Merge pull request #10559 from abpframework/auto-merge/rel-4-4/613

Merge branch rel-5.0 with rel-4.4
pull/10561/head
Mehmet Erim 5 years ago
committed by GitHub
parent
commit
4d077a18cb
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      npm/package-update-script.js
  2. 2
      npm/publish-utils.js
  3. 2
      npm/replace-with-tilde.js
  4. 1
      npm/scripts/package.json

4
npm/package-update-script.js

@ -1,3 +1,5 @@
const glob = require('glob'); const glob = require('glob');
var path = require('path'); var path = require('path');
const childProcess = require('child_process'); const childProcess = require('child_process');
@ -40,4 +42,4 @@ glob(folder + '/**/package.json', {}, (er, files) => {
console.log(check(file)); console.log(check(file));
}); });
}); });

2
npm/publish-utils.js

@ -22,4 +22,4 @@ function getVersion() {
const first = commonProps.indexOf(versionTag) + versionTag.length; const first = commonProps.indexOf(versionTag) + versionTag.length;
const last = commonProps.indexOf(versionEndTag); const last = commonProps.indexOf(versionEndTag);
return commonProps.substring(first, last); return commonProps.substring(first, last);
} }

2
npm/replace-with-tilde.js

@ -25,4 +25,4 @@ glob("./packs/**/package.json", {}, (er, files) => {
replace(path); replace(path);
}); });
}); });

1
npm/scripts/package.json

@ -4,7 +4,6 @@
"description": "", "description": "",
"scripts": { "scripts": {
"remove-lock-files": "ts-node -r tsconfig-paths/register remove-lock-files.ts", "remove-lock-files": "ts-node -r tsconfig-paths/register remove-lock-files.ts",
"report-npm-packages": "ts-node -r tsconfig-paths/register report-npm-packages.ts",
"validate-versions": "ts-node -r tsconfig-paths/register validate-versions.ts" "validate-versions": "ts-node -r tsconfig-paths/register validate-versions.ts"
}, },
"dependencies": { "dependencies": {

Loading…
Cancel
Save