Remove Lerna, add Turborepo

kirill-konshin · kirill-konshin · commit e586cb7246c6 · 2023-02-06T17:24:55.000-10:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -18,6 +18,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
 
       - id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
@@ -52,12 +53,12 @@ jobs:
 
       - run: echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-      - run: yarn publish:release ${TAG} --yes
+      - run: yarn publish:release
         if: ${{ env.TAG != '' && !contains(env.TAG, '/') && !contains(env.TAG, '-') }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - run: yarn publish:release ${TAG} --yes --dist-tag next
+      - run: yarn publish:release -- --tag next
         if: ${{ env.TAG != '' && !contains(env.TAG, '/') && contains(env.TAG, '-') }}
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 .idea
 .next
 .tscache
+.turbo
 .eslint
 coverage
 es6
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,8 @@
 {
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "1.0.0",
   "useWorkspaces": true,
-  "npmClient": "yarn"
+  "npmClient": "yarn",
+  "tagVersionPrefix": "",
+  "verifyAccess": false
 }
diff --git a/package.json b/package.json
@@ -6,13 +6,11 @@
   "scripts": {
     "doc": "doctoc --maxlevel 3 --notitle README.md",
     "prepare": "husky install",
-    "clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
-    "start": "yarn build && yarn start:all",
-    "start:all": "lerna run start --parallel",
-    "build": "lerna run build --stream",
-    "test": "lerna run test --stream --concurrency=1",
-    "test:quick": "lerna run test:quick --stream --concurrency=1",
-    "publish:release": "lerna publish --tag-version-prefix=\"\" --force-publish=* --no-push --no-git-tag-version",
+    "clean": "turbo run clean",
+    "start": "turbo run start",
+    "build": "turbo run build --concurrency=1",
+    "test": "turbo run test --concurrency=1",
+    "publish:release": "turbo run publish:release --concurrency=1",
     "prettier": "prettier --write --ignore-path=.eslintignore --loglevel=warn",
     "lint": "eslint --cache --cache-location node_modules/.cache/eslint --fix",
     "lint:all": "yarn lint . && yarn prettier .",
@@ -23,10 +21,10 @@
     "eslint": "8.33.0",
     "eslint-config-ringcentral-typescript": "7.0.3",
     "husky": "7.0.4",
-    "lerna": "4.0.0",
     "lint-staged": "11.1.2",
     "prettier": "2.8.3",
     "rimraf": "4.1.2",
+    "turbo": "^1.7.3",
     "typescript": "4.5.5"
   },
   "workspaces": [
diff --git a/packages/wrapper/.npmignore b/packages/wrapper/.npmignore
@@ -1,8 +1,10 @@
+.turbo
 __snapshots__
 coverage
 *.spec.ts
 *.spec.js
 jest.config.js
+next-env.d.ts
 tests
 tsconfig.json
 tsconfig.es6.json
diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next-redux-wrapper",
-  "version": "7.0.0",
+  "version": "8.0.0-rc.1",
   "description": "Redux wrapper for Next.js",
   "main": "lib/index.js",
   "module": "es6/index.js",
@@ -10,14 +10,15 @@
   "main:src": "src/index.tsx",
   "scripts": {
     "test": "jest",
-    "test:quick": "yarn test",
     "clean": "rimraf lib es6 types coverage",
     "build": "concurrently 'yarn:build:tsc:*'",
     "build:tsc:es5": "tsc",
     "build:tsc:es6": "tsc --project tsconfig.es6.json",
     "start": "concurrently 'yarn:start:tsc:*'",
     "start:tsc:es5": "yarn build:tsc:es5 --watch --preserveWatchOutput",
-    "start:tsc:es6": "yarn build:tsc:es6 --watch --preserveWatchOutput"
+    "start:tsc:es6": "yarn build:tsc:es6 --watch --preserveWatchOutput",
+    "wait": "wait-on -v es6/index.js es6/index.d.ts lib/index.js lib/index.d.ts",
+    "publish:release": "yarn wait && npm version ${TAG} && npm publish"
   },
   "devDependencies": {
     "@testing-library/react-hooks": "8.0.1",
@@ -39,7 +40,8 @@
     "redux-promise-middleware": "6.1.2",
     "rimraf": "3.0.2",
     "ts-jest": "27.0.7",
-    "typescript": "4.9.5"
+    "typescript": "4.9.5",
+    "wait-on": "7.0.1"
   },
   "peerDependencies": {
     "next": ">=9",
diff --git a/turbo.json b/turbo.json
@@ -0,0 +1,40 @@
+{
+  "$schema": "https://turbo.build/schema.json",
+  "pipeline": {
+    "start": {
+      "cache": false,
+      "persistent": true,
+      "dependsOn": [
+        "build"
+      ]
+    },
+    "build": {
+      "dependsOn": [
+        "^build"
+      ],
+      "outputs": [
+        "packages/*/lib/**",
+        "packages/*/es6/**",
+        "packages/*/.next/**"
+      ]
+    },
+    "test": {
+      "dependsOn": [
+        "build"
+      ],
+      "cache": false
+    },
+    "clean": {
+      "dependsOn": [
+        "^clean"
+      ],
+      "cache": false
+    },
+    "publish:release": {
+      "dependsOn": [
+        "build"
+      ],
+      "cache": false
+    }
+  }
+}
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 .idea
 .next
 .tscache
 +.turbo
 .eslint
 coverage
 es6
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "node_modules/lerna/schemas/lerna-schema.json",`
`2`	`3`	`"version": "1.0.0",`
`3`	`4`	`"useWorkspaces": true,`
`4`		`- "npmClient": "yarn"`
	`5`	`+ "npmClient": "yarn",`
	`6`	`+ "tagVersionPrefix": "",`
	`7`	`+ "verifyAccess": false`
`5`	`8`	`}`