Skip to content

Commit

Permalink
Update & make dependency versions consistent in packages/* (verdaccio…
Browse files Browse the repository at this point in the history
…#2393)

* docs: improve pnpm development setup info in CONTRIBUTING.md

* build: make dependency versions consistent in packages/*

Updated to latest minor/patch versions; left major version unchanged for now

Did not change react dependencies in ui-theme package

Added .project file for Eclipse IDE users

* revert: rollback @changesets dep versions & maintain kleur v3.0.3
  • Loading branch information
Justin Johansson authored Aug 30, 2021
1 parent 9805298 commit 15d5e96
Show file tree
Hide file tree
Showing 89 changed files with 990 additions and 1,169 deletions.
11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>verdaccio-dev</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
47 changes: 24 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{
"private": true,
"name": "verdaccio-dev",
"author": {
"name": "Verdaccio Maintainers",
"email": "[email protected]"
Expand All @@ -8,7 +10,6 @@
"url": "https://github.com/verdaccio/verdaccio"
},
"homepage": "https://verdaccio.org",
"private": true,
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/verdaccio"
Expand Down Expand Up @@ -43,31 +44,31 @@
"@changesets/get-dependents-graph": "^1.2.0",
"@commitlint/cli": "8.3.5",
"@commitlint/config-conventional": "8.2.0",
"@crowdin/cli": "^3.6.4",
"@crowdin/cli": "3.6.5",
"@types/async": "3.2.5",
"@types/autocannon": "4.1.0",
"@types/autosuggest-highlight": "3.1.1",
"@types/express": "4.17.6",
"@types/http-errors": "1.8.0",
"@types/jest": "^26.0.20",
"@types/jest": "27.0.1",
"@types/js-base64": "3.0.0",
"@types/lodash": "4.14.167",
"@types/lowdb": "^1.0.9",
"@types/lowdb": "1.0.11",
"@types/mime": "2.0.2",
"@types/minimatch": "3.0.3",
"@types/node": "^14.14.7",
"@types/minimatch": "3.0.5",
"@types/node": "14.6.0",
"@types/react": "17.0.15",
"@types/react-autosuggest": "10.0.1",
"@types/react-dom": "^17.0.9",
"@types/react-helmet": "^6.1.2",
"@types/react-dom": "17.0.9",
"@types/react-helmet": "6.1.2",
"@types/react-router-dom": "5.1.6",
"@types/react-virtualized": "9.21.10",
"@types/request": "2.48.5",
"@types/semver": "7.3.4",
"@types/supertest": "2.0.10",
"@types/testing-library__jest-dom": "^5.9.5",
"@types/validator": "^13.1.3",
"@types/webpack": "^4.41.26",
"@types/testing-library__jest-dom": "5.14.1",
"@types/validator": "13.6.3",
"@types/webpack": "4.41.26",
"@types/webpack-env": "1.16.0",
"@typescript-eslint/eslint-plugin": "4.28.4",
"@typescript-eslint/parser": "4.28.4",
Expand All @@ -80,12 +81,12 @@
"babel-eslint": "10.1.0",
"babel-jest": "27.0.2",
"babel-plugin-dynamic-import-node": "2.3.3",
"babel-plugin-emotion": "11.0.0",
"babel-plugin-emotion": "10.0.33",
"codecov": "3.8.1",
"concurrently": "^5.3.0",
"core-js": "^3.15.1",
"concurrently": "5.3.0",
"core-js": "3.16.3",
"cross-env": "7.0.3",
"debug": "4.3.1",
"debug": "4.3.2",
"detect-secrets": "1.0.6",
"eslint": "7.26.0",
"eslint-config-google": "0.14.0",
Expand All @@ -105,22 +106,22 @@
"in-publish": "2.0.1",
"jest": "27.0.4",
"jest-environment-jsdom": "27.0.3",
"jest-environment-jsdom-global": "^2.0.4",
"jest-environment-jsdom-global": "2.0.4",
"jest-environment-node": "27.0.3",
"jest-fetch-mock": "3.0.3",
"jest-junit": "11.0.1",
"kleur": "4.1.4",
"lint-staged": "8.2.1",
"kleur": "3.0.3",
"lint-staged": "9.5.0",
"nock": "12.0.3",
"node-fetch": "2.6.1",
"nodemon": "^2.0.7",
"nodemon": "2.0.12",
"npm-run-all": "4.1.5",
"prettier": "2.3.0",
"rimraf": "3.0.2",
"selfsigned": "1.10.8",
"supertest": "4.0.2",
"ts-node": "^9.1.1",
"typescript": "^4.2.4",
"selfsigned": "1.10.11",
"supertest": "6.1.6",
"ts-node": "10.2.1",
"typescript": "4.4.2",
"update-ts-references": "2.3.0",
"verdaccio": "5.1.0",
"verdaccio-audit": "workspace:*",
Expand Down
10 changes: 5 additions & 5 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@
"@verdaccio/tarball": "workspace:11.0.0-6-next.6",
"@verdaccio/utils": "workspace:6.0.0-6-next.5",
"cookies": "0.8.0",
"debug": "^4.3.1",
"debug": "4.3.2",
"express": "4.17.1",
"lodash": "^4.17.21",
"lodash": "4.17.21",
"mime": "2.4.4",
"semver": "7.3.2"
"semver": "7.3.5"
},
"devDependencies": {
"@verdaccio/server": "workspace:6.0.0-6-next.16",
"@verdaccio/types": "workspace:11.0.0-6-next.7",
"body-parser": "1.19.0",
"lodash": "^4.17.20",
"supertest": "next"
"lodash": "4.17.21",
"supertest": "6.1.6"
},
"funding": {
"type": "opencollective",
Expand Down
4 changes: 2 additions & 2 deletions packages/api/src/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ export function publishPackage(storage: IStorageHandler, config: Config, auth: I
req.remote_user,
`${metadataCopy.name}@${versionToPublish}`
);
} catch (error) {
} catch (error: any) {
debug(
'error on notify add a new tag %o',
`${metadataCopy.name}@${versionToPublish}`
Expand Down Expand Up @@ -319,7 +319,7 @@ export function publishPackage(storage: IStorageHandler, config: Config, auth: I
afterChange(error, API_MESSAGE.PKG_CREATED, metadata);
});
}
} catch (error) {
} catch (error: any) {
debug('error on publish, bad package format %o', packageName);
logger.error({ packageName }, 'error on publish, bad package data for @{packageName}');
return next(ErrorCode.getBadData(API_ERROR.BAD_PACKAGE_DATA));
Expand Down
6 changes: 3 additions & 3 deletions packages/api/src/v1/token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default function (
next: '', // TODO: pagination?
},
});
} catch (error) {
} catch (error: any) {
logger.error({ error: error.msg }, 'token list has failed: @{error}');
return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
}
Expand Down Expand Up @@ -116,7 +116,7 @@ export default function (
created: saveToken.created,
})
);
} catch (error) {
} catch (error: any) {
logger.error({ error: error.msg }, 'token creation has failed: @{error}');
return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
}
Expand All @@ -138,7 +138,7 @@ export default function (
await storage.deleteToken(name, tokenKey);
logger.info({ tokenKey, name }, 'token id @{tokenKey} was revoked for user @{name}');
return next({});
} catch (error) {
} catch (error: any) {
logger.error({ error: error.msg }, 'token creation has failed: @{error}');
return next(ErrorCode.getCode(HTTP_STATUS.INTERNAL_ERROR, error.message));
}
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"@verdaccio/loaders": "workspace:6.0.0-6-next.4",
"@verdaccio/logger": "workspace:6.0.0-6-next.4",
"@verdaccio/utils": "workspace:6.0.0-6-next.5",
"debug": "^4.3.1",
"debug": "4.3.2",
"express": "4.17.1",
"jsonwebtoken": "8.5.1",
"lodash": "4.17.15",
"lodash": "4.17.21",
"verdaccio-htpasswd": "workspace:11.0.0-alpha.6"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/auth/src/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class Auth implements IAuth {
let authPlugin;
try {
authPlugin = new HTPasswd(plugingConf, pluginOptions);
} catch (error) {
} catch (error: any) {
debug('error on loading auth htpasswd plugin stack: %o', error);
return [];
}
Expand Down Expand Up @@ -559,7 +559,7 @@ class Auth implements IAuth {
let credentials;
try {
credentials = verifyJWTPayload(token, this.config.secret);
} catch (err) {
} catch (err: any) {
// FIXME: intended behaviour, do we want it?
}

Expand Down
2 changes: 1 addition & 1 deletion packages/auth/src/legacy-token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function aesDecrypt(value: string, key: string): string | void {
decrypted += decipher.final(inputEncoding);
debug('token decrypted successfully');
return decrypted.toString();
} catch (_) {
} catch (_: any) {
return;
}
}
2 changes: 1 addition & 1 deletion packages/auth/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export function verifyJWTPayload(token: string, secret: string): RemoteUser {
const payload: RemoteUser = verifyPayload(token, secret);

return payload;
} catch (error) {
} catch (error: any) {
// #168 this check should be removed as soon AES encrypt is removed.
if (expireReasons.includes(error.name)) {
// it might be possible the jwt configuration is enabled and
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@
"@verdaccio/node-api": "workspace:6.0.0-6-next.17",
"@verdaccio/fastify-migration": "workspace:6.0.0-6-next.10",
"commander": "6.2.0",
"clipanion": "3.0.0-rc.11",
"clipanion": "3.0.1",
"envinfo": "7.4.0",
"kleur": "3.0.3",
"semver": "7.3.2"
"semver": "7.3.5"
},
"devDependencies": {
"ts-node": "9.1.1"
"ts-node": "10.2.1"
},
"funding": {
"type": "opencollective",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export class InitCommand extends Command {

await initServer(configParsed, this.port as string, version, name);
logger.info('server started');
} catch (err) {
} catch (err: any) {
console.error(err);
process.exit(1);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/newServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export class NewServer extends Command {
// const { version, name } = require('../../package.json');
const ser = await server({ logger, config: configParsed });
await ser.listen(4873);
} catch (err) {
} catch (err: any) {
console.error(err);
process.exit(1);
}
Expand Down
10 changes: 5 additions & 5 deletions packages/config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@
"dependencies": {
"@verdaccio/commons-api": "workspace:11.0.0-alpha.3",
"@verdaccio/utils": "workspace:6.0.0-6-next.5",
"debug": "^4.3.1",
"debug": "4.3.2",
"js-yaml": "3.14.0",
"lodash": "^4.17.21",
"lodash": "4.17.21",
"minimatch": "3.0.4",
"yup": "^0.29.3"
"yup": "0.32.9"
},
"devDependencies": {
"@types/minimatch": "3.0.3",
"@types/yup": "^0.29.9"
"@types/minimatch": "3.0.5",
"@types/yup": "0.29.13"
},
"funding": {
"type": "opencollective",
Expand Down
4 changes: 2 additions & 2 deletions packages/config/src/config-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function folderExists(path: string): boolean {
try {
const stat = fs.statSync(path);
return stat.isDirectory();
} catch (_) {
} catch (_: any) {
return false;
}
}
Expand All @@ -23,7 +23,7 @@ export function fileExists(path: string): boolean {
try {
const stat = fs.statSync(path);
return stat.isFile();
} catch (_) {
} catch (_: any) {
return false;
}
}
2 changes: 1 addition & 1 deletion packages/config/src/parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export function parseConfigFile(configPath: string): ConfigRuntime {
return Object.assign({}, jsonConfig, {
config_path: configPath,
});
} catch (e) {
} catch (e: any) {
if (e.code !== 'MODULE_NOT_FOUND') {
e.message = APP_ERROR.CONFIG_NOT_VALID;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core/commons-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"npm": ">=6"
},
"dependencies": {
"http-errors": "^1.8.0",
"http-status-codes": "^1.4.0"
"http-errors": "1.8.0",
"http-status-codes": "1.4.0"
},
"scripts": {
"clean": "rimraf ./build",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/file-locking/src/readFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function readFile(
try {
contents = JSON.parse(contents);
return resolve(contents);
} catch (err) {
} catch (err: any) {
return reject(err);
}
});
Expand Down
4 changes: 2 additions & 2 deletions packages/core/htpasswd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"unix-crypt-td-js": "1.1.4"
},
"devDependencies": {
"@types/bcryptjs": "^2.4.2",
"@types/bcryptjs": "2.4.2",
"@verdaccio/types": "workspace:11.0.0-6-next.7",
"mockdate": "^3.0.5"
"mockdate": "3.0.5"
},
"scripts": {
"clean": "rimraf ./build",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/htpasswd/src/htpasswd.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export default class HTPasswd implements IPluginAuth<HTPasswdConfig> {

try {
this._writeFile(addUserToHTPasswd(body, user, password, this.hashConfig), cb);
} catch (err) {
} catch (err: any) {
return cb(err);
}
});
Expand Down Expand Up @@ -275,7 +275,7 @@ export default class HTPasswd implements IPluginAuth<HTPasswdConfig> {
changePasswordToHTPasswd(body, user, password, newPassword, this.hashConfig),
cb
);
} catch (err) {
} catch (err: any) {
return cb(err);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/core/htpasswd/tests/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ describe('changePasswordToHTPasswd', () => {
'newPassword',
defaultHashConfig
);
} catch (error) {
} catch (error: any) {
expect(error.message).toEqual('Invalid old Password');
}
});
Expand Down
12 changes: 6 additions & 6 deletions packages/core/local-storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"@verdaccio/commons-api": "workspace:11.0.0-alpha.3",
"@verdaccio/file-locking": "workspace:11.0.0-alpha.3",
"@verdaccio/streams": "workspace:11.0.0-alpha.3",
"async": "^3.2.0",
"debug": "^4.3.1",
"lodash": "^4.17.21",
"async": "3.2.1",
"debug": "4.3.2",
"lodash": "4.17.21",
"lowdb": "1.0.0"
},
"devDependencies": {
"@types/minimatch": "^3.0.3",
"@types/minimatch": "3.0.5",
"@verdaccio/types": "workspace:11.0.0-6-next.7",
"minimatch": "^3.0.4",
"rmdir-sync": "^1.0.1"
"minimatch": "3.0.4",
"rmdir-sync": "1.0.1"
},
"scripts": {
"clean": "rimraf ./build",
Expand Down
Loading

0 comments on commit 15d5e96

Please sign in to comment.