You've already forked joplin
mirror of
https://github.com/laurent22/joplin.git
synced 2025-07-16 00:14:34 +02:00
Update dependency compare-versions to v6 (#8964)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Laurent Cozic <laurent22@users.noreply.github.com>
This commit is contained in:
@ -6,7 +6,7 @@ import KvStore from '@joplin/lib/services/KvStore';
|
|||||||
import * as ArrayUtils from '@joplin/lib/ArrayUtils';
|
import * as ArrayUtils from '@joplin/lib/ArrayUtils';
|
||||||
import { CheckForUpdateOptions, extractVersionInfo, GitHubRelease } from './utils/checkForUpdatesUtils';
|
import { CheckForUpdateOptions, extractVersionInfo, GitHubRelease } from './utils/checkForUpdatesUtils';
|
||||||
const packageInfo = require('./packageInfo.js');
|
const packageInfo = require('./packageInfo.js');
|
||||||
const compareVersions = require('compare-versions');
|
import { compareVersions } from 'compare-versions';
|
||||||
|
|
||||||
const logger = Logger.create('checkForUpdates');
|
const logger = Logger.create('checkForUpdates');
|
||||||
|
|
||||||
|
@ -151,7 +151,7 @@
|
|||||||
"async-mutex": "0.4.0",
|
"async-mutex": "0.4.0",
|
||||||
"codemirror": "5.65.9",
|
"codemirror": "5.65.9",
|
||||||
"color": "3.2.1",
|
"color": "3.2.1",
|
||||||
"compare-versions": "3.6.0",
|
"compare-versions": "6.0.0",
|
||||||
"countable": "3.0.1",
|
"countable": "3.0.1",
|
||||||
"debounce": "1.2.1",
|
"debounce": "1.2.1",
|
||||||
"electron-window-state": "5.0.3",
|
"electron-window-state": "5.0.3",
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
"builtin-modules": "3.3.0",
|
"builtin-modules": "3.3.0",
|
||||||
"chokidar": "3.5.3",
|
"chokidar": "3.5.3",
|
||||||
"color": "3.2.1",
|
"color": "3.2.1",
|
||||||
"compare-versions": "3.6.0",
|
"compare-versions": "6.0.0",
|
||||||
"css": "3.0.0",
|
"css": "3.0.0",
|
||||||
"diff-match-patch": "1.0.5",
|
"diff-match-patch": "1.0.5",
|
||||||
"es6-promise-pool": "2.5.0",
|
"es6-promise-pool": "2.5.0",
|
||||||
|
@ -9,7 +9,7 @@ import Setting from '../../models/Setting';
|
|||||||
import Logger from '@joplin/utils/Logger';
|
import Logger from '@joplin/utils/Logger';
|
||||||
import RepositoryApi from './RepositoryApi';
|
import RepositoryApi from './RepositoryApi';
|
||||||
import produce from 'immer';
|
import produce from 'immer';
|
||||||
const compareVersions = require('compare-versions');
|
import { compareVersions } from 'compare-versions';
|
||||||
const uslug = require('@joplin/fork-uslug');
|
const uslug = require('@joplin/fork-uslug');
|
||||||
|
|
||||||
const logger = Logger.create('PluginService');
|
const logger = Logger.create('PluginService');
|
||||||
|
@ -2,7 +2,7 @@ import Logger from '@joplin/utils/Logger';
|
|||||||
import shim from '../../shim';
|
import shim from '../../shim';
|
||||||
import { PluginManifest } from './utils/types';
|
import { PluginManifest } from './utils/types';
|
||||||
const md5 = require('md5');
|
const md5 = require('md5');
|
||||||
const compareVersions = require('compare-versions');
|
import { compareVersions } from 'compare-versions';
|
||||||
|
|
||||||
const logger = Logger.create('RepositoryApi');
|
const logger = Logger.create('RepositoryApi');
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
"bcryptjs": "2.4.3",
|
"bcryptjs": "2.4.3",
|
||||||
"bulma": "0.9.4",
|
"bulma": "0.9.4",
|
||||||
"bulma-prefers-dark": "0.1.0-beta.1",
|
"bulma-prefers-dark": "0.1.0-beta.1",
|
||||||
"compare-versions": "3.6.0",
|
"compare-versions": "6.0.0",
|
||||||
"dayjs": "1.11.9",
|
"dayjs": "1.11.9",
|
||||||
"formidable": "3.5.1",
|
"formidable": "3.5.1",
|
||||||
"fs-extra": "11.1.1",
|
"fs-extra": "11.1.1",
|
||||||
|
@ -2,13 +2,13 @@ import { AppContext, KoaNext } from '../utils/types';
|
|||||||
import { isApiRequest } from '../utils/requestUtils';
|
import { isApiRequest } from '../utils/requestUtils';
|
||||||
import config from '../config';
|
import config from '../config';
|
||||||
import { ErrorPreconditionFailed } from '../utils/errors';
|
import { ErrorPreconditionFailed } from '../utils/errors';
|
||||||
const compareVersions = require('compare-versions');
|
import { compareVersions } from 'compare-versions';
|
||||||
|
|
||||||
export default async function(ctx: AppContext, next: KoaNext): Promise<void> {
|
export default async function(ctx: AppContext, next: KoaNext): Promise<void> {
|
||||||
if (!isApiRequest(ctx)) return next();
|
if (!isApiRequest(ctx)) return next();
|
||||||
|
|
||||||
const joplinServerVersion = config().joplinServerVersion;
|
const joplinServerVersion = config().joplinServerVersion;
|
||||||
const minVersion = ctx.headers['x-api-min-version'];
|
const minVersion = ctx.headers['x-api-min-version'] as string;
|
||||||
|
|
||||||
// For now we don't require this header to be set to keep compatibility with
|
// For now we don't require this header to be set to keep compatibility with
|
||||||
// older clients.
|
// older clients.
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// (Desktop|Mobile|Android|iOS[CLI): (New|Improved|Fixed): Some message..... (#ISSUE)
|
// (Desktop|Mobile|Android|iOS[CLI): (New|Improved|Fixed): Some message..... (#ISSUE)
|
||||||
|
|
||||||
import { execCommand, githubUsername } from './tool-utils';
|
import { execCommand, githubUsername } from './tool-utils';
|
||||||
import * as compareVersions from 'compare-versions';
|
import { compareVersions } from 'compare-versions';
|
||||||
|
|
||||||
interface LogEntry {
|
interface LogEntry {
|
||||||
message: string;
|
message: string;
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
"@joplin/lib": "~2.13",
|
"@joplin/lib": "~2.13",
|
||||||
"@joplin/renderer": "~2.13",
|
"@joplin/renderer": "~2.13",
|
||||||
"@joplin/utils": "~2.13",
|
"@joplin/utils": "~2.13",
|
||||||
"compare-versions": "3.6.0",
|
"compare-versions": "6.0.0",
|
||||||
"dayjs": "1.11.9",
|
"dayjs": "1.11.9",
|
||||||
"execa": "4.1.0",
|
"execa": "4.1.0",
|
||||||
"fs-extra": "11.1.1",
|
"fs-extra": "11.1.1",
|
||||||
|
@ -2,7 +2,7 @@ import { pathExists } from 'fs-extra';
|
|||||||
import { readFile, writeFile } from 'fs/promises';
|
import { readFile, writeFile } from 'fs/promises';
|
||||||
import { gitHubLatestReleases, gitHubLinkify } from './tool-utils';
|
import { gitHubLatestReleases, gitHubLinkify } from './tool-utils';
|
||||||
import { config, createPost, createTopic, getForumTopPostByExternalId, getTopicByExternalId, updatePost } from './utils/discourse';
|
import { config, createPost, createTopic, getForumTopPostByExternalId, getTopicByExternalId, updatePost } from './utils/discourse';
|
||||||
import * as compareVersions from 'compare-versions';
|
import { compareVersions } from 'compare-versions';
|
||||||
import dayjs = require('dayjs');
|
import dayjs = require('dayjs');
|
||||||
|
|
||||||
interface State {
|
interface State {
|
||||||
|
16
yarn.lock
16
yarn.lock
@ -4654,7 +4654,7 @@ __metadata:
|
|||||||
async-mutex: 0.4.0
|
async-mutex: 0.4.0
|
||||||
codemirror: 5.65.9
|
codemirror: 5.65.9
|
||||||
color: 3.2.1
|
color: 3.2.1
|
||||||
compare-versions: 3.6.0
|
compare-versions: 6.0.0
|
||||||
countable: 3.0.1
|
countable: 3.0.1
|
||||||
debounce: 1.2.1
|
debounce: 1.2.1
|
||||||
electron: 25.8.1
|
electron: 25.8.1
|
||||||
@ -4928,7 +4928,7 @@ __metadata:
|
|||||||
chokidar: 3.5.3
|
chokidar: 3.5.3
|
||||||
clean-html: 1.5.0
|
clean-html: 1.5.0
|
||||||
color: 3.2.1
|
color: 3.2.1
|
||||||
compare-versions: 3.6.0
|
compare-versions: 6.0.0
|
||||||
css: 3.0.0
|
css: 3.0.0
|
||||||
diff-match-patch: 1.0.5
|
diff-match-patch: 1.0.5
|
||||||
es6-promise-pool: 2.5.0
|
es6-promise-pool: 2.5.0
|
||||||
@ -5131,7 +5131,7 @@ __metadata:
|
|||||||
bcryptjs: 2.4.3
|
bcryptjs: 2.4.3
|
||||||
bulma: 0.9.4
|
bulma: 0.9.4
|
||||||
bulma-prefers-dark: 0.1.0-beta.1
|
bulma-prefers-dark: 0.1.0-beta.1
|
||||||
compare-versions: 3.6.0
|
compare-versions: 6.0.0
|
||||||
dayjs: 1.11.9
|
dayjs: 1.11.9
|
||||||
formidable: 3.5.1
|
formidable: 3.5.1
|
||||||
fs-extra: 11.1.1
|
fs-extra: 11.1.1
|
||||||
@ -5182,7 +5182,7 @@ __metadata:
|
|||||||
"@types/node": 18.17.14
|
"@types/node": 18.17.14
|
||||||
"@types/node-fetch": 2.6.4
|
"@types/node-fetch": 2.6.4
|
||||||
"@types/yargs": 17.0.24
|
"@types/yargs": 17.0.24
|
||||||
compare-versions: 3.6.0
|
compare-versions: 6.0.0
|
||||||
dayjs: 1.11.9
|
dayjs: 1.11.9
|
||||||
execa: 4.1.0
|
execa: 4.1.0
|
||||||
fs-extra: 11.1.1
|
fs-extra: 11.1.1
|
||||||
@ -12638,10 +12638,10 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"compare-versions@npm:3.6.0":
|
"compare-versions@npm:6.0.0":
|
||||||
version: 3.6.0
|
version: 6.0.0
|
||||||
resolution: "compare-versions@npm:3.6.0"
|
resolution: "compare-versions@npm:6.0.0"
|
||||||
checksum: 7492a50cdaa2c27f5254eee7c4b38856e1c164991bab3d98d7fd067fe4b570d47123ecb92523b78338be86aa221668fd3868bfe8caa5587dc3ebbe1a03d52b5d
|
checksum: bf2fa355b2139cbdb0576f2f0328c112dd3c2eb808eff8b70b808b3ed05f8a40b8317c323ff4797a6a5a7ab32d508876749584c626ee5840dc0119361afffc4d
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user