Merge pull request #153 from mathuo/152-fix-build

chore: fix builds

.github/workflows/deploy-docs.yml

@@ -21,14 +21,15 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ hashFiles('**/package.lock') }}
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
                   restore-keys: |
                       ${{ runner.os }}-node-
 
-            - run: npm install
+            - run: yarn install
             - run: lerna bootstrap
+            - run: npm run build
               working-directory: packages/dockview
-            - run: npm build
+            - run: npm run build
               working-directory: packages/docs
             - run: npm run deploy-docs
               working-directory: packages/docs

.github/workflows/main.yml

@@ -19,14 +19,13 @@ jobs:
             - uses: actions/cache@v2
               with:
                   path: ~/.npm
-                  key: ${{ runner.os }}-node-${{ hashFiles('**/package.lock') }}
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/yarn.lock') }}
                   restore-keys: |
                       ${{ runner.os }}-node-
 
-            - run: npm install
+            - run: yarn
             - run: npm run bootstrap
-              working-directory: packages/dockview
-            - run: npm build
+            - run: npm run build
             - run: npm run test:cov
             - name: SonarCloud Scan
               uses: SonarSource/sonarcloud-github-action@master

lerna.json

@@ -2,8 +2,9 @@
   "packages": [
     "packages/*"
   ],
+  "useWorkspaces": true,
   "version": "1.5.1",
-  "npmClient": "npm",
+  "npmClient": "yarn",
   "command": {
     "publish": {
       "message": "chore(release): publish %s"

package.json

@@ -1,12 +1,20 @@
 {
   "name": "dockview-monorepo-root",
   "private": true,
+  "workspaces": [
+    "packages/*"
+  ],
+  "nohoist": [
+    "**/babel-jest",
+    "**/babel-jest/**"
+  ],
   "description": "Monorepo for https://github.com/mathuo/dockview",
   "scripts": {
     "test": "jest",
     "lint": "eslint packages/**/src/** --ext .ts,.tsx,.js,.jsx",
     "package": "node scripts/package.js",
     "package-all": "lerna run docs --scope dockview && node scripts/package.js",
+    "build": "lerna run build --scope dockview",
     "clean": "lerna run clean",
     "bootstrap": "lerna bootstrap",
     "test:cov": "jest --coverage",

packages/docs/docusaurus.config.js

@@ -48,12 +48,12 @@ const config = {
                             alias: {
                                 react: path.join(
                                     __dirname,
-                                    'node_modules',
+                                    '../../node_modules',
                                     'react'
                                 ),
                                 'react-dom': path.join(
                                     __dirname,
-                                    'node_modules',
+                                    '../../node_modules',
                                     'react-dom'
                                 ),
                             },

packages/docs/package.json

@@ -42,8 +42,10 @@
     "typescript": "^4.6.4"
   },
   "resolutions": {
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "17.0.2",
+    "react-dom": "17.0.2",
+    "@types/react": "17.0.35",
+    "@types/react-dom": "17.0.11"
   },
   "browserslist": {
     "production": [