rondomoon/rondo-framework
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix peer dep warning and sort resolved deps
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Jerko Steiner 2020-01-10 12:49:52 +01:00
parent e19a0e1c27
commit 29fcbfe30a
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package.json
View File

@ -8,30 +8,30 @@
"compile:esm": "lerna exec rondo --stream -- build --esm", "compile:esm": "lerna exec rondo --stream -- build --esm",
"test:ci": "jest --roots '<rootDir>/lib' --testRegex '\\.test\\.js$' --testTimeout 15000", "test:ci": "jest --roots '<rootDir>/lib' --testRegex '\\.test\\.js$' --testTimeout 15000",
"test": "jest", "test": "jest",
"prepublish": "npm run compile" "prepublishOnly": "npm run compile"
}, },
"dependencies": { "dependencies": {
"@rondo.dev/argparse": "file:packages/argparse", "@rondo.dev/argparse": "file:packages/argparse",
"@rondo.dev/captcha": "file:packages/captcha",
"@rondo.dev/client": "file:packages/client", "@rondo.dev/client": "file:packages/client",
"@rondo.dev/common": "file:packages/common", "@rondo.dev/common": "file:packages/common",
"@rondo.dev/config": "file:packages/config", "@rondo.dev/config": "file:packages/config",
"@rondo.dev/db": "file:packages/db",
"@rondo.dev/db-typeorm": "file:packages/db-typeorm",
"@rondo.dev/http-client": "file:packages/http-client", "@rondo.dev/http-client": "file:packages/http-client",
"@rondo.dev/http-types": "file:packages/http-types", "@rondo.dev/http-types": "file:packages/http-types",
"@rondo.dev/image-upload": "file:packages/image-upload", "@rondo.dev/image-upload": "file:packages/image-upload",
"@rondo.dev/jsonrpc": "file:packages/jsonrpc", "@rondo.dev/jsonrpc": "file:packages/jsonrpc",
"@rondo.dev/logger": "file:packages/logger", "@rondo.dev/logger": "file:packages/logger",
"@rondo.dev/middleware": "file:packages/middleware",
"@rondo.dev/react-captcha": "file:packages/react-captcha",
"@rondo.dev/react-test": "file:packages/react-test",
"@rondo.dev/redux": "file:packages/redux", "@rondo.dev/redux": "file:packages/redux",
"@rondo.dev/scripts": "file:packages/scripts", "@rondo.dev/scripts": "file:packages/scripts",
"@rondo.dev/server": "file:packages/server", "@rondo.dev/server": "file:packages/server",
"@rondo.dev/tasq": "file:packages/tasq", "@rondo.dev/tasq": "file:packages/tasq",
"@rondo.dev/test-utils": "file:packages/test-utils", "@rondo.dev/test-utils": "file:packages/test-utils",
"@rondo.dev/validator": "file:packages/validator", "@rondo.dev/validator": "file:packages/validator"
"@rondo.dev/db": "file:packages/db",
"@rondo.dev/db-typeorm": "file:packages/db-typeorm",
"@rondo.dev/middleware": "file:packages/middleware",
"@rondo.dev/captcha": "file:packages/captcha",
"@rondo.dev/react-captcha": "file:packages/react-captcha",
"@rondo.dev/react-test": "file:packages/react-test"
}, },
"devDependencies": { "devDependencies": {
"@hot-loader/react-dom": "^16.10.2", "@hot-loader/react-dom": "^16.10.2",

4
packages/client/package.json
View File

@ -3,10 +3,10 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"peerDependencies": { "peerDependencies": {
"axios": "^0.18.0", "axios": "^0.19.0",
"react": "^16.7.0", "react": "^16.7.0",
"react-dom": "^16.7.0", "react-dom": "^16.7.0",
"react-redux": "^6.0.0", "react-redux": "^7.0.0",
"redux": "^4.0.1" "redux": "^4.0.1"
}, },
"main": "lib/index.js", "main": "lib/index.js",

2
packages/scripts/src/scripts/imports.ts
View File

@ -195,7 +195,9 @@ export function imports(...argv: string[]) {
projectDir: string, projectDir: string,
) { ) {
return dependencies return dependencies
.slice()
.map(resolveModuleName) .map(resolveModuleName)
.sort()
.reduce((obj, mod) => { .reduce((obj, mod) => {
const versionString = const versionString =
(rootPackage.dependencies || {})[mod] || (rootPackage.dependencies || {})[mod] ||