From 9f1e2ca713ec0b2d9cacee9cc47e44e339f38fe9 Mon Sep 17 00:00:00 2001 From: Jerko Steiner Date: Tue, 1 Oct 2019 23:39:05 +0700 Subject: [PATCH] Run rondo imports package.jsons are changed because dependencies are now sorted tsconfig.jsons are changed because all referenced monorepo packages will be added as project references tsconfig.esm.jsons are changed because syncEsmConfig was run --- packages/argparse/tsconfig.json | 5 +-- packages/client/package.json | 18 ++++----- packages/client/tsconfig.esm.json | 17 ++++++++- packages/client/tsconfig.json | 41 +++++++++++++++----- packages/common/tsconfig.esm.json | 6 ++- packages/common/tsconfig.json | 5 ++- packages/config/tsconfig.json | 6 ++- packages/db-typeorm/tsconfig.json | 10 +++-- packages/db/tsconfig.json | 5 +-- packages/http-client/tsconfig.esm.json | 4 +- packages/http-client/tsconfig.json | 10 +++-- packages/http-types/tsconfig.json | 5 +-- packages/image-upload/tsconfig.json | 2 +- packages/jsonrpc/package.json | 10 ++--- packages/jsonrpc/tsconfig.json | 10 +++-- packages/logger/tsconfig.json | 5 +-- packages/middleware/tsconfig.esm.json | 5 +-- packages/middleware/tsconfig.json | 5 +-- packages/redux/package.json | 8 ++-- packages/redux/tsconfig.json | 6 ++- packages/scripts/package.json | 4 +- packages/scripts/tsconfig.json | 6 ++- packages/server/package.json | 46 +++++++++++----------- packages/server/tsconfig.esm.json | 27 +++++++------ packages/server/tsconfig.json | 53 +++++++++++++++++++------- packages/tasq/tsconfig.json | 6 ++- packages/test-utils/tsconfig.json | 5 +-- packages/validator/tsconfig.json | 5 +-- 28 files changed, 210 insertions(+), 125 deletions(-) diff --git a/packages/argparse/tsconfig.json b/packages/argparse/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/argparse/tsconfig.json +++ b/packages/argparse/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/client/package.json b/packages/client/package.json index 156560d..b85751b 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -13,21 +13,21 @@ "types": "lib/index.d.ts", "module": "esm/index.js", "dependencies": { + "@rondo.dev/common": "0.0.1", + "@rondo.dev/http-client": "0.0.1", + "@rondo.dev/http-types": "0.0.1", + "@rondo.dev/jsonrpc": "0.0.1", + "@rondo.dev/redux": "0.0.1", "bloomer": "^0.6.5", + "history": "^4.9.0", "react-icons": "^3.5.0", "react-router": "^5.0.1", - "history": "^4.9.0", - "@rondo.dev/http-client": "0.0.1", "react-router-dom": "^5.0.1", - "@rondo.dev/common": "0.0.1", - "@rondo.dev/redux": "0.0.1", - "timeago.js": "^4.0.0-beta.2", - "@rondo.dev/http-types": "0.0.1", - "@rondo.dev/jsonrpc": "0.0.1" + "timeago.js": "^4.0.0-beta.2" }, "devDependencies": { - "react-dom": "^16.8.6", + "@rondo.dev/jsonrpc": "0.0.1", "@rondo.dev/test-utils": "0.0.1", - "@rondo.dev/jsonrpc": "0.0.1" + "react-dom": "^16.8.6" } } \ No newline at end of file diff --git a/packages/client/tsconfig.esm.json b/packages/client/tsconfig.esm.json index 8139438..6de6c38 100644 --- a/packages/client/tsconfig.esm.json +++ b/packages/client/tsconfig.esm.json @@ -4,11 +4,26 @@ "outDir": "esm" }, "references": [ + { + "path": "../common/tsconfig.esm.json" + }, + { + "path": "../http-client/tsconfig.esm.json" + }, + { + "path": "../http-types/tsconfig.esm.json" + }, + { + "path": "../jsonrpc/tsconfig.esm.json" + }, { "path": "../redux/tsconfig.esm.json" }, { - "path": "../common/tsconfig.esm.json" + "path": "../jsonrpc/tsconfig.esm.json" + }, + { + "path": "../test-utils/tsconfig.esm.json" } ] } \ No newline at end of file diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json index 25e0d56..7d46711 100644 --- a/packages/client/tsconfig.json +++ b/packages/client/tsconfig.json @@ -5,14 +5,35 @@ "rootDir": "src" }, "references": [ - {"path": "../redux"}, - {"path": "../common"} + { + "path": "../common" + }, + { + "path": "../http-client" + }, + { + "path": "../http-types" + }, + { + "path": "../jsonrpc" + }, + { + "path": "../redux" + }, + { + "path": "../jsonrpc" + }, + { + "path": "../test-utils" + } ], - "plugins": [{ - "transform": "typescript-plugin-styled-components", - "type": "config", - "displayName": true, - "minify": false, - "ssr": true - }] -} + "plugins": [ + { + "transform": "typescript-plugin-styled-components", + "type": "config", + "displayName": true, + "minify": false, + "ssr": true + } + ] +} \ No newline at end of file diff --git a/packages/common/tsconfig.esm.json b/packages/common/tsconfig.esm.json index d54bfbf..b591ebe 100644 --- a/packages/common/tsconfig.esm.json +++ b/packages/common/tsconfig.esm.json @@ -3,5 +3,9 @@ "compilerOptions": { "outDir": "esm" }, - "references": [] + "references": [ + { + "path": "../jsonrpc/tsconfig.esm.json" + } + ] } \ No newline at end of file diff --git a/packages/common/tsconfig.json b/packages/common/tsconfig.json index 94e864b..ba90760 100644 --- a/packages/common/tsconfig.json +++ b/packages/common/tsconfig.json @@ -5,5 +5,8 @@ "rootDir": "src" }, "references": [ + { + "path": "../jsonrpc" + } ] -} +} \ No newline at end of file diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json index 6f79b96..45dc9b4 100644 --- a/packages/config/tsconfig.json +++ b/packages/config/tsconfig.json @@ -5,6 +5,8 @@ "rootDir": "src" }, "references": [ - {"path": "../logger"} + { + "path": "../logger" + } ] -} +} \ No newline at end of file diff --git a/packages/db-typeorm/tsconfig.json b/packages/db-typeorm/tsconfig.json index 3e564a4..98d8be7 100644 --- a/packages/db-typeorm/tsconfig.json +++ b/packages/db-typeorm/tsconfig.json @@ -5,7 +5,11 @@ "rootDir": "src" }, "references": [ - {"path": "../db"}, - {"path": "../logger"} + { + "path": "../db" + }, + { + "path": "../logger" + } ] -} +} \ No newline at end of file diff --git a/packages/db/tsconfig.json b/packages/db/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/db/tsconfig.json +++ b/packages/db/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/http-client/tsconfig.esm.json b/packages/http-client/tsconfig.esm.json index 05fb0e6..6e679fd 100644 --- a/packages/http-client/tsconfig.esm.json +++ b/packages/http-client/tsconfig.esm.json @@ -5,10 +5,10 @@ }, "references": [ { - "path": "../test-utils/tsconfig.esm.json" + "path": "../http-types/tsconfig.esm.json" }, { - "path": "../http-types/tsconfig.esm.json" + "path": "../test-utils/tsconfig.esm.json" } ] } \ No newline at end of file diff --git a/packages/http-client/tsconfig.json b/packages/http-client/tsconfig.json index 6b7bbed..32aa77b 100644 --- a/packages/http-client/tsconfig.json +++ b/packages/http-client/tsconfig.json @@ -5,7 +5,11 @@ "rootDir": "src" }, "references": [ - {"path": "../test-utils"}, - {"path": "../http-types"} + { + "path": "../http-types" + }, + { + "path": "../test-utils" + } ] -} +} \ No newline at end of file diff --git a/packages/http-types/tsconfig.json b/packages/http-types/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/http-types/tsconfig.json +++ b/packages/http-types/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/image-upload/tsconfig.json b/packages/image-upload/tsconfig.json index 3b72bf2..94bb254 100644 --- a/packages/image-upload/tsconfig.json +++ b/packages/image-upload/tsconfig.json @@ -5,4 +5,4 @@ "rootDir": "src" }, "references": [] -} +} \ No newline at end of file diff --git a/packages/jsonrpc/package.json b/packages/jsonrpc/package.json index c8b1393..b4641fc 100644 --- a/packages/jsonrpc/package.json +++ b/packages/jsonrpc/package.json @@ -9,12 +9,12 @@ "clean": "rm -rf lib/" }, "dependencies": { - "reflect-metadata": "^0.1.13", - "@rondo.dev/redux": "0.0.1", "@rondo.dev/logger": "0.0.1", + "@rondo.dev/redux": "0.0.1", + "axios": "^0.19.0", "express": "^4.17.1", - "supertest": "^4.0.2", - "axios": "^0.19.0" + "reflect-metadata": "^0.1.13", + "supertest": "^4.0.2" }, "devDependencies": { "body-parser": "^1.19.0", @@ -24,4 +24,4 @@ "main": "lib/index.js", "types": "lib/index.d.ts", "module": "esm/index.js" -} +} \ No newline at end of file diff --git a/packages/jsonrpc/tsconfig.json b/packages/jsonrpc/tsconfig.json index 28e60f3..a741bfb 100644 --- a/packages/jsonrpc/tsconfig.json +++ b/packages/jsonrpc/tsconfig.json @@ -6,7 +6,11 @@ "rootDir": "src" }, "references": [ - {"path": "../logger"}, - {"path": "../redux"} + { + "path": "../logger" + }, + { + "path": "../redux" + } ] -} +} \ No newline at end of file diff --git a/packages/logger/tsconfig.json b/packages/logger/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/logger/tsconfig.json +++ b/packages/logger/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/middleware/tsconfig.esm.json b/packages/middleware/tsconfig.esm.json index 6e2aaa7..d54bfbf 100644 --- a/packages/middleware/tsconfig.esm.json +++ b/packages/middleware/tsconfig.esm.json @@ -3,6 +3,5 @@ "compilerOptions": { "outDir": "esm" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/middleware/tsconfig.json b/packages/middleware/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/middleware/tsconfig.json +++ b/packages/middleware/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/redux/package.json b/packages/redux/package.json index fa2b530..7fa5a65 100644 --- a/packages/redux/package.json +++ b/packages/redux/package.json @@ -9,16 +9,16 @@ "clean": "rm -rf lib/" }, "dependencies": { - "redux": "^4.0.1", "deep-object-diff": "^1.1.0", - "react-redux": "^7.1.1" + "react-redux": "^7.1.1", + "redux": "^4.0.1" }, "main": "lib/index.js", "module": "esm/index.js", "types": "lib/index.d.ts", "devDependencies": { + "@rondo.dev/test-utils": "0.0.1", "react": "^16.8.6", - "react-dom": "^16.8.6", - "@rondo.dev/test-utils": "0.0.1" + "react-dom": "^16.8.6" } } \ No newline at end of file diff --git a/packages/redux/tsconfig.json b/packages/redux/tsconfig.json index 00958fd..5ac74d1 100644 --- a/packages/redux/tsconfig.json +++ b/packages/redux/tsconfig.json @@ -5,6 +5,8 @@ "rootDir": "src" }, "references": [ - {"path": "../test-utils"} + { + "path": "../test-utils" + } ] -} +} \ No newline at end of file diff --git a/packages/scripts/package.json b/packages/scripts/package.json index 563265d..36fafff 100644 --- a/packages/scripts/package.json +++ b/packages/scripts/package.json @@ -13,9 +13,9 @@ }, "dependencies": { "@rondo.dev/argparse": "0.0.1", + "browser-unpack": "^1.4.2", "rimraf": "^3.0.0", - "typescript": "^3.6.3", - "browser-unpack": "^1.4.2" + "typescript": "^3.6.3" }, "types": "lib/index.d.ts", "devDependencies": {}, diff --git a/packages/scripts/tsconfig.json b/packages/scripts/tsconfig.json index c2c0537..9d0c791 100644 --- a/packages/scripts/tsconfig.json +++ b/packages/scripts/tsconfig.json @@ -11,6 +11,8 @@ "esm" ], "references": [ - {"path": "../argparse"} + { + "path": "../argparse" + } ] -} +} \ No newline at end of file diff --git a/packages/server/package.json b/packages/server/package.json index eef9a76..369d34a 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -15,21 +15,29 @@ "typeorm": "ts-node ./node_modules/.bin/typeorm" }, "dependencies": { - "@rondo.dev/logger": "0.0.1", + "@rondo.dev/argparse": "0.0.1", + "@rondo.dev/client": "0.0.1", + "@rondo.dev/common": "0.0.1", + "@rondo.dev/config": "0.0.1", + "@rondo.dev/db": "0.0.1", "@rondo.dev/db-typeorm": "0.0.1", - "typeorm": "^0.2.19", + "@rondo.dev/http-client": "0.0.1", + "@rondo.dev/http-types": "0.0.1", + "@rondo.dev/jsonrpc": "0.0.1", + "@rondo.dev/logger": "0.0.1", + "@rondo.dev/tasq": "0.0.1", + "@rondo.dev/validator": "0.0.1", + "bcrypt": "^3.0.6", + "body-parser": "^1.19.0", + "cls-hooked": "^4.2.2", + "cookie-parser": "^1.4.4", + "csurf": "^1.10.0", + "email-validator": "^2.0.4", "express": "^4.17.1", + "express-session": "^1.16.2", + "http-errors": "^1.7.3", "passport": "^0.4.0", "passport-local": "^1.0.0", - "@rondo.dev/common": "0.0.1", - "csurf": "^1.10.0", - "@rondo.dev/validator": "0.0.1", - "shortid": "^2.2.15", - "@rondo.dev/tasq": "0.0.1", - "express-session": "^1.16.2", - "cls-hooked": "^4.2.2", - "http-errors": "^1.7.3", - "@rondo.dev/client": "0.0.1", "react": "^16.8.6", "react-dom": "^16.8.6", "react-redux": "^7.1.1", @@ -37,21 +45,13 @@ "react-router-dom": "^5.0.1", "react-ssr-prepass": "^1.0.5", "redux": "^4.0.1", + "shortid": "^2.2.15", "styled-components": "^4.4.0", - "@rondo.dev/jsonrpc": "0.0.1", - "@rondo.dev/http-types": "0.0.1", - "@rondo.dev/db": "0.0.1", - "bcrypt": "^3.0.6", - "email-validator": "^2.0.4", - "body-parser": "^1.19.0", - "cookie-parser": "^1.4.4", - "@rondo.dev/config": "0.0.1", - "@rondo.dev/argparse": "0.0.1", - "@rondo.dev/http-client": "0.0.1", - "supertest": "^4.0.2" + "supertest": "^4.0.2", + "typeorm": "^0.2.19" }, "main": "lib/index.js", "types": "lib/index.d.ts", "module": "esm/index.js", "devDependencies": {} -} +} \ No newline at end of file diff --git a/packages/server/tsconfig.esm.json b/packages/server/tsconfig.esm.json index 0e8587c..d9cdf4d 100644 --- a/packages/server/tsconfig.esm.json +++ b/packages/server/tsconfig.esm.json @@ -4,9 +4,6 @@ "outDir": "esm" }, "references": [ - { - "path": "../common/tsconfig.esm.json" - }, { "path": "../argparse/tsconfig.esm.json" }, @@ -14,16 +11,19 @@ "path": "../client/tsconfig.esm.json" }, { - "path": "../jsonrpc/tsconfig.esm.json" + "path": "../common/tsconfig.esm.json" }, { - "path": "../logger/tsconfig.esm.json" + "path": "../common/tsconfig.esm.json" }, { "path": "../config/tsconfig.esm.json" }, { - "path": "../tasq/tsconfig.esm.json" + "path": "../db/tsconfig.esm.json" + }, + { + "path": "../db-typeorm/tsconfig.esm.json" }, { "path": "../http-client/tsconfig.esm.json" @@ -31,14 +31,17 @@ { "path": "../http-types/tsconfig.esm.json" }, + { + "path": "../jsonrpc/tsconfig.esm.json" + }, + { + "path": "../logger/tsconfig.esm.json" + }, + { + "path": "../tasq/tsconfig.esm.json" + }, { "path": "../validator/tsconfig.esm.json" - }, - { - "path": "../db/tsconfig.esm.json" - }, - { - "path": "../db-typeorm/tsconfig.esm.json" } ] } \ No newline at end of file diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 610557c..e69f746 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -5,17 +5,44 @@ "rootDir": "src" }, "references": [ - {"path": "../common"}, - {"path": "../argparse"}, - {"path": "../client"}, - {"path": "../jsonrpc"}, - {"path": "../logger"}, - {"path": "../config"}, - {"path": "../tasq"}, - {"path": "../http-client"}, - {"path": "../http-types"}, - {"path": "../validator"}, - {"path": "../db"}, - {"path": "../db-typeorm"} + { + "path": "../argparse" + }, + { + "path": "../client" + }, + { + "path": "../common" + }, + { + "path": "../common" + }, + { + "path": "../config" + }, + { + "path": "../db" + }, + { + "path": "../db-typeorm" + }, + { + "path": "../http-client" + }, + { + "path": "../http-types" + }, + { + "path": "../jsonrpc" + }, + { + "path": "../logger" + }, + { + "path": "../tasq" + }, + { + "path": "../validator" + } ] -} +} \ No newline at end of file diff --git a/packages/tasq/tsconfig.json b/packages/tasq/tsconfig.json index 00958fd..5ac74d1 100644 --- a/packages/tasq/tsconfig.json +++ b/packages/tasq/tsconfig.json @@ -5,6 +5,8 @@ "rootDir": "src" }, "references": [ - {"path": "../test-utils"} + { + "path": "../test-utils" + } ] -} +} \ No newline at end of file diff --git a/packages/test-utils/tsconfig.json b/packages/test-utils/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/test-utils/tsconfig.json +++ b/packages/test-utils/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file diff --git a/packages/validator/tsconfig.json b/packages/validator/tsconfig.json index 94e864b..94bb254 100644 --- a/packages/validator/tsconfig.json +++ b/packages/validator/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "lib", "rootDir": "src" }, - "references": [ - ] -} + "references": [] +} \ No newline at end of file