move "all-in-one" to root folder

.github/workflows/tests.yml

@@ -27,6 +27,7 @@ jobs:
 
       - name: Update npm
         run: npm i -g npm
+        if: ${{ matrix.node-version <= 14.x }}
 
       - name: Install Packages
         run: npm ci

.npmignore

@@ -0,0 +1,9 @@
+.github/
+.vscode/
+docs/
+examples/
+packages/
+.deepsource.toml
+index.ts
+tsconfig.base.json
+tsconfig.json

examples/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "redis": "../packages/all-in-one"
+    "redis": "../"
   }
 }
 

examples/search+json.js

@@ -7,8 +7,6 @@ async function searchPlusJson() {
 
   await client.connect();
 
-  await client.flushAll();
-
   // Create an index
   await client.ft.create('users', {
     '$.name': {

package.json

@@ -1,6 +1,9 @@
 {
-  "name": "redis-monorepo",
+  "name": "redis",
-  "private": true,
+  "version": "4.0.0-rc.3",
+  "license": "MIT",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "workspaces": [
     "./packages/*"
   ],
@@ -9,11 +12,26 @@
     "build:client": "npm run build -w ./packages/client",
     "build:test-utils": "npm run build -w ./packages/test-utils",
     "build:tests-tools": "npm run build:client && npm run build:test-utils",
-    "build:modules": "find ./packages -mindepth 1 -maxdepth 1 -type d ! -name 'client' ! -name 'test-utils' ! -name 'all-in-one' -exec npm run build -w {} \\;",
+    "build:modules": "find ./packages -mindepth 1 -maxdepth 1 -type d ! -name 'client' ! -name 'test-utils' -exec npm run build -w {} \\;",
-    "build:all-in-one": "npm run build -w ./packages/all-in-one",
+    "build": "tsc",
-    "build": "npm run build:client && npm run build:test-utils && npm run build:modules && npm run build:all-in-one"
+    "build-all": "npm run build:client && npm run build:test-utils && npm run build:modules && npm run build"
+  },
+  "dependencies": {
+    "@redis/client": "^1.0.0-rc",
+    "@redis/json": "^1.0.0-rc",
+    "@redis/search": "^1.0.0-rc"
   },
   "devDependencies": {
-    "@tsconfig/node12": "^1.0.9"
+    "@tsconfig/node12": "^1.0.9",
-  }
+    "release-it": "^14.11.6",
+    "typescript": "^4.4.4"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/redis/node-redis.git"
+  },
+  "bugs": {
+    "url": "https://github.com/redis/node-redis/issues"
+  },
+  "homepage": "https://github.com/redis/node-redis"
 }

packages/all-in-one/package.json

@@ -1,27 +0,0 @@
-{
-  "name": "redis",
-  "version": "4.0.0-rc.3",
-  "license": "MIT",
-  "main": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "scripts": {
-    "build": "tsc"
-  },
-  "dependencies": {
-    "@redis/client": "^1.0.0-rc",
-    "@redis/json": "^1.0.0-rc",
-    "@redis/search": "^1.0.0-rc"
-  },
-  "devDependencies": {
-    "release-it": "^14.11.6",
-    "typescript": "^4.4.4"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/redis/node-redis.git"
-  },
-  "bugs": {
-    "url": "https://github.com/redis/node-redis/issues"
-  },
-  "homepage": "https://github.com/redis/node-redis"
-}

packages/all-in-one/tsconfig.json

@@ -1,9 +0,0 @@
-{
-    "extends": "../../tsconfig",
-    "compilerOptions": {
-      "outDir": "./dist"
-    },
-    "include": [
-      "./index.ts"
-    ]
-  }

packages/client/.npmignore

@@ -1,7 +1,6 @@
 .nyc_output/
 coverage/
 documentation/
-examples/
 lib/
 .nycrc.json
 dump.rdb

packages/client/package.json

@@ -19,18 +19,18 @@
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
     "@redis/test-utils": "*",
-    "@types/node": "^16.11.6",
+    "@types/node": "^16.11.7",
     "@types/sinon": "^10.0.6",
     "@types/yallist": "^4.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.3.1",
-    "@typescript-eslint/parser": "^5.2.0",
+    "@typescript-eslint/parser": "^5.3.1",
-    "eslint": "^8.1.0",
+    "eslint": "^8.2.0",
     "nyc": "^15.1.0",
     "release-it": "^14.11.6",
-    "sinon": "^11.1.2",
+    "sinon": "^12.0.1",
     "source-map-support": "^0.5.20",
     "ts-node": "^10.4.0",
-    "typedoc": "^0.22.7",
+    "typedoc": "^0.22.8",
     "typedoc-github-wiki-theme": "^0.6.0",
     "typedoc-plugin-markdown": "^3.11.3",
     "typescript": "^4.4.4"

packages/client/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

packages/json/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

packages/search/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

packages/test-utils/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "./dist"
   },

tsconfig.base.json

@@ -0,0 +1,15 @@
+{
+  "extends": "@tsconfig/node12/tsconfig.json",
+  "compilerOptions": {
+    "declaration": true,
+    "allowJs": true,
+    "useDefineForClassFields": true
+  },
+  "files": [
+    "./packages/client/lib/ts-declarations/cluster-key-slot.d.ts",
+    "./packages/client/lib/ts-declarations/redis-parser.d.ts"
+  ],
+  "ts-node": {
+    "files": true
+  }
+}

tsconfig.json

@@ -1,15 +1,9 @@
 {
-  "extends": "@tsconfig/node12/tsconfig",
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "declaration": true,
+    "outDir": "./dist"
-    "allowJs": true,
-    "useDefineForClassFields": true
   },
-  "files": [
+  "include": [
-    "./packages/client/lib/ts-declarations/cluster-key-slot.d.ts",
+    "./index.ts"
-    "./packages/client/lib/ts-declarations/redis-parser.d.ts"
+  ]
-  ],
-  "ts-node": {
-    "files": true
-  }
 }