From 6ec91963c690f7dee6bb82376657aad0d21f53a2 Mon Sep 17 00:00:00 2001 From: cudr Date: Tue, 22 Oct 2019 23:41:04 +0300 Subject: [PATCH] feat: clear depts --- .travis.yml | 5 +++-- package.json | 14 ++++++++++---- packages/example/package.json | 12 +++++++----- packages/example/tsconfig.json | 9 +++++++-- tsconfig.base.json | 5 +---- 5 files changed, 28 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index b7e788a..248f412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,11 @@ env: - workerCount=3 timeout=600000 script: - - npm run test + - yarn test install: - - npm run bootstrap + - yarn + - yarn bootstrap cache: directories: diff --git a/package.json b/package.json index 114024e..313146d 100644 --- a/package.json +++ b/package.json @@ -8,13 +8,19 @@ "dev": "concurrently \"yarn watch\" \"lerna run dev --stream\"", "build": "lerna run build --stream", "watch": "lerna run --parallel watch", + "clean:module": "lerna clean --yes", "prebuild": "rm -rf ./packages/**/lib/", - "test": "lerna run test --stream", + "test": "lerna run test --stream", "format": "prettier --write" }, - "workspaces": [ - "packages/*" - ], + "workspaces": { + "packages": [ + "packages/*" + ], + "nohoist": [ + "**/jest" + ] + }, "author": "cudr", "license": "MIT", "husky": { diff --git a/packages/example/package.json b/packages/example/package.json index d5bc7e3..e38d25c 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -5,8 +5,8 @@ "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "0.0.2", - "@slate-collaborative/client": "0.0.2", + "@slate-collaborative/backend": "^0.0.2", + "@slate-collaborative/client": "^0.0.2", "@types/faker": "^4.1.5", "@types/jest": "24.0.18", "@types/node": "12.7.5", @@ -20,14 +20,16 @@ "randomcolor": "^0.5.4", "react": "^16.9.0", "react-dom": "^16.9.0", - "react-scripts": "3.1.1", + "react-scripts": "3.1.2", "slate": "^0.47.8", "slate-react": "^0.22.8", "typescript": "3.6.3" }, "scripts": { - "start": "react-scripts start", - "dev": "concurrently \"yarn start\" \"yarn serve\"", + "start": "node server.js", + "start:cra": "react-scripts start", + "build": "react-scripts build", + "dev": "concurrently \"yarn start:cra\" \"yarn serve\"", "serve": "nodemon --watch ../backend/lib --inspect server.js" }, "eslintConfig": { diff --git a/packages/example/tsconfig.json b/packages/example/tsconfig.json index 7f81348..d107b6f 100644 --- a/packages/example/tsconfig.json +++ b/packages/example/tsconfig.json @@ -2,7 +2,6 @@ "include": [ "src/**/*" ], - "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "es5", "lib": [ @@ -23,6 +22,12 @@ "resolveJsonModule": true, "noEmit": true, "isolatedModules": true, - "skipLibCheck": true + "skipLibCheck": true, + "noImplicitAny": false, + "removeComments": true, + "noLib": false, + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "sourceMap": true } } diff --git a/tsconfig.base.json b/tsconfig.base.json index b6f1a1e..9e0c8c1 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -11,9 +11,6 @@ "experimentalDecorators": true, "target": "es5", "sourceMap": true, - "lib": ["es6", "es5"], - "paths": { - "@slate-collaborative/*": ["packages/*/src"] - } + "lib": ["es6", "es5"] } }