npm-update-package 0.37.0 → 0.40.0

package/README.md

@@ -27,6 +27,7 @@ Commit message template
   - `newVersion`: new package version
   - `packageName`: package name
   - `level`: semver level (major/minor/patch)
+  - `dependencyType`: dependency type (dependencies/devDependencies/peerDependencies/optionalDependencies)
 - default: `chore(deps): {{{level}}} update {{{packageName}}} to v{{{newVersion}}}`
 
 ### `--github-token`
@@ -74,6 +75,7 @@ Pull request title template
   - `newVersion`: new package version
   - `packageName`: package name
   - `level`: semver level (major/minor/patch)
+  - `dependencyType`: dependency type (dependencies/devDependencies/peerDependencies/optionalDependencies)
 - default: `chore(deps): {{{level}}} update {{{packageName}}} to v{{{newVersion}}}`
 
 ### `--reviewers`

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "npm-update-package",
-    "version": "0.37.0",
+    "version": "0.40.0",
     "description": "CLI tool for creating pull requests to update npm packages",
     "scripts": {
         "build": "tsc --project tsconfig.build.json",
@@ -36,7 +36,7 @@
         "@types/parse-github-url": "1.0.0",
         "@types/semver": "7.3.9",
         "@typescript-eslint/eslint-plugin": "5.12.1",
-        "eslint": "8.9.0",
+        "eslint": "8.10.0",
         "eslint-config-standard-with-typescript": "21.0.1",
         "eslint-plugin-import": "2.25.4",
         "eslint-plugin-jest": "26.1.1",

package/dist/src/git/CommitMessageCreator.js

@@ -11,11 +11,13 @@ class CommitMessageCreator {
         const currentVersion = outdatedPackage.currentVersion.version;
         const newVersion = outdatedPackage.newVersion.version;
         const level = outdatedPackage.level;
+        const dependencyType = outdatedPackage.dependencyType;
         return (0, mustache_1.render)(this.template, {
             packageName,
             currentVersion,
             newVersion,
-            level
+            level,
+            dependencyType
         });
     }
 }

package/dist/src/github/createGitHub.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createGitHub = void 0;
 const createOctokit_1 = require("./createOctokit");
 const GitHub_1 = require("./GitHub");
-const createGitHub = ({ repository, token }) => {
+const createGitHub = ({ host, token }) => {
     const octokit = (0, createOctokit_1.createOctokit)({
-        repository,
+        host,
         token
     });
     return new GitHub_1.GitHub(octokit);

package/dist/src/github/createOctokit.js

@@ -6,22 +6,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOctokit = void 0;
 const rest_1 = require("@octokit/rest");
 const package_json_1 = __importDefault(require("../../package.json"));
-const createOctokit = ({ repository, token }) => {
-    const { host } = repository.url;
-    const auth = `token ${token}`;
+const createOctokit = ({ host, token }) => {
     const userAgent = `${package_json_1.default.name}/${package_json_1.default.version}`;
-    if (host === 'github.com') {
+    if (token === undefined) {
         return new rest_1.Octokit({
-            auth,
             userAgent
         });
     }
-    else {
+    const auth = `token ${token}`;
+    if (host === 'github.com') {
         return new rest_1.Octokit({
             auth,
-            userAgent,
-            baseUrl: `https://${host}/api/v3`
+            userAgent
         });
     }
+    return new rest_1.Octokit({
+        auth,
+        userAgent,
+        baseUrl: `https://${host}/api/v3`
+    });
 };
 exports.createOctokit = createOctokit;

package/dist/src/github/pull-request/creator/PullRequestBodyCreator.js

@@ -21,8 +21,7 @@ class PullRequestBodyCreator {
         });
         const metadataSection = this.createMetadataSection(outdatedPackage);
         const footer = this.createFooter();
-        if (gitRepo === undefined) {
-            return `This PR updates these packages:
+        const body = `This PR updates these packages:
 
 ${outdatedPackagesTable}
 
@@ -31,11 +30,16 @@ ${metadataSection}
 
 ---
 ${footer}`;
+        if (gitRepo === undefined) {
+            return body;
         }
         const releaseNotesSection = await this.createReleaseNotesSection({
             outdatedPackage,
             gitRepo
         });
+        if (releaseNotesSection === undefined) {
+            return body;
+        }
         return `This PR updates these packages:
 
 ${outdatedPackagesTable}
@@ -59,6 +63,9 @@ ${footer}`;
             from: outdatedPackage.currentVersion,
             to: outdatedPackage.newVersion
         });
+        if (releases.length === 0) {
+            return undefined;
+        }
         const items = releases.map(release => `- [${release.tag_name}](${release.html_url})`);
         return `## Release notes
 
@@ -68,6 +75,7 @@ ${items.join('\n')}`;
         const packageName = outdatedPackage.name;
         const packageLink = `[${packageName}](https://www.npmjs.com/package/${packageName})`;
         const repositoryLink = gitRepo !== undefined ? `[${gitRepo.owner}/${gitRepo.name}](${gitRepo.url.toString()})` : '-';
+        const dependencyType = outdatedPackage.dependencyType;
         const level = outdatedPackage.level;
         const currentVersion = outdatedPackage.currentVersion.version;
         const currentVersionLink = `[\`${currentVersion}\`](https://www.npmjs.com/package/${packageName}/v/${currentVersion})`;
@@ -75,9 +83,9 @@ ${items.join('\n')}`;
         const newVersionLink = `[\`${newVersion}\`](https://www.npmjs.com/package/${packageName}/v/${newVersion})`;
         const diffLink = `[diff](https://renovatebot.com/diffs/npm/${packageName}/${currentVersion}/${newVersion})`;
         const version = `${currentVersionLink} -> ${newVersionLink} (${diffLink})`;
-        return `|Package|Repository|Level|Version|
-|---|---|---|---|
-|${packageLink}|${repositoryLink}|${level}|${version}|`;
+        return `|Package|Repository|Dependency type|Level|Version|
+|---|---|---|---|---|
+|${packageLink}|${repositoryLink}|${dependencyType}|${level}|${version}|`;
     }
     createMetadataSection(outdatedPackage) {
         const metadata = (0, metadata_1.createPullRequestMetadata)([outdatedPackage]);

package/dist/src/github/pull-request/creator/PullRequestTitleCreator.js

@@ -11,11 +11,13 @@ class PullRequestTitleCreator {
         const currentVersion = outdatedPackage.currentVersion.version;
         const newVersion = outdatedPackage.newVersion.version;
         const level = outdatedPackage.level;
+        const dependencyType = outdatedPackage.dependencyType;
         return (0, mustache_1.render)(this.template, {
             packageName,
             currentVersion,
             newVersion,
-            level
+            level,
+            dependencyType
         });
     }
 }

package/dist/src/github/releases/fetcher/ReleasesFetcher.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleasesFetcher = void 0;
 const semver_1 = require("semver");
-// TODO: Add test
 class ReleasesFetcher {
     constructor(github) {
         this.github = github;

package/dist/src/main.js

@@ -27,7 +27,7 @@ const main = async ({ options, logger }) => {
     const gitRepo = await git.getRepository();
     logger.debug(`gitRepo=${JSON.stringify(gitRepo)}`);
     const github = (0, github_1.createGitHub)({
-        repository: gitRepo,
+        host: gitRepo.url.host,
         token: options.githubToken
     });
     const githubRepo = await github.fetchRepository({
@@ -61,7 +61,10 @@ const main = async ({ options, logger }) => {
         packageManager: options.packageManager
     });
     const pullRequestTitleCreator = new github_1.PullRequestTitleCreator(options.pullRequestTitle);
-    const releasesFetcher = new github_1.ReleasesFetcher(github);
+    const githubWithoutToken = (0, github_1.createGitHub)({
+        host: 'github.com'
+    });
+    const releasesFetcher = new github_1.ReleasesFetcher(githubWithoutToken);
     const pullRequestBodyCreator = new github_1.PullRequestBodyCreator({
         releasesFetcher
     });

package/dist/src/ncu/Ncu.js

@@ -34,19 +34,46 @@ class Ncu {
         if (!(0, NcuResult_1.isNcuResult)(result)) {
             throw new Error('Failed to running ncu.');
         }
-        const currentDependencies = {
-            ...pkg.dependencies,
-            ...pkg.devDependencies,
-            ...pkg.peerDependencies,
-            ...pkg.optionalDependencies
+        const { dependencies, devDependencies, peerDependencies, optionalDependencies } = pkg;
+        const toCurrentVersionString = (packageName) => {
+            if ((dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName]) !== undefined) {
+                return dependencies[packageName];
+            }
+            else if ((devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[packageName]) !== undefined) {
+                return devDependencies[packageName];
+            }
+            else if ((peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) !== undefined) {
+                return peerDependencies[packageName];
+            }
+            else if ((optionalDependencies === null || optionalDependencies === void 0 ? void 0 : optionalDependencies[packageName]) !== undefined) {
+                return optionalDependencies[packageName];
+            }
+        };
+        const toDependencyType = (packageName) => {
+            if ((dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName]) !== undefined) {
+                return package_json_1.DependencyType.Dependencies;
+            }
+            else if ((devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[packageName]) !== undefined) {
+                return package_json_1.DependencyType.DevDependencies;
+            }
+            else if ((peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) !== undefined) {
+                return package_json_1.DependencyType.PeerDependencies;
+            }
+            else if ((optionalDependencies === null || optionalDependencies === void 0 ? void 0 : optionalDependencies[packageName]) !== undefined) {
+                return package_json_1.DependencyType.OptionalDependencies;
+            }
         };
         const resultEntries = Object.entries(result);
         const outdatedPackages = resultEntries
             .map(([name, newVersionString]) => {
-            const currentVersionString = currentDependencies[name];
+            const currentVersionString = toCurrentVersionString(name);
             if (currentVersionString === undefined) {
                 return undefined;
             }
+            const dependencyType = toDependencyType(name);
+            if (dependencyType === undefined) {
+                return undefined;
+            }
             const currentVersion = semver_1.SemVer.of(currentVersionString);
             const newVersion = semver_1.SemVer.of(newVersionString);
             const level = (0, semver_1.compareSemVers)(currentVersion, newVersion);
@@ -57,7 +84,8 @@ class Ncu {
                 name,
                 currentVersion,
                 newVersion,
-                level
+                level,
+                dependencyType
             };
             return outdatedPackage;
         })

package/dist/src/package-json/DependencyType.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isDependencyType = exports.DependencyType = void 0;
+exports.DependencyType = {
+    Dependencies: 'dependencies',
+    DevDependencies: 'devDependencies',
+    PeerDependencies: 'peerDependencies',
+    OptionalDependencies: 'optionalDependencies'
+};
+const dependencyTypes = Object.values(exports.DependencyType);
+const isDependencyType = (value) => dependencyTypes.includes(value);
+exports.isDependencyType = isDependencyType;

package/dist/src/package-json/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./DependencyType"), exports);
 __exportStar(require("./extractRepository"), exports);
 __exportStar(require("./PackageMetadata"), exports);
 __exportStar(require("./parsePackageJson"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-update-package",
-  "version": "0.37.0",
+  "version": "0.40.0",
   "description": "CLI tool for creating pull requests to update npm packages",
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
@@ -36,7 +36,7 @@
     "@types/parse-github-url": "1.0.0",
     "@types/semver": "7.3.9",
     "@typescript-eslint/eslint-plugin": "5.12.1",
-    "eslint": "8.9.0",
+    "eslint": "8.10.0",
     "eslint-config-standard-with-typescript": "21.0.1",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jest": "26.1.1",