Merge branch 'develop' into chart-ts-1

RocketChat · Aug 20, 2024 · 73c845f · 73c845f
2 parents a6a210d + 908391a
commit 73c845f
Show file tree

Hide file tree

Showing 66 changed files with 42 additions and 10 deletions.
diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml
@@ -29,6 +29,9 @@ inputs:
     required: false
     description: 'Setup node.js'
     default: 'true'
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 runs:
   using: composite
@@ -65,6 +68,7 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache-modules: true
         install: true
+        NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
 
     - run: yarn build
       if: inputs.setup == 'true'

diff --git a/.github/actions/meteor-build/action.yml b/.github/actions/meteor-build/action.yml
@@ -13,6 +13,9 @@ inputs:
     required: true
     description: 'Node version'
     type: string
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 runs:
   using: composite
@@ -29,6 +32,7 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache-modules: true
         install: true
+        NPM_TOKEN: ${{ inputs.NPM_TOKEN }}
 
     # - name: Free disk space
     #   run: |

diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
@@ -1,22 +1,27 @@
 name: 'Setup Node'
+description: 'Setup NodeJS'
 
 inputs:
   node-version:
     required: true
-    type: string
+    description: 'Node version'
   cache-modules:
     required: false
-    type: boolean
+    description: 'Cache node_modules'
   install:
     required: false
-    type: boolean
+    description: 'Install dependencies'
   deno-dir:
     required: false
-    type: string
+    description: 'Deno directory'
     default: ~/.deno-cache
+  NPM_TOKEN:
+    required: false
+    description: 'NPM token'
 
 outputs:
   node-version:
+    description: 'Node version'
     value: ${{ steps.node-version.outputs.node-version }}
 
 runs:
@@ -49,6 +54,13 @@ runs:
         node-version: ${{ inputs.node-version }}
         cache: 'yarn'
 
+    - name: yarn login
+      shell: bash
+      if: inputs.NPM_TOKEN
+      run: |
+        echo "//registry.npmjs.org/:_authToken=${{ inputs.NPM_TOKEN }}" > ~/.npmrc
+
     - name: yarn install
+      if: inputs.install
       shell: bash
       run: yarn
diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml
@@ -35,6 +35,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       # - name: Free disk space
       #   run: |

diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -130,6 +130,8 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+
       - uses: rharkor/[email protected]
 
       - run: yarn build
@@ -145,6 +147,7 @@ jobs:
           # the same reason we need to rebuild the docker image at this point is the reason we dont want to publish it
           publish-image: false
           setup: false
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Start httpbin container and wait for it to be ready
         if: inputs.type == 'api'

diff --git a/.github/workflows/ci-test-unit.yml b/.github/workflows/ci-test-unit.yml
@@ -39,6 +39,7 @@ jobs:
           node-version: ${{ inputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -152,6 +152,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Cache vite
         uses: actions/cache@v3
@@ -253,6 +254,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   build-gh-docker:
     name: 🚢 Build Docker Images for Production
@@ -280,6 +282,7 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           platform: ${{ matrix.platform }}
           build-containers: ${{ matrix.platform == 'alpine' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Rename official Docker tag to GitHub Container Registry
         if: matrix.platform == 'official'
@@ -560,6 +563,7 @@ jobs:
           release: preview
           username: ${{ secrets.CR_USER }}
           password: ${{ secrets.CR_PAT }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   docker-image-publish:
     name: 🚀 Publish Docker Image (main)

diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -37,6 +37,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml
@@ -24,6 +24,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -27,6 +27,7 @@ jobs:
           node-version: 14.21.3
           cache-modules: true
           install: true
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - uses: rharkor/[email protected]
 

diff --git a/ee/packages/api-client/.eslintrc.json → packages/api-client/.eslintrc.json b/ee/packages/api-client/.eslintrc.json → packages/api-client/.eslintrc.json
diff --git a/ee/packages/api-client/CHANGELOG.md → packages/api-client/CHANGELOG.md b/ee/packages/api-client/CHANGELOG.md → packages/api-client/CHANGELOG.md
diff --git a/ee/packages/api-client/LICENSE → packages/api-client/LICENSE b/ee/packages/api-client/LICENSE → packages/api-client/LICENSE
diff --git a/.../api-client/__tests__/2fahandling.spec.ts → .../api-client/__tests__/2fahandling.spec.ts b/.../api-client/__tests__/2fahandling.spec.ts → .../api-client/__tests__/2fahandling.spec.ts
diff --git a/ee/packages/api-client/jest.config.ts → packages/api-client/jest.config.ts b/ee/packages/api-client/jest.config.ts → packages/api-client/jest.config.ts
diff --git a/ee/packages/api-client/package.json → packages/api-client/package.json b/ee/packages/api-client/package.json → packages/api-client/package.json
diff --git a/ee/packages/api-client/src/Credentials.ts → packages/api-client/src/Credentials.ts b/ee/packages/api-client/src/Credentials.ts → packages/api-client/src/Credentials.ts
diff --git a/...ges/api-client/src/RestClientInterface.ts → ...ges/api-client/src/RestClientInterface.ts b/...ges/api-client/src/RestClientInterface.ts → ...ges/api-client/src/RestClientInterface.ts
diff --git a/ee/packages/api-client/src/errors.ts → packages/api-client/src/errors.ts b/ee/packages/api-client/src/errors.ts → packages/api-client/src/errors.ts
diff --git a/ee/packages/api-client/src/index.ts → packages/api-client/src/index.ts b/ee/packages/api-client/src/index.ts → packages/api-client/src/index.ts
diff --git a/ee/packages/api-client/tsconfig.json → packages/api-client/tsconfig.json b/ee/packages/api-client/tsconfig.json → packages/api-client/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../../tsconfig.base.client.json",
+	"extends": "../../tsconfig.base.client.json",
 	"compilerOptions": {
 		"module": "commonjs",
 		"rootDir": "./src",

diff --git a/ee/packages/ddp-client/.eslintrc.json → packages/ddp-client/.eslintrc.json b/ee/packages/ddp-client/.eslintrc.json → packages/ddp-client/.eslintrc.json
diff --git a/ee/packages/ddp-client/CHANGELOG.md → packages/ddp-client/CHANGELOG.md b/ee/packages/ddp-client/CHANGELOG.md → packages/ddp-client/CHANGELOG.md
diff --git a/ee/packages/ddp-client/LICENSE → packages/ddp-client/LICENSE b/ee/packages/ddp-client/LICENSE → packages/ddp-client/LICENSE
diff --git a/ee/packages/ddp-client/README.md → packages/ddp-client/README.md b/ee/packages/ddp-client/README.md → packages/ddp-client/README.md
diff --git a/...ackages/ddp-client/__examples__/simple.ts → packages/ddp-client/__examples__/simple.ts b/...ackages/ddp-client/__examples__/simple.ts → packages/ddp-client/__examples__/simple.ts
diff --git a/ee/packages/ddp-client/__mocks__/ws.ts → packages/ddp-client/__mocks__/ws.ts b/ee/packages/ddp-client/__mocks__/ws.ts → packages/ddp-client/__mocks__/ws.ts
diff --git a/...ages/ddp-client/__tests__/Account.spec.ts → ...ages/ddp-client/__tests__/Account.spec.ts b/...ages/ddp-client/__tests__/Account.spec.ts → ...ages/ddp-client/__tests__/Account.spec.ts
diff --git a/...ddp-client/__tests__/ClientStream.spec.ts → ...ddp-client/__tests__/ClientStream.spec.ts b/...ddp-client/__tests__/ClientStream.spec.ts → ...ddp-client/__tests__/ClientStream.spec.ts
diff --git a/...s/ddp-client/__tests__/Connection.spec.ts → ...s/ddp-client/__tests__/Connection.spec.ts b/...s/ddp-client/__tests__/Connection.spec.ts → ...s/ddp-client/__tests__/Connection.spec.ts
diff --git a/...dp-client/__tests__/DDPDispatcher.spec.ts → ...dp-client/__tests__/DDPDispatcher.spec.ts b/...dp-client/__tests__/DDPDispatcher.spec.ts → ...dp-client/__tests__/DDPDispatcher.spec.ts
diff --git a/...kages/ddp-client/__tests__/DDPSDK.spec.ts → packages/ddp-client/__tests__/DDPSDK.spec.ts b/...kages/ddp-client/__tests__/DDPSDK.spec.ts → packages/ddp-client/__tests__/DDPSDK.spec.ts
diff --git a/...client/__tests__/MinimalDDPClient.spec.ts → ...client/__tests__/MinimalDDPClient.spec.ts b/...client/__tests__/MinimalDDPClient.spec.ts → ...client/__tests__/MinimalDDPClient.spec.ts
diff --git a/...ages/ddp-client/__tests__/Timeout.spec.ts → ...ages/ddp-client/__tests__/Timeout.spec.ts b/...ages/ddp-client/__tests__/Timeout.spec.ts → ...ages/ddp-client/__tests__/Timeout.spec.ts
diff --git a/...ges/ddp-client/__tests__/helpers/index.ts → ...ges/ddp-client/__tests__/helpers/index.ts b/...ges/ddp-client/__tests__/helpers/index.ts → ...ges/ddp-client/__tests__/helpers/index.ts
diff --git a/..._tests__/wrapOnceEventIntoPromise.spec.ts → ..._tests__/wrapOnceEventIntoPromise.spec.ts b/..._tests__/wrapOnceEventIntoPromise.spec.ts → ..._tests__/wrapOnceEventIntoPromise.spec.ts
diff --git a/ee/packages/ddp-client/jest.config.ts → packages/ddp-client/jest.config.ts b/ee/packages/ddp-client/jest.config.ts → packages/ddp-client/jest.config.ts
diff --git a/ee/packages/ddp-client/package.json → packages/ddp-client/package.json b/ee/packages/ddp-client/package.json → packages/ddp-client/package.json
diff --git a/ee/packages/ddp-client/src/ClientStream.ts → packages/ddp-client/src/ClientStream.ts b/ee/packages/ddp-client/src/ClientStream.ts → packages/ddp-client/src/ClientStream.ts
diff --git a/ee/packages/ddp-client/src/Connection.ts → packages/ddp-client/src/Connection.ts b/ee/packages/ddp-client/src/Connection.ts → packages/ddp-client/src/Connection.ts
diff --git a/ee/packages/ddp-client/src/DDPDispatcher.ts → packages/ddp-client/src/DDPDispatcher.ts b/ee/packages/ddp-client/src/DDPDispatcher.ts → packages/ddp-client/src/DDPDispatcher.ts
diff --git a/ee/packages/ddp-client/src/DDPSDK.ts → packages/ddp-client/src/DDPSDK.ts b/ee/packages/ddp-client/src/DDPSDK.ts → packages/ddp-client/src/DDPSDK.ts
diff --git a/...ckages/ddp-client/src/MinimalDDPClient.ts → packages/ddp-client/src/MinimalDDPClient.ts b/...ckages/ddp-client/src/MinimalDDPClient.ts → packages/ddp-client/src/MinimalDDPClient.ts
diff --git a/ee/packages/ddp-client/src/TimeoutControl.ts → packages/ddp-client/src/TimeoutControl.ts b/ee/packages/ddp-client/src/TimeoutControl.ts → packages/ddp-client/src/TimeoutControl.ts
diff --git a/ee/packages/ddp-client/src/index.ts → packages/ddp-client/src/index.ts b/ee/packages/ddp-client/src/index.ts → packages/ddp-client/src/index.ts
diff --git a/...-client/src/legacy/RocketchatSDKLegacy.ts → ...-client/src/legacy/RocketchatSDKLegacy.ts b/...-client/src/legacy/RocketchatSDKLegacy.ts → ...-client/src/legacy/RocketchatSDKLegacy.ts
diff --git a/.../ddp-client/src/legacy/types/SDKLegacy.ts → .../ddp-client/src/legacy/types/SDKLegacy.ts b/.../ddp-client/src/legacy/types/SDKLegacy.ts → .../ddp-client/src/legacy/types/SDKLegacy.ts
diff --git a/...client/src/livechat/LivechatClientImpl.ts → ...client/src/livechat/LivechatClientImpl.ts b/...client/src/livechat/LivechatClientImpl.ts → ...client/src/livechat/LivechatClientImpl.ts
diff --git a/...-client/src/livechat/types/LivechatSDK.ts → ...-client/src/livechat/types/LivechatSDK.ts b/...-client/src/livechat/types/LivechatSDK.ts → ...-client/src/livechat/types/LivechatSDK.ts
diff --git a/ee/packages/ddp-client/src/types/Account.ts → packages/ddp-client/src/types/Account.ts b/ee/packages/ddp-client/src/types/Account.ts → packages/ddp-client/src/types/Account.ts
diff --git a/...ages/ddp-client/src/types/ClientStream.ts → ...ages/ddp-client/src/types/ClientStream.ts b/...ages/ddp-client/src/types/ClientStream.ts → ...ages/ddp-client/src/types/ClientStream.ts
diff --git a/...ackages/ddp-client/src/types/DDPClient.ts → packages/ddp-client/src/types/DDPClient.ts b/...ackages/ddp-client/src/types/DDPClient.ts → packages/ddp-client/src/types/DDPClient.ts
diff --git a/...s/ddp-client/src/types/IncomingPayload.ts → ...s/ddp-client/src/types/IncomingPayload.ts b/...s/ddp-client/src/types/IncomingPayload.ts → ...s/ddp-client/src/types/IncomingPayload.ts
diff --git a/...s/ddp-client/src/types/OutgoingPayload.ts → ...s/ddp-client/src/types/OutgoingPayload.ts b/...s/ddp-client/src/types/OutgoingPayload.ts → ...s/ddp-client/src/types/OutgoingPayload.ts
diff --git a/...es/ddp-client/src/types/RemoveListener.ts → ...es/ddp-client/src/types/RemoveListener.ts b/...es/ddp-client/src/types/RemoveListener.ts → ...es/ddp-client/src/types/RemoveListener.ts
diff --git a/ee/packages/ddp-client/src/types/SDK.ts → packages/ddp-client/src/types/SDK.ts b/ee/packages/ddp-client/src/types/SDK.ts → packages/ddp-client/src/types/SDK.ts
diff --git a/...ages/ddp-client/src/types/Subscription.ts → ...ages/ddp-client/src/types/Subscription.ts b/...ages/ddp-client/src/types/Subscription.ts → ...ages/ddp-client/src/types/Subscription.ts
diff --git a/...dp-client/src/types/connectionPayloads.ts → ...dp-client/src/types/connectionPayloads.ts b/...dp-client/src/types/connectionPayloads.ts → ...dp-client/src/types/connectionPayloads.ts
diff --git a/...dp-client/src/types/heartbeatsPayloads.ts → ...dp-client/src/types/heartbeatsPayloads.ts b/...dp-client/src/types/heartbeatsPayloads.ts → ...dp-client/src/types/heartbeatsPayloads.ts
diff --git a/ee/packages/ddp-client/src/types/methods.ts → packages/ddp-client/src/types/methods.ts b/ee/packages/ddp-client/src/types/methods.ts → packages/ddp-client/src/types/methods.ts
diff --git a/...s/ddp-client/src/types/methodsPayloads.ts → ...s/ddp-client/src/types/methodsPayloads.ts b/...s/ddp-client/src/types/methodsPayloads.ts → ...s/ddp-client/src/types/methodsPayloads.ts
diff --git a/...p-client/src/types/publicationPayloads.ts → ...p-client/src/types/publicationPayloads.ts b/...p-client/src/types/publicationPayloads.ts → ...p-client/src/types/publicationPayloads.ts
diff --git a/ee/packages/ddp-client/src/types/streams.ts → packages/ddp-client/src/types/streams.ts b/ee/packages/ddp-client/src/types/streams.ts → packages/ddp-client/src/types/streams.ts
diff --git a/...dp-client/src/wrapOnceEventIntoPromise.ts → ...dp-client/src/wrapOnceEventIntoPromise.ts b/...dp-client/src/wrapOnceEventIntoPromise.ts → ...dp-client/src/wrapOnceEventIntoPromise.ts
diff --git a/ee/packages/ddp-client/tsconfig.json → packages/ddp-client/tsconfig.json b/ee/packages/ddp-client/tsconfig.json → packages/ddp-client/tsconfig.json
@@ -1,5 +1,5 @@
 {
-	"extends": "../../../tsconfig.base.client.json",
+	"extends": "../../tsconfig.base.client.json",
 	"compilerOptions": {
 		"rootDir": "./src",
 		"outDir": "./dist",

diff --git a/yarn.lock b/yarn.lock
@@ -8463,9 +8463,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/api-client@workspace:^, @rocket.chat/api-client@workspace:ee/packages/api-client":
+"@rocket.chat/api-client@workspace:^, @rocket.chat/api-client@workspace:packages/api-client":
   version: 0.0.0-use.local
-  resolution: "@rocket.chat/api-client@workspace:ee/packages/api-client"
+  resolution: "@rocket.chat/api-client@workspace:packages/api-client"
   dependencies:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
@@ -8657,9 +8657,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rocket.chat/ddp-client@workspace:^, @rocket.chat/ddp-client@workspace:ee/packages/ddp-client, @rocket.chat/ddp-client@workspace:~":
+"@rocket.chat/ddp-client@workspace:^, @rocket.chat/ddp-client@workspace:packages/ddp-client, @rocket.chat/ddp-client@workspace:~":
   version: 0.0.0-use.local
-  resolution: "@rocket.chat/ddp-client@workspace:ee/packages/ddp-client"
+  resolution: "@rocket.chat/ddp-client@workspace:packages/ddp-client"
   dependencies:
     "@rocket.chat/api-client": "workspace:^"
     "@rocket.chat/core-typings": "workspace:~"