self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-11 18:24:43 +02:00
Code Issues Releases Activity

Plugin Repo: do not create errors.json file as errors are already logged to file

Browse Source
This commit is contained in:
Laurent Cozic 2021-01-31 22:23:39 +00:00
parent 07484de91e
commit 52c7889731
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/plugin-repo-cli/index.ts
View File

@ -7,8 +7,7 @@ import validatePluginId from '@joplin/lib/services/plugins/utils/validatePluginI
import { execCommand2, resolveRelativePathWithinDir, gitPullTry, gitRepoCleanTry, gitRepoClean } from '@joplin/tools/tool-utils.js';
import checkIfPluginCanBeAdded from './lib/checkIfPluginCanBeAdded';
import updateReadme from './lib/updateReadme';
import { ImportErrors, NpmPackage } from './lib/types';
import errorsHaveChanged from './lib/errorsHaveChanged';
import { NpmPackage } from './lib/types';
import gitCompareUrl from './lib/gitCompareUrl';
function stripOffPackageOrg(name: string): string {
@ -149,7 +148,6 @@ function chdir(path: string): string {
async function processNpmPackage(npmPackage: NpmPackage, repoDir: string) {
const tempDir = `${repoDir}/temp`;
const obsoleteManifestsPath = path.resolve(repoDir, 'obsoletes.json');
const errorsPath = path.resolve(repoDir, 'errors.json');
await fs.mkdirp(tempDir);
@ -166,9 +164,6 @@ async function processNpmPackage(npmPackage: NpmPackage, repoDir: string) {
chdir(packageTempDir);
await execCommand2('npm init --yes --loglevel silent', { quiet: true });
const errors: ImportErrors = await readJsonFile(errorsPath, {});
delete errors[npmPackage.name];
let actionType: ProcessingActionType = ProcessingActionType.Update;
let manifests: any = {};
let manifest: any = {};
@ -189,18 +184,9 @@ async function processNpmPackage(npmPackage: NpmPackage, repoDir: string) {
}
} catch (e) {
console.error(e);
errors[npmPackage.name] = e.message || '';
error = e;
}
if (Object.keys(errors).length) {
if (errorsHaveChanged(await readJsonFile(errorsPath, {}), errors)) {
await fs.writeFile(errorsPath, JSON.stringify(errors, null, '\t'), 'utf8');
}
} else {
await fs.remove(errorsPath);
}
if (!error) {
// We preserve the original manifests so that if a plugin has been removed
// from npm, we still keep it. It's also a security feature - it means that