chore: upgrade aws sdk, remove internal, fix npm publish

awslabs · Nov 20, 2024 · 2701ef1 · 2701ef1
1 parent 18e7b04
commit 2701ef1
Show file tree

Hide file tree

Showing 34 changed files with 1,421 additions and 1,672 deletions.
diff --git a/iot-black-pearl-internal-v3.tgz b/iot-black-pearl-internal-v3.tgz
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -43,16 +43,13 @@
     "test:git": "git diff --exit-code",
     "release": "npm run build",
     "pack": "turbo run pack",
-    "publish-packages": "turbo run clean && rimraf .turbo && npm run install-ws && turbo run build lint test",
+    "publish-packages": "npm run install-ws && turbo run build lint test",
     "versionup:patch": "turbo run version --no-git-tag-version patch",
     "versionup:minor": "turbo run version --no-git-tag-version minor",
     "versionup:major": "turbo run version --no-git-tag-version major",
     "prepare": "husky install",
     "test:ci": "if test \"$NODE_ENV\" = \"production\"; then echo \"Yes!\"; fi"
   },
-  "dependencies": {
-    "@amzn/iot-black-pearl-internal-v3": "file:./iot-black-pearl-internal-v3.tgz"
-  },
   "devDependencies": {
     "@swc/core": "^1.3.71",
     "@swc/jest": "^0.2.26",

diff --git a/packages/core-util/package.json b/packages/core-util/package.json
@@ -35,7 +35,8 @@
     "fix": "eslint --fix . --cache --cache-location .cache/eslint/",
     "test": "npm run test:jest",
     "test:jest": "TZ=UTC jest --cacheDirectory .cache/jest",
-    "test:typescript": "tsc --noEmit"
+    "test:typescript": "tsc --noEmit",
+    "pack": "npm pack"
   },
   "dependencies": {
     "@iot-app-kit/core": "12.0.0",
@@ -44,7 +45,7 @@
     "zustand": "^4.5.2"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.310.0",
+    "@aws-sdk/types": "^3.696.0",
     "@iot-app-kit/jest-config": "12.0.0",
     "@iot-app-kit/ts-config": "12.0.0",
     "@types/jest": "^29.4.0",
@@ -59,6 +60,6 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-iot-events": "^3.354.0",
-    "@aws-sdk/client-iotsitewise": "^3.456.0"
+    "@aws-sdk/client-iotsitewise": "^3.696.0"
   }
 }
diff --git a/packages/core-util/src/sdks/IotSitewiseAssistant/client.spec.ts b/packages/core-util/src/sdks/IotSitewiseAssistant/client.spec.ts
@@ -1,7 +1,7 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from './client';
 
-jest.mock('@amzn/iot-black-pearl-internal-v3');
+jest.mock('@aws-sdk/client-iotsitewise');
 
 function flushPromises() {
   return new Promise(jest.requireActual('timers').setImmediate);

diff --git a/packages/core-util/src/sdks/IotSitewiseAssistant/client.ts b/packages/core-util/src/sdks/IotSitewiseAssistant/client.ts
@@ -1,7 +1,4 @@
-import type {
-  IoTSiteWise,
-  ResponseStream,
-} from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise, ResponseStream } from '@aws-sdk/client-iotsitewise';
 import type {
   AssistantClientInstanceParams,
   AssistantClientInvocationCompleteHandler,

diff --git a/packages/core-util/src/sdks/IotSitewiseAssistant/types.ts b/packages/core-util/src/sdks/IotSitewiseAssistant/types.ts
@@ -2,7 +2,7 @@ import type {
   ResponseStream,
   IoTSiteWise,
   InvokeAssistantRequest,
-} from '@amzn/iot-black-pearl-internal-v3';
+} from '@aws-sdk/client-iotsitewise';
 
 export type AssistantClientInstanceParams = {
   iotSiteWiseClient: Pick<IoTSiteWise, 'invokeAssistant'>;

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -76,7 +76,7 @@
     "typescript": "^4.9.5"
   },
   "peerDependencies": {
-    "@aws-sdk/client-iotsitewise": "^3.456.0"
+    "@aws-sdk/client-iotsitewise": "^3.696.0"
   },
   "bugs": {
     "url": "https://github.com/awslabs/iot-app-kit/issues"

diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
@@ -48,7 +48,8 @@
     "fix": "eslint --fix . --cache --cache-location ./cache/eslint/",
     "test:ui": "npx playwright test",
     "test:ui:ci": "npx playwright test",
-    "test:ui:watch": "npx playwright test --ui"
+    "test:ui:watch": "npx playwright test --ui",
+    "pack": "npm pack"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.2.0",
@@ -133,7 +134,7 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-iot-events": "^3.354.0",
-    "@aws-sdk/client-iotsitewise": "^3.456.0",
+    "@aws-sdk/client-iotsitewise": "^3.696.0",
     "@aws-sdk/client-iottwinmaker": "^3.354.0",
     "react": "^18",
     "react-dom": "^18"

diff --git a/packages/dashboard/src/components/dashboard/getClients.ts b/packages/dashboard/src/components/dashboard/getClients.ts
@@ -1,7 +1,10 @@
 import { IoTEventsClient } from '@aws-sdk/client-iot-events';
-import { IoTSiteWiseClient, IoTSiteWise } from '@aws-sdk/client-iotsitewise';
+import {
+  IoTSiteWiseClient,
+  IoTSiteWise,
+  IoTSiteWise as InternalIoTSiteWise,
+} from '@aws-sdk/client-iotsitewise';
 import { IoTTwinMakerClient } from '@aws-sdk/client-iottwinmaker';
-import { IoTSiteWise as InternalIoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
 import { type DashboardClientConfiguration } from '~/types';
 import { type DashboardClientContext } from './clientContext';
 import { isCredentials } from '~/hooks/useAWSRegion';

diff --git a/packages/dashboard/src/types.ts b/packages/dashboard/src/types.ts
@@ -1,11 +1,11 @@
-import { type IoTSiteWise as InternalIoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
-import { type IoTEventsClient } from '@aws-sdk/client-iot-events';
 import {
+  type IoTSiteWise as InternalIoTSiteWise,
   type DescribeDashboardRequest,
   type DescribeDashboardResponse,
   type IoTSiteWise,
   type IoTSiteWiseClient,
 } from '@aws-sdk/client-iotsitewise';
+import { type IoTEventsClient } from '@aws-sdk/client-iot-events';
 import { type IoTTwinMakerClient } from '@aws-sdk/client-iottwinmaker';
 import type { AwsCredentialIdentity, Provider } from '@aws-sdk/types';
 import type { Viewport } from '@iot-app-kit/core';

diff --git a/packages/doc-site/stories/mockAssistantAPI.ts b/packages/doc-site/stories/mockAssistantAPI.ts
@@ -2,7 +2,7 @@ import {
   type InvokeAssistantCommandInput,
   type InvokeAssistantCommandOutput,
   type ResponseStream,
-} from '@amzn/iot-black-pearl-internal-v3';
+} from '@aws-sdk/client-iotsitewise';
 
 export const mockedInvokeAssistantResponse1: ResponseStream = {
   trace: {

diff --git a/packages/react-components/package.json b/packages/react-components/package.json
@@ -171,7 +171,7 @@
     "zustand": "^4.3.9"
   },
   "peerDependencies": {
-    "@aws-sdk/client-iotsitewise": "^3.456.0",
+    "@aws-sdk/client-iotsitewise": "^3.696.0",
     "cytoscape": "^3.25",
     "react": "^18",
     "react-dom": "^18"

diff --git a/packages/react-components/src/__mocks__/assistantMockedResponse.ts b/packages/react-components/src/__mocks__/assistantMockedResponse.ts
@@ -1,4 +1,4 @@
-import type { ResponseStream } from "@amzn/iot-black-pearl-internal-v3";
+import type { ResponseStream } from "@aws-sdk/client-iotsitewise";
 
 export const mockedInvokeAssistantResponse1:ResponseStream = {
   trace: {

diff --git a/packages/react-components/src/components/assistant-chatbot/Chatbot.spec.tsx b/packages/react-components/src/components/assistant-chatbot/Chatbot.spec.tsx
@@ -1,4 +1,4 @@
-import type { ResponseStream } from '@amzn/iot-black-pearl-internal-v3';
+import type { ResponseStream } from '@aws-sdk/client-iotsitewise';
 import { render } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MessageType } from '../../hooks/useAssistant/types';

diff --git a/packages/react-components/src/components/assistant-common/AssistantMessage.tsx b/packages/react-components/src/components/assistant-common/AssistantMessage.tsx
@@ -2,10 +2,7 @@ import Box from '@cloudscape-design/components/box';
 import ExpandableSection from '@cloudscape-design/components/expandable-section';
 import Link from '@cloudscape-design/components/link';
 import SpaceBetween from '@cloudscape-design/components/space-between';
-import type {
-  Citation,
-  ResponseStream,
-} from '@amzn/iot-black-pearl-internal-v3';
+import type { Citation, ResponseStream } from '@aws-sdk/client-iotsitewise';
 import Markdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
 import { spaceStaticL } from '@cloudscape-design/design-tokens';

diff --git a/...es/react-components/src/components/assistant-panels/assistant-result/resultPanel.spec.tsx b/...es/react-components/src/components/assistant-panels/assistant-result/resultPanel.spec.tsx
@@ -1,4 +1,4 @@
-import type { ResponseStream } from '@amzn/iot-black-pearl-internal-v3';
+import type { ResponseStream } from '@aws-sdk/client-iotsitewise';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { IntlProvider } from 'react-intl';

diff --git a/packages/react-components/src/components/assistant-panels/assistantWrapperPanel.spec.tsx b/packages/react-components/src/components/assistant-panels/assistantWrapperPanel.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import {
   act,

diff --git a/packages/react-components/src/components/chart/tests/baseChart.spec.tsx b/packages/react-components/src/components/chart/tests/baseChart.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { type DataStream } from '@iot-app-kit/core';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { mockTimeSeriesDataQuery } from '@iot-app-kit/testing-util';

diff --git a/packages/react-components/src/components/gauge/gauge.spec.tsx b/packages/react-components/src/components/gauge/gauge.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { mockTimeSeriesDataQuery } from '@iot-app-kit/testing-util';
 import { render, renderHook, screen } from '@testing-library/react';

diff --git a/packages/react-components/src/components/kpi/kpi.spec.tsx b/packages/react-components/src/components/kpi/kpi.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { mockTimeSeriesDataQuery } from '@iot-app-kit/testing-util';
 import { render, renderHook, screen } from '@testing-library/react';

diff --git a/packages/react-components/src/components/popover/alarm-popover/alarmPopover.spec.tsx b/packages/react-components/src/components/popover/alarm-popover/alarmPopover.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import type { PascalCaseStateName } from '@iot-app-kit/source-iotsitewise';
 import { render } from '@testing-library/react';

diff --git a/packages/react-components/src/components/table/table.spec.tsx b/packages/react-components/src/components/table/table.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import cloudscapeWrapper from '@cloudscape-design/components/test-utils/dom';
 import type { DataStream } from '@iot-app-kit/core';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';

diff --git a/packages/react-components/src/components/table/tableAssistantResults.spec.tsx b/packages/react-components/src/components/table/tableAssistantResults.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { render } from '@testing-library/react';
 import { mockedInvokeAssistantResponse3 } from '../../__mocks__/assistantMockedResponse';

diff --git a/packages/react-components/src/components/table/tableHeader.spec.tsx b/packages/react-components/src/components/table/tableHeader.spec.tsx
@@ -1,4 +1,4 @@
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';

diff --git a/packages/react-components/src/hooks/useAssistant/messageParser.ts b/packages/react-components/src/hooks/useAssistant/messageParser.ts
@@ -1,4 +1,4 @@
-import type { ResponseStream } from '@amzn/iot-black-pearl-internal-v3';
+import type { ResponseStream } from '@aws-sdk/client-iotsitewise';
 import type { IMessage, IMessageParser, UniqueID } from './types';
 import type { AssistantInvocationRequest } from '@iot-app-kit/core-util';
 import { MessageType } from './types';

diff --git a/packages/react-components/src/hooks/useAssistant/types.ts b/packages/react-components/src/hooks/useAssistant/types.ts
@@ -1,4 +1,4 @@
-import type { ResponseStream } from '@amzn/iot-black-pearl-internal-v3';
+import type { ResponseStream } from '@aws-sdk/client-iotsitewise';
 import type {
   AssistantInvocationRequest,
   InvokeAssistantOptions,

diff --git a/packages/react-components/src/hooks/useAssistant/useAssistant.spec.ts b/packages/react-components/src/hooks/useAssistant/useAssistant.spec.ts
@@ -2,7 +2,7 @@ import { IoTSitewiseAssistantClient } from '@iot-app-kit/core-util';
 import { useAssistant } from './useAssistant';
 import { renderHook, waitFor, act } from '@testing-library/react';
 import type { MessageParser } from './messageParser';
-import type { IoTSiteWise } from '@amzn/iot-black-pearl-internal-v3';
+import type { IoTSiteWise } from '@aws-sdk/client-iotsitewise';
 import { MessageType } from './types';
 
 const response1 = {

diff --git a/packages/react-components/stories/assistant-chatbot/mockAPI.ts b/packages/react-components/stories/assistant-chatbot/mockAPI.ts
@@ -1,7 +1,7 @@
 import {
   type InvokeAssistantCommandInput,
   type InvokeAssistantCommandOutput,
-} from '@amzn/iot-black-pearl-internal-v3';
+} from '@aws-sdk/client-iotsitewise';
 import {
   mockedInvokeAssistantResponse1,
   mockedInvokeAssistantResponse2,

diff --git a/packages/scene-composer/package.json b/packages/scene-composer/package.json
@@ -9,10 +9,10 @@
   "license": "Apache-2.0",
   "main": "./dist/cjs/src/index.js",
   "module": "./dist/esm/src/index.js",
-  "types": "./dist/esm/src/index.d.ts",
+  "types": "./dist/src/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/esm/src/index.d.ts",
+      "types": "./dist/src/index.d.ts",
       "require": "./dist/cjs/src/index.js",
       "import": "./dist/esm/src/index.js",
       "default": "./dist/esm/src/index.js"
@@ -24,7 +24,7 @@
     "test": "__tests__"
   },
   "files": [
-    "dist/",
+    "dist",
     "CHANGELOG.md",
     "THIRD-PARTY-LICENSES",
     "*NOTICE"
@@ -91,7 +91,7 @@
   },
   "devDependencies": {
     "@aws-sdk/credential-providers": "^3.395.0",
-    "@aws-sdk/types": "^3.310.0",
+    "@aws-sdk/types": "^3.696.0",
     "@awsui/jest-preset": "^2.0.20",
     "@babel/preset-env": "^7.22.5",
     "@babel/preset-react": "^7.22.5",

diff --git a/packages/source-iotsitewise/package.json b/packages/source-iotsitewise/package.json
@@ -63,7 +63,7 @@
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.310.0",
+    "@aws-sdk/types": "^3.696.0",
     "@iot-app-kit/jest-config": "12.0.0",
     "@iot-app-kit/testing-util": "12.0.0",
     "@iot-app-kit/ts-config": "12.0.0",
@@ -82,7 +82,7 @@
   },
   "peerDependencies": {
     "@aws-sdk/client-iot-events": "^3.354.0",
-    "@aws-sdk/client-iotsitewise": "^3.456.0"
+    "@aws-sdk/client-iotsitewise": "^3.696.0"
   },
   "bugs": {
     "url": "https://github.com/awslabs/iot-app-kit/issues"

diff --git a/packages/source-iottwinmaker/package.json b/packages/source-iottwinmaker/package.json
@@ -52,7 +52,7 @@
     "pack": "npm pack"
   },
   "dependencies": {
-    "@aws-sdk/client-iotsitewise": "3.456.0",
+    "@aws-sdk/client-iotsitewise": "3.696.0",
     "@aws-sdk/client-iottwinmaker": "3.589.0",
     "@aws-sdk/client-kinesis-video": "3.354.0",
     "@aws-sdk/client-kinesis-video-archived-media": "3.354.0",
@@ -65,7 +65,7 @@
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@aws-sdk/types": "^3.310.0",
+    "@aws-sdk/types": "^3.696.0",
     "@iot-app-kit/jest-config": "12.0.0",
     "@iot-app-kit/ts-config": "12.0.0",
     "@types/jest": "^29.4.0",

diff --git a/packages/testing-util/package.json b/packages/testing-util/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-iot-events": "3.354.0",
-    "@aws-sdk/client-iotsitewise": "3.456.0",
+    "@aws-sdk/client-iotsitewise": "3.696.0",
     "@iot-app-kit/core": "12.0.0",
     "parse-duration": "^1.1.0"
   },

diff --git a/packages/tools-iottwinmaker/package.json b/packages/tools-iottwinmaker/package.json
@@ -64,7 +64,7 @@
     "@aws-sdk/client-kinesis-video": "^3.363.0",
     "@aws-sdk/client-s3": "^3.363.0",
     "@aws-sdk/client-sts": "^3.363.0",
-    "@aws-sdk/types": "^3.363.0",
+    "@aws-sdk/types": "^3.696.0",
     "prompts": "^2.4.2",
     "yargs": "^17.7.2"
   },