Merge branch 'dapr:master' into add_dapr_docs

Author: greenie-msft

README.md

@@ -41,7 +41,7 @@ spec:
 **example.ts**
 
 ```javascript
-import { DaprClient, DaprServer } from "@dapr/js-sdk";
+import { DaprClient, DaprServer } from "dapr-client";
 
 const daprHost = "127.0.0.1"; // Dapr Sidecar Host
 const daprPort = "50000"; // Dapr Sidecar Port

build-grpc.sh

@@ -79,7 +79,7 @@ generateGrpc() {
         --plugin="protoc-gen-ts=${PROTOC_GEN_TS_PATH}" \
         --plugin=protoc-gen-grpc=${PROTOC_GEN_GRPC_PATH} \
         --js_out="import_style=commonjs,binary:$PATH_PROTO" \
-        --ts_out="service=grpc-node,mode=grpc-js:$PATH_PROTO" \
+        --ts_out="grpc_js:$PATH_PROTO" \
         --grpc_out="grpc_js:$PATH_PROTO" \
         "$PATH_PROTO/$PATH_FILE"
 }

build.sh

@@ -2,11 +2,12 @@
 echo "Preparing Build"
 rm -rf build/
 mkdir build/
+
 # @todo: gRPC binding pulling and building?
 
-echo ""
-echo "Building Protobuf"
-./build-grpc.sh
+# echo ""
+# echo "Building Protobuf"
+# ./build-grpc.sh
 
 # Build Package
 echo ""

examples/grpc/hello-world-distributed/client/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-grpc-hello-world-distributed-client",
+  "name": "dapr-client-example-grpc-hello-world-distributed-client",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0"
   }
 }

examples/grpc/hello-world-distributed/client/package.json

@@ -1,4 +1,4 @@
-import { DaprClient, HttpMethod } from "@dapr/js-sdk";
+import { DaprClient, HttpMethod } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "3500";

examples/grpc/hello-world-distributed/client/src/index.ts

@@ -1,5 +1,5 @@
 {
-  "name": "@dapr/js-sdk-example-grpc-hello-world-distributed-server",
+  "name": "dapr-client-example-grpc-hello-world-distributed-server",
   "version": "1.0.0",
   "description": "An example utilizing the Dapr JS SDK",
   "main": "index.js",
@@ -20,7 +20,7 @@
     "typescript": "^4.2.4"
   },
   "dependencies": {
-    "@dapr/js-sdk": "file:../../../build",
+    "dapr-client": "file:../../../build",
     "@types/node": "^15.3.0"
   }
 }

examples/grpc/hello-world-distributed/server/package-lock.json

@@ -1,4 +1,4 @@
-import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "@dapr/js-sdk";
+import { DaprServer, HttpMethod, CommunicationProtocolEnum } from "dapr-client";
 
 const daprHost = "127.0.0.1";
 const daprPort = "50050"; // Dapr Sidecar Port of this Example Server