Merge pull request #1 from yiminghe/pnpm

use pnpm

.github/workflows/ci.yaml

@@ -0,0 +1,48 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - uses: pnpm/action-setup@v2
+        name: Install pnpm
+        with:
+          run_install: false
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: |
+            ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - run: pnpm check
+      - run: pnpm test

.gitignore

@@ -2,17 +2,6 @@
 
 # dependencies
 /node_modules
-/.yarn/*
-!/.yarn/patches
-!/.yarn/plugins
-!/.yarn/releases
-!/.yarn/versions
-!/.yarn/sdks
-
-# Swap the comments on the following lines if you don't wish to use zero-installs
-# Documentation here: https://yarnpkg.com/features/zero-installs
-#!/.yarn/cache
-/.pnp.*
 
 
 # testing
@@ -30,8 +19,6 @@ build
 .env.production.local
 
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
 
 tmp/
 pkg/

README.md

@@ -2,7 +2,7 @@
 
 [![NPM version](https://badge.fury.io/js/ot-engine.png)](http://badge.fury.io/js/ot-engine)
 [![NPM downloads](http://img.shields.io/npm/dm/ot-engine.svg)](https://npmjs.org/package/ot-engine)
-[![Build Status](https://app.travis-ci.com/yiminghe/ot-engine.svg?branch=main)](https://app.travis-ci.com/github/yiminghe/ot-engine)
+![Build Status](https://github.com/yiminghe/ot-engine/actions/workflows/ci.yaml/badge.svg)
 
 Operational transformation engine
 
@@ -172,17 +172,16 @@ export declare class Doc<S,P,Pr> extends EventTarget<[
 ## dev
 
 ```
-yarn
-yarn run dev
+npm i [email protected] -g
+pnpm i
+pnpm dev
 ```
 
 open: http://localhost:3000/
 
 ## release workflow
 
 ```
-yarn version check -i
-yarn version apply --all
-yarn run pub
+npm run pub
 git push heroku main:master --force
 ```

examples/rich-text/package.json

@@ -10,6 +10,13 @@
   },
   "license": "MIT",
   "dependencies": {
+    "uuid":"8.x",
+
+    "qs":"6.x",
+    "@types/uuid":"8.x",
+    "@types/qs":"6.x",
+    "@types/ws":"7.x",
+    "@types/express":"4.x",
     "@teamwork/websocket-json-stream": "^2.0.0",
     "@types/node": "^12.0.0",
     "@yiminghe/react-scripts": "5.x",
@@ -36,6 +43,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "packageManager": "[email protected]"
+  }
 }

examples/tree/package.json

@@ -2,11 +2,16 @@
   "name": "tree-example",
   "private": true,
   "scripts": {
+    "dev": "run-p client server",
     "client": "react-scripts start",
     "server": "ts-node server/server.ts"
   },
   "license": "MIT",
   "dependencies": {
+    "@types/qs":"6.x",
+    "@types/ws":"7.x",
+    "@types/express":"4.x",
+    "npm-run-all": "4.x",
     "@rematch/core": "2.x",
     "@rematch/immer": "2.x",
     "@teamwork/websocket-json-stream": "^2.0.0",
@@ -23,12 +28,13 @@
     "react": "16.x",
     "react-dom": "16.x",
     "react-redux": "7.x",
-    "react-sortable-tree": "^2.8.0",
+    "react-sortable-tree": "~2.8.0",
     "reconnecting-websocket": "4.x",
     "redux": "4.x",
     "uuid": "8.x",
     "ws": "^7.2.0"
   },
+
   "devDependencies": {
     "@types/node": "^12.0.0",
     "@yiminghe/react-scripts": "5.x",
@@ -46,6 +52,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "packageManager": "[email protected]"
+  }
 }

package.json

@@ -8,24 +8,25 @@
     "type": "git",
     "url": "[email protected]:yiminghe/ot-engine.git"
   },
-  "workspaces": [
-    "packages/*",
-    "examples/*"
-  ],
+  "pnpm": {
+    "overrides": {
+      "react-dnd": "11.x"
+    }
+  },
   "scripts": {
-    "build": "cd examples/rich-text && yarn run build",
-    "dev": "cd examples/rich-text && yarn run dev",
-    "start": "cd examples/rich-text && yarn run start",
-    "pub": "yarn run sync-md && sh scripts/pub.sh",
+    "build": "cd examples/rich-text && npm run build",
+    "dev": "cd examples/rich-text && npm run dev",
+    "start": "cd examples/rich-text && npm run start",
+    "pub": "npm run sync-md && sh scripts/pub.sh",
     "test": "echo 0",
     "sync-md": "ts-node scripts/syncMd.ts",
-    "lint-fix": "yarn run lint --fix",
-    "lint": "yarn run eslint . --ext .ts",
-    "check": "yarn run lint && tsc --noEmit",
+    "lint-fix": "npm run lint --fix",
+    "lint": "eslint . --ext .ts",
+    "check": "npm run lint && tsc --noEmit",
     "prettier": "prettier --write \"{packages,scripts,examples}/**/*.{js,tsx,ts,jsx}\""
   },
   "engines": {
-    "node": "16.x"
+    "node": "18.x"
   },
   "dependencies": {
     "@babel/cli": "7.x",
@@ -49,5 +50,5 @@
     "ts-node": "^10.7.0",
     "typescript": "^4.6.2"
   },
-  "packageManager": "[email protected]"
+  "packageManager": "[email protected]"
 }

packages/client/package.json

@@ -18,7 +18,6 @@
             "--rootDir",
             "src"
           ],
-          "yarn": true,
           "tsconfig": "tsconfig.build.json"
         }
       ],
@@ -45,12 +44,11 @@
     "typescript": "^4.6.2"
   },
   "scripts": {
-    "pub": "yarn run build && cd pkg && npm publish",
+    "pub": "pnpm build && cd pkg && npm publish",
     "build": "pika-pack build"
   },
   "dependencies": {
     "ot-engine-common": "0.0.12",
     "ts-event-target": "0.1.x"
-  },
-  "packageManager": "[email protected]"
+  }
 }

packages/common/package.json

@@ -17,7 +17,6 @@
             "--rootDir",
             "src"
           ],
-          "yarn": true,
           "tsconfig": "tsconfig.build.json"
         }
       ],
@@ -44,9 +43,8 @@
     "typescript": "^4.6.2"
   },
   "scripts": {
-    "pub": "yarn run build && cd pkg && npm publish",
+    "pub": "pnpm build && cd pkg && npm publish",
     "build": "pika-pack build"
   },
-  "main": "src/index.ts",
-  "packageManager": "[email protected]"
+  "main": "src/index.ts"
 }

packages/engine/README.md

@@ -15,10 +15,9 @@ Operational transformation engine
 ## demo
 
 ```
-yarn
+pnpm
 cd examples/rich-text
-yarn server
-yarn client
+pnpm dev
 ```
 
 open: http://localhost:3000/
@@ -179,7 +178,5 @@ export declare class Doc<S,P,Pr> extends EventTarget<[
 ## release workflow
 
 ```
-yarn version check -i
-yarn version apply --all
-yarn run pub
+pnpm run pub
 ```

packages/engine/package.json

@@ -14,6 +14,5 @@
   },
   "scripts": {
     "pub": "npm publish"
-  },
-  "packageManager": "[email protected]"
+  }
 }

packages/server/package.json

@@ -18,7 +18,6 @@
             "--rootDir",
             "src"
           ],
-          "yarn": true,
           "tsconfig": "tsconfig.build.json"
         }
       ],
@@ -49,8 +48,7 @@
     "typescript": "^4.6.2"
   },
   "scripts": {
-    "pub": "yarn run build && cd pkg && npm publish",
+    "pub": "pnpm build && cd pkg && npm publish",
     "build": "pika-pack build"
-  },
-  "packageManager": "[email protected]"
+  }
 }