Skip to content

Commit 29ac6b3

Browse files
chore(changelog): Fix changelog generator for core to work with either npm package
1 parent e88965d commit 29ac6b3

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

scripts/show_core_changelog.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
#!env node
22
"use strict";
3+
34
var gitSemverTags = require('git-semver-tags');
45
var shelljs = require('shelljs');
56
var path = require('path');
67
var fs = require('fs');
78

8-
var CORE = `core`;
9-
var CORE_PKG = `@uirouter/${CORE}`;
10-
var CORE_DIR = path.join(__dirname, "..", "..", CORE);
9+
var CORE_PKG = `@uirouter/core`;
10+
var ALT_CORE_PKG = `ui-router-core`;
11+
var CORE_DIR = path.join(__dirname, "..", "..", 'core');
1112
var SHOWCHANGELOG_SCRIPT = path.join(CORE_DIR, "scripts", "show_changelog.js");
1213

1314
var currentPackage = require('../package.json');
14-
if (!currentPackage.dependencies || !currentPackage.dependencies[CORE_PKG]) {
15+
if (!currentPackage.dependencies || (!currentPackage.dependencies[CORE_PKG] && !currentPackage[ALT_CORE_PKG])) {
1516
console.error(stringify(currentPackage.dependencies));
1617
throw new Error("No dependency on " + CORE_PKG + " found in package.json.")
1718
}
@@ -43,15 +44,19 @@ gitSemverTags(function (err, val) {
4344
if (!prevPackage.dependencies) {
4445
console.error(stringify(prevPackage));
4546
throw new Error(`previous package.json in ${val[0]} has no "dependencies" key.`);
46-
} else if (!prevPackage.dependencies[CORE_PKG]) {
47+
} else if (!prevPackage.dependencies[CORE_PKG] && !prevPackage.dependencies[ALT_CORE_PKG]) {
4748
console.error(stringify(prevPackage.dependencies));
4849
throw new Error(`previous package.json in ${val[0]} has no "dependencies['${CORE_PKG}']" key.`);
4950
}
5051

51-
fromTag = prevPackage.dependencies[CORE_PKG].replace(/[=~^]/, "");
52+
var prevDep = prevPackage.dependencies[CORE_PKG] || prevPackage.dependencies[ALT_CORE_PKG];
53+
fromTag = prevDep.replace(/[=~^]/, "");
5254
}
5355

54-
var toTag = require("../package.json").dependencies[CORE_PKG].replace(/[=~^]/g, "");
56+
let pkg = require("../package.json");
57+
let currentDep = pkg.dependencies[CORE_PKG] || pkg.dependencies[ALT_CORE_PKG];
58+
var toTag = currentDep.replace(/[=~^]/g, "");
59+
5560
shelljs.pushd(CORE_DIR);
5661
// console.log("node " + SHOWCHANGELOG_SCRIPT + " " + fromTag + " " + toTag)
5762
shelljs.config.silent = false;

0 commit comments

Comments
 (0)