From 5932bc3da2dc5837d8562aa64b6d5d019377494b Mon Sep 17 00:00:00 2001 From: Thomas Osmonson Date: Fri, 28 Feb 2020 12:54:16 -0600 Subject: [PATCH 1/2] fix: adjust root dir so packages can build correctly --- packages/connect/tsconfig.json | 4 ++-- packages/ui/tsconfig.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/connect/tsconfig.json b/packages/connect/tsconfig.json index 9a965f15a01..609c47779a6 100644 --- a/packages/connect/tsconfig.json +++ b/packages/connect/tsconfig.json @@ -7,7 +7,7 @@ "importHelpers": true, "declaration": true, "sourceMap": true, - "rootDir": "./", + "rootDir": "../", "strict": true, "noImplicitAny": true, "strictNullChecks": true, @@ -27,6 +27,6 @@ }, "jsx": "react", "esModuleInterop": true, - "skipLibCheck": true, + "skipLibCheck": true } } diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json index 48559733ecd..9cd9a20e481 100755 --- a/packages/ui/tsconfig.json +++ b/packages/ui/tsconfig.json @@ -28,7 +28,7 @@ "suppressImplicitAnyIndexErrors": false, "outDir": "./dist", "baseUrl": "./", - "rootDir": "./src", + "rootDir": "../", "skipLibCheck": true, "esModuleInterop": true, "strictNullChecks": true From 78b8878b9ddedf885885eaa73c0de00f3d07e1c5 Mon Sep 17 00:00:00 2001 From: Thomas Osmonson Date: Fri, 28 Feb 2020 13:17:58 -0600 Subject: [PATCH 2/2] fix: adjust task names, add bootstrap task --- package.json | 1 + packages/app/yarn.lock | 6 +++--- packages/connect/package.json | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5bde0e3cfde..00c9d0565ef 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ }, "scripts": { "typecheck": "lerna run typecheck", + "bootstrap": "yarn lerna exec --parallel 'yarn'", "build:libs": "yarn build:ui && yarn build:keychain && yarn build:connect", "build:ui": "lerna run build --scope @blockstack/ui", "build:keychain": "lerna run build --scope @blockstack/keychain", diff --git a/packages/app/yarn.lock b/packages/app/yarn.lock index bdb1df8cd1d..312b3d707cd 100644 --- a/packages/app/yarn.lock +++ b/packages/app/yarn.lock @@ -1796,9 +1796,9 @@ integrity sha512-Exw4yUWMBXM3X+8oqzJNRqZSwUAaS4+7NdvHqQuFi/d+synz++xmX3QIf+BFqneW8N31R8Ky+sikfZUXq07ggQ== "@types/node@^12.7.12": - version "12.12.28" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz#3a2b5f8d21f96ace690a8832ae9779114612575f" - integrity sha512-g73GJYJDXgf0jqg+P9S8h2acWbDXNkoCX8DLtJVu7Fkn788pzQ/oJsrdJz/2JejRf/SjfZaAhsw+3nd1D5EWGg== + version "12.12.29" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.29.tgz#46275f028b4e463b9ac5fefc1d08bc66cc193f25" + integrity sha512-yo8Qz0ygADGFptISDj3pOC9wXfln/5pQaN/ysDIzOaAWXt73cNHmtEC8zSO2Y+kse/txmwIAJzkYZ5fooaS5DQ== "@types/node@^13.7.2": version "13.7.2" diff --git a/packages/connect/package.json b/packages/connect/package.json index 9d71c5bae39..f527dac192c 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -69,9 +69,10 @@ "access": "public" }, "scripts": { - "build": "tsdx build --format cjs,esm,umd && yarn build:web", - "build:web": "NODE_ENV=production webpack --mode=production", - "build:web:analyze": "NODE_ENV=production ANALYZE=true webpack --mode=production", + "build": "yarn build:modules && yarn build:standalone", + "build:modules": "tsdx build --format cjs,esm,umd", + "build:standalone": "NODE_ENV=production webpack --mode=production", + "build:standalone:analyze": "NODE_ENV=production ANALYZE=true webpack --mode=production", "dev": "cd test-app && yarn start", "lint": "eslint --ext .ts,.tsx ./src/ -f unix", "lint:fix": "eslint --ext .ts,.tsx ./src/ -f unix --fix",