@jayree/sfdx-plugin-manifest 3.0.1 → 3.0.3

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## [3.0.3](https://github.com/jayree/sfdx-plugin-manifest/compare/v3.0.2...v3.0.3) (2023-03-17)
+
+
+### Bug Fixes
+
+* **deps:** bump @oclif/core from 2.6.2 to 2.6.4 ([#618](https://github.com/jayree/sfdx-plugin-manifest/issues/618)) ([be7b542](https://github.com/jayree/sfdx-plugin-manifest/commit/be7b5421fe5d7e0d06f043481de17ecfaee9c70f))
+* **deps:** bump @salesforce/source-deploy-retrieve from 7.11.3 to 7.12.0 ([#616](https://github.com/jayree/sfdx-plugin-manifest/issues/616)) ([04578d9](https://github.com/jayree/sfdx-plugin-manifest/commit/04578d96c57abac31ea91f277bf7873bc6214a11))
+* **deps:** bump graceful-fs from 4.2.10 to 4.2.11 ([#620](https://github.com/jayree/sfdx-plugin-manifest/issues/620)) ([0b33da8](https://github.com/jayree/sfdx-plugin-manifest/commit/0b33da83fa59b7041e228b5e25d59cec0980985e))
+* **deps:** bump isomorphic-git from 1.21.0 to 1.22.0 ([#624](https://github.com/jayree/sfdx-plugin-manifest/issues/624)) ([c57739c](https://github.com/jayree/sfdx-plugin-manifest/commit/c57739c80a926a719c61ef9d65c7f477b2923282))
+* **deps:** bump listr2 from 5.0.7 to 5.0.8 ([#623](https://github.com/jayree/sfdx-plugin-manifest/issues/623)) ([4ae28a2](https://github.com/jayree/sfdx-plugin-manifest/commit/4ae28a29a214bd0add6fc2d55319ee380d8a8c44))
+
+## [3.0.2](https://github.com/jayree/sfdx-plugin-manifest/compare/v3.0.1...v3.0.2) (2023-03-15)
+
+
+### Bug Fixes
+
+* use new changelog ([48c4f91](https://github.com/jayree/sfdx-plugin-manifest/commit/48c4f91e096fc11407ca08180c9241caedde4afb))
+
 ## [3.0.1](https://github.com/jayree/sfdx-plugin-manifest/compare/v3.0.0...v3.0.1) (2023-03-10)
 
 

package/README.md

@@ -48,7 +48,7 @@ EXAMPLES
   $ sfdx jayree:manifest:cleanup --manifest=package.xml --file=packageignore.xml
 ```
 
-_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.1/src/commands/jayree/manifest/cleanup.ts)_
+_See code: [src/commands/jayree/manifest/cleanup.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.3/src/commands/jayree/manifest/cleanup.ts)_
 
 ### `sfdx jayree:manifest:generate`
 
@@ -84,7 +84,7 @@ EXAMPLES
   <Package xmlns='http://soap.sforce.com/2006/04/metadata'>...</Package>
 ```
 
-_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.1/src/commands/jayree/manifest/generate.ts)_
+_See code: [src/commands/jayree/manifest/generate.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.3/src/commands/jayree/manifest/generate.ts)_
 
 ### `sfdx jayree:manifest:git:diff`
 
@@ -166,7 +166,7 @@ FLAG DESCRIPTIONS
     The location can be an absolute path or relative to the current working directory.
 ```
 
-_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.1/src/commands/jayree/manifest/git/diff.ts)_
+_See code: [src/commands/jayree/manifest/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.3/src/commands/jayree/manifest/git/diff.ts)_
 
 ### `sfdx jayree:manifest:legacy:git:diff`
 
@@ -244,5 +244,5 @@ FLAG DESCRIPTIONS
     The location can be an absolute path or relative to the current working directory.
 ```
 
-_See code: [src/commands/jayree/manifest/legacy/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.1/src/commands/jayree/manifest/legacy/git/diff.ts)_
+_See code: [src/commands/jayree/manifest/legacy/git/diff.ts](https://github.com/jayree/sfdx-plugin-manifest/blob/v3.0.3/src/commands/jayree/manifest/legacy/git/diff.ts)_
 <!-- commandsstop -->

package/lib/hooks/changelog.d.ts

@@ -1,2 +1,2 @@
 import { Hook } from '@oclif/core';
-export declare const changelog: Hook<'changelog'>;
+export declare const changelog: Hook<'update'>;

package/lib/hooks/changelog.js

@@ -7,91 +7,20 @@
 /* istanbul ignore file */
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import fs from 'fs-extra';
+import printChangeLog from '@jayree/changelog';
 import Debug from 'debug';
-import TerminalRenderer from 'marked-terminal';
-import { marked } from 'marked';
-import semver from 'semver';
 // eslint-disable-next-line no-underscore-dangle
 const __filename = fileURLToPath(import.meta.url);
 // eslint-disable-next-line no-underscore-dangle
 const __dirname = dirname(__filename);
-// original from https://github.com/salesforcecli/plugin-info/blob/main/src/shared/parseReleaseNotes.ts
-const parseReleaseNotes = (notes, version, currentVersion) => {
-    let found = false;
-    let versions = [];
-    const parsed = marked.lexer(notes);
-    let tokens = [];
-    const findVersion = (desiredVersion, localVersion) => {
-        versions = [];
-        tokens = parsed.filter((token) => {
-            // TODO: Could make header depth (2) a setting in oclif.info.releasenotes
-            if (token.type === 'heading' && token.depth <= 2) {
-                const coercedVersion = semver.coerce(token.text)?.version;
-                if (coercedVersion) {
-                    // We will use this to find the closest patch if passed version is not found
-                    versions.push(coercedVersion);
-                    if (coercedVersion <= desiredVersion && coercedVersion > localVersion) {
-                        found = true;
-                        return token;
-                    }
-                }
-                found = false;
-            }
-            else if (found === true) {
-                return token;
-            }
-        });
-    };
-    findVersion(version, currentVersion);
-    if (!versions.includes(version)) {
-        const semverRange = `${semver.major(version)}.${semver.minor(version)}.x`;
-        const closestVersion = semver.maxSatisfying(versions, semverRange);
-        const warning = marked.lexer(`# ATTENTION: Version ${version} was not found. Showing notes for closest patch version ${closestVersion}.`)[0];
-        tokens.unshift(warning);
-    }
-    return tokens;
-};
 // eslint-disable-next-line @typescript-eslint/require-await
 export const changelog = async function () {
-    const debug = Debug(`${this.config.bin}:jayree-sfdx-plugin-manifest:hooks:changelog`);
-    process.once('exit', () => {
-        try {
-            const pluginRootPath = join(__dirname, '..', '..');
-            const { name, version } = fs.readJsonSync(join(pluginRootPath, 'package.json'));
-            const changelogFile = fs.readFileSync(join(pluginRootPath, 'CHANGELOG.md'), 'utf8');
-            const cacheDir = join(this.config.cacheDir, name);
-            const versionFile = join(cacheDir, 'version');
-            fs.ensureFileSync(versionFile);
-            let latestVersion;
-            try {
-                latestVersion = fs.readJSONSync(versionFile);
-            }
-            catch (error) {
-                latestVersion = { version: '0.0.0' };
-            }
-            debug({ latestVersion: latestVersion.version, version });
-            if (latestVersion.version !== version) {
-                const tokens = parseReleaseNotes(changelogFile, version, latestVersion.version);
-                if (!tokens.length) {
-                    debug(`${name} - didn't find version '${version}'.`);
-                }
-                else {
-                    marked.setOptions({
-                        renderer: new TerminalRenderer({ emoji: false }),
-                    });
-                    tokens.unshift(marked.lexer(`# Changelog for '${name}':`)[0]);
-                    this.log(marked.parser(tokens));
-                    fs.writeJsonSync(versionFile, { version });
-                }
-            }
-            else {
-                debug(`${name} - no update`);
-            }
-        }
-        catch (error) {
-            debug(error);
-        }
+    const debug = Debug([this.config.bin, '@jayree/sfdx-plugin-manifest', 'hooks', 'update'].join(':'));
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    process.once('beforeExit', async () => {
+        const changes = await printChangeLog(this.config.cacheDir, join(__dirname, '..', '..'), debug);
+        if (changes)
+            this.log(changes);
     });
 };
 //# sourceMappingURL=changelog.js.map

package/lib/hooks/changelog.js.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../src/hooks/changelog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../src/hooks/changelog.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,0BAA0B;AAC1B,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,gDAAgD;AAChD,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,gDAAgD;AAChD,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAEtC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,SAAS,GAAmB,KAAK;IAC5C,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,8BAA8B,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAEpG,kEAAkE;IAClE,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,KAAK,IAAI,EAAE;QACpC,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;QAC/F,IAAI,OAAO;YAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.1",
+  "version": "3.0.3",
   "commands": {
     "jayree:manifest:cleanup": {
       "id": "jayree:manifest:cleanup",

package/package.json

@@ -1,31 +1,29 @@
 {
   "name": "@jayree/sfdx-plugin-manifest",
   "description": "A Salesforce CLI plugin containing commands for creating manifest files from Salesforce orgs or git commits of sfdx projects.",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "author": "jayree",
   "type": "module",
   "bugs": "https://github.com/jayree/sfdx-plugin-manifest/issues",
   "dependencies": {
-    "@oclif/core": "^2.6.2",
+    "@jayree/changelog": "^1.1.0",
+    "@oclif/core": "^2.6.4",
     "@salesforce/kit": "^1.9.2",
     "@salesforce/sf-plugins-core": "^2.2.4",
-    "@salesforce/source-deploy-retrieve": "^7.11.3",
+    "@salesforce/source-deploy-retrieve": "^7.12.0",
     "@salesforce/ts-types": "^1.7.3",
     "debug": "^4.3.4",
     "fast-deep-equal": "^3.1.3",
     "fast-xml-parser": "^4.1.3",
     "fs-extra": "^11.1.0",
-    "graceful-fs": "^4.2.10",
-    "isomorphic-git": "^1.21.0",
-    "listr2": "^5.0.7",
-    "marked": "^4.2.12",
-    "marked-terminal": "^5.1.1",
-    "semver": "^7.3.8",
+    "graceful-fs": "^4.2.11",
+    "isomorphic-git": "^1.22.0",
+    "listr2": "^5.0.8",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^3.3.8",
-    "@oclif/plugin-help": "^5.2.7",
+    "@oclif/plugin-help": "^5.2.8",
     "@salesforce/dev-config": "^3.1.0",
     "@salesforce/dev-scripts": "^4.1.2",
     "@salesforce/prettier-config": "^0.0.2",
@@ -33,14 +31,11 @@
     "@types/debug": "^4.1.7",
     "@types/fs-extra": "^11.0.1",
     "@types/inquirer": "^9.0.3",
-    "@types/marked": "^4.0.8",
-    "@types/marked-terminal": "^3.1.3",
-    "@types/semver": "^7.3.13",
-    "@typescript-eslint/eslint-plugin": "^5.54.1",
-    "@typescript-eslint/parser": "^5.54.1",
+    "@typescript-eslint/eslint-plugin": "^5.55.0",
+    "@typescript-eslint/parser": "^5.55.0",
     "c8": "^7.13.0",
     "chai": "^4.3.7",
-    "eslint": "^8.35.0",
+    "eslint": "^8.36.0",
     "eslint-config-oclif": "^4.0",
     "eslint-config-prettier": "^8.7.0",
     "eslint-config-salesforce": "^1.1.1",
@@ -48,9 +43,9 @@
     "eslint-config-salesforce-typescript": "^1.1.1",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "^40.0.1",
+    "eslint-plugin-jsdoc": "^40.0.3",
     "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-sf-plugin": "^1.11.0",
+    "eslint-plugin-sf-plugin": "^1.14.0",
     "husky": "^8.0.3",
     "is-ci": "^3.0.1",
     "mocha": "^10.2.0",
@@ -60,7 +55,7 @@
     "prettier": "^2.8.4",
     "pretty-quick": "^3.1.3",
     "shx": "^0.3.4",
-    "sinon": "15.0.1",
+    "sinon": "15.0.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5",
     "wireit": "^0.9.5"