Merge branch 'dapr:main' into master

Author: XavierGeerinck

.github/holopin.yml

@@ -0,0 +1,6 @@
+organization: dapr
+defaultSticker: clrqfdv4x24910fl5n4iwu5oa
+stickers:
+  -
+    id: clrqfdv4x24910fl5n4iwu5oa
+    alias: sdk-badge

.github/scripts/dapr_bot.js

@@ -26,6 +26,7 @@ const owners = [
   "XavierGeerinck",
   "amulyavarote",
   "shubham1172",
+  "whitwaldo"
 ];
 
 /**

.github/workflows/build.yml

@@ -26,23 +26,25 @@ on:
   # Manual trigger
   workflow_dispatch: {}
 
+env:
+  NODE_VER: 16.14.0
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: production
-    env:
-      NODE_VER: 16.14.0
+    strategy:
+      fail-fast: false
+      matrix:
+        node_version: [16.14.0]
     steps:
       - uses: actions/checkout@v3
 
-      # Setup .npmrc file to publish to npm
-      - name: Configure .npmrc for NPM publish to @dapr
+      - name: Setup Node ${{ matrix.node_version }}
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.NODE_VER }}
-          registry-url: "https://registry.npmjs.org"
+          node-version: ${{ matrix.node_version }}
 
-      - name: Build Package
+      - name: Build package (install dependencies, lint, prettier, build)
         run: npm run build
 
       # @TODO: add a depend on the test-e2e pipeline?
@@ -53,28 +55,85 @@ jobs:
       - name: Upload test coverage
         uses: codecov/codecov-action@v1
 
-      - name: Is Release?
-        if: startswith(github.ref, 'refs/tags/v')
-        run: echo "DEPLOY_PACKAGE=true" >> $GITHUB_ENV
+  publish:
+    needs: build
+    if: startswith(github.ref, 'refs/tags/v')
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node ${{ env.NODE_VER }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VER }}
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build package
+        run: npm run build-ci
 
-      # note: package.json gets updated here for the new package name
       - name: Publish to npm (@dapr/dapr)
-        if: env.DEPLOY_PACKAGE == 'true'
         run: npm publish build/ --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      # dapr-client is deprecated, but we still want to publish it for a while.
       - name: "[dapr-client] Configure to publish to dapr-client for deprecation notice reasons"
-        if: env.DEPLOY_PACKAGE == 'true'
-        run: sed -i s#"@dapr/dapr"#"dapr-client"# package.json
+        run: |
+          sed -i s#"@dapr/dapr"#"dapr-client"# package.json
+          echo "This has been deprecated and will not be updated anymore, please use https://www.npmjs.com/package/@dapr/dapr" > README.md
+
+      - name: "[dapr-client] Install dependencies"
+        run: npm install
 
       - name: "[dapr-client] Build Package"
-        if: env.DEPLOY_PACKAGE == 'true'
-        run: npm run build
+        run: npm run build-ci
 
-      # note: package.json gets updated here for the new package name
       - name: "[dapr-client] Publish to npm (dapr-client)"
-        if: env.DEPLOY_PACKAGE == 'true'
+        run: npm publish build/ --access public
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
+  publish-dev:
+    needs: build
+    if: startsWith(github.ref, 'refs/heads/main')
+    runs-on: ubuntu-latest
+    environment: development
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Node ${{ env.NODE_VER }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VER }}
+          registry-url: "https://registry.npmjs.org"
+
+      - name: Configure package name
+        run: |
+          sed -i s#"@dapr/dapr"#"@dapr/dapr-dev"# package.json
+          cat <(echo "WARNING: This is a development version of the SDK. It is not recommended to use this version in production.\n") README.md > README.md.tmp
+          mv README.md.tmp README.md
+
+      - name: Configure version
+        run: |
+          # Version should be in the format of <version>-<timestamp>-<commit-hash>
+          # e.g. 1.0.0-20220101000000-abcdef
+          VERSION=$(npm version | grep '@dapr/dapr' | awk -F':' '{print $2}' | tr -d "[:space:],'")
+          TIMESTAMP=$(date -u +"%Y%m%d%H%M%S")
+          COMMIT_HASH=$(git rev-parse --short HEAD)
+
+          sed -i s#"\"version\": \"$VERSION\""#"\"version\": \"$VERSION-$TIMESTAMP-$COMMIT_HASH\""# package.json
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Build package
+        run: npm run build-ci
+
+      - name: Publish to npm (@dapr/dapr-dev)
         run: npm publish build/ --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/dapr-bot-schedule.yml

@@ -34,9 +34,9 @@ jobs:
   test-e2e:
     runs-on: ubuntu-latest
     env:
-      GOVER: 1.19
-      DAPR_CLI_VER: 1.10.0
-      DAPR_RUNTIME_VER: 1.10.0
+      GOVER: 1.22
+      DAPR_CLI_VER: 1.15.0
+      DAPR_RUNTIME_VER: 1.15.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/master/install/install.sh
       DAPR_CLI_REF: ""
       DAPR_REF: ""

.github/workflows/test-e2e.yml

@@ -1,5 +1,5 @@
 ### vscode ###
-.vscode/*
+.vscode
 !.vscode/settings.json
 !.vscode/tasks.json
 !.vscode/launch.json
@@ -144,4 +144,13 @@ temp/
 build/
 
 # version file is auto-generated
-src/version.ts
+src/version.ts
+
+# OSX
+/.DS_Store
+
+# JetBrains
+/.idea
+
+# PNPM
+pnpm-lock.yaml

.gitignore

@@ -1,53 +1,25 @@
-<p align="center">
-  <a href="https://dapr.io">
-    <img src="https://dapr.io/images/dapr.svg" height="128">
-    <h1 align="center">Dapr</h1>
-  </a>
-</p>
-
-<p align="center">
-  <a aria-label="NPM version" href="https://www.npmjs.com/package/@dapr/dapr">
-    <img alt="" src="https://img.shields.io/npm/v/@dapr/dapr?style=for-the-badge&labelColor=000000">
-  </a>
-  <a aria-label="License" href="https://github.com/dapr/js-sdk/blob/main/LICENSE">
-    <img alt="" src="https://img.shields.io/badge/License-Apache_2.0-blue.svg?style=for-the-badge&labelColor=000000">
-  </a>
-  <a aria-label="Join the community on Discord" href="https://discord.com/invite/ptHhX6jc34">
-    <img alt="" src="https://img.shields.io/badge/Join%20the%20community-blueviolet.svg?style=for-the-badge&logo=Discord&labelColor=000000&logoWidth=20&logoColor=FFFFFF">
-  </a>
-</p>
+# Dapr SDK for JavaScript
+
+[![NPM Version](https://img.shields.io/npm/v/%40dapr%2Fdapr?style=flat&logo=npm&label=Latest%20version)](https://www.npmjs.com/package/@dapr/dapr) [![NPM Downloads](https://img.shields.io/npm/dy/%40dapr%2Fdapr?style=flat&logo=npm&label=Downloads)](https://www.npmjs.com/package/@dapr/dapr) [![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/dapr/js-sdk/.github%2Fworkflows%2Fbuild.yml?branch=main&label=Build&logo=github)](https://github.com/dapr/js-sdk/actions/workflows/build.yml) [![codecov](https://codecov.io/gh/dapr/js-sdk/branch/main/graph/badge.svg)](https://codecov.io/gh/dapr/js-sdk) [![GitHub License](https://img.shields.io/github/license/dapr/js-sdk?style=flat&label=License&logo=github)](https://github.com/dapr/js-sdk/blob/main/LICENSE) [![GitHub issue custom search in repo](https://img.shields.io/github/issues-search/dapr/js-sdk?query=type%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22&label=Good%20first%20issues&style=flat&logo=github)](https://github.com/dapr/js-sdk/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) [![Discord](https://img.shields.io/discord/778680217417809931?label=Discord&style=flat&logo=discord)](http://bit.ly/dapr-discord) [![YouTube Channel Views](https://img.shields.io/youtube/channel/views/UCtpSQ9BLB_3EXdWAUQYwnRA?style=flat&label=YouTube%20views&logo=youtube)](https://youtube.com/@daprdev) [![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/daprdev?logo=x&style=flat)](https://twitter.com/daprdev)
 
 ## Getting Started
 
-Instantly get started by installing the Dapr JS SDK and reading the [getting started documentation](https://docs.dapr.io/developing-applications/sdks/js) or [follow one of the quickstarts](https://github.com/dapr/quickstarts)
+Instantly get started by installing the Dapr JS SDK and reading the [getting started documentation](https://docs.dapr.io/developing-applications/sdks/js/) or [follow one of the quickstarts](https://github.com/dapr/quickstarts)
 
 ```
 npm install --save @dapr/dapr
 ```
 
-> ⚠️ the [`dapr-client`](https://www.npmjs.com/package/dapr-client) package has been deprecated. Please see https://github.com/dapr/js-sdk/issues/259 for more information.
+You can also use the development version of the SDK which is built from the `main` branch. Make sure to remove the `@dapr/dapr` package first. This package is not meant for production use, and should only be used for development purposes.
+
+```
+npm install --save @dapr/dapr-dev
+```
 
 ## Documentation
 
 Visit [https://docs.dapr.io/developing-applications/sdks/js/](https://docs.dapr.io/developing-applications/sdks/js/) to view the full documentation.
 
-## Who is using Dapr?
-
-Dapr is used by the world's leading companies.
-
-<div align="center">               
-    <img src="https://dapr.io/images/bosch.png" width="100px">      
-    <img src="https://dapr.io/images/zeiss.png" width="100px">        
-    <img src="https://dapr.io/images/alibaba.png" width="100px">       
-    <img src="https://dapr.io/images/ignition-group.png" width="100px">      
-    <img src="https://dapr.io/images/roadwork.png" width="100px">     
-    <img src="https://dapr.io/images/autonavi.png" width="100px">     
-    <img src="https://dapr.io/images/legentic.png" width="100px">      
-    <img src="https://dapr.io/images/man-group.png" width="100px">
-</div>
-
-View the main site [https://dapr.io/](https://dapr.io/) to learn more.
-
 ## Community
 
 There are multiple ways to get involved with the SDK community, please see [wiki/Community-engagement](https://github.com/dapr/js-sdk/wiki/Community-engagement) for more information.

README.md

@@ -103,19 +103,23 @@ Try to keep the first commit line short. This is harder to do using this commit
 concise and if you need more space, you can use the commit body. Try to make sure that the commit
 subject is clear and precise enough that users will know what change by just looking at the changelog.
 
+## Github Dapr Bot Commands
+
+Checkout the [daprbot documentation](https://docs.dapr.io/contributing/daprbot/) for Github commands you can run in this repo for common tasks. For example, you can run the `/assign` (as a comment on an issue) to assign issues to a user or group of users.
+
 ## Coding Rules
 
 To ensure consistency throughout the source code, keep these rules in mind as you are working:
 
 - All features or bug fixes **must be tested** by one or more specs (unit-tests).
 - All public API methods **must be documented**.
-- We follow [ESLint RecommendedRules][https://eslint.org/docs/rules/].
+- We follow [ESLint RecommendedRules](https://eslint.org/docs/rules/).
 
 ## Examples
 
 The `examples` directory contains code samples for users to run to try out specific functionality of the various JavaScript SDK packages and extensions. When writing new and updated samples keep in mind:
 
-- All examples should be runnable on Windows, Linux, and MacOS. While JavaScript code is consistent among operating systems, any pre/post example commands should provide options through [codetabs]({{< ref "contributing-docs.md#tabbed-content" >}})
+- All examples should be runnable on Windows, Linux, and MacOS. While JavaScript code is consistent among operating systems, any pre/post example commands should provide options through [codetabs]({{< ref "contributing-docs.md#tabbed-content" >}}).
 - Contain steps to download/install any required pre-requisites. Someone coming in with a fresh OS install should be able to start on the example and complete it without an error. Links to external download pages are fine.
 
 ## Docs

daprdocs/content/en/js-sdk-contributing/js-contributing.md

@@ -5,23 +5,26 @@ linkTitle: "JavaScript"
 weight: 1000
 description: JavaScript SDK packages for developing Dapr applications
 no_list: true
+cascade:
+  github_repo: https://github.com/dapr/js-sdk
+  github_subdir: daprdocs/content/en/js-sdk-docs
+  path_base_for_github_subdir: content/en/developing-applications/sdks/js/
+  github_branch: main
 ---
 
 A client library for building Dapr apps in JavaScript and TypeScript. This client abstracts the public Dapr APIs like service to service invocation, state management, pub/sub, secrets, and much more, and provides a simple, intuitive API for building applications.
 
 ## Installation
 
-To get started with the Javascript SDK, install the Dapr JavaScript SDK package from [NPM](https://www.npmjs.com/package/@dapr/dapr):
+To get started with the JavaScript SDK, install the Dapr JavaScript SDK package from [NPM](https://www.npmjs.com/package/@dapr/dapr):
 
 ```bash
 npm install --save @dapr/dapr
 ```
 
-> ⚠️ [dapr-client](https://www.npmjs.com/package/dapr-client) is now deprecated. Please see [#259](https://github.com/dapr/js-sdk/issues/259) for more information.
-
 ## Structure
 
-The Dapr Javascript SDK contains two major components:
+The Dapr JavaScript SDK contains two major components:
 
 - **DaprServer**: to manage all Dapr sidecar to application communication.
 - **DaprClient**: to manage all application to Dapr sidecar communication.