From 35904ac3ba7fa7bec9406a3fad9729254669139c Mon Sep 17 00:00:00 2001 From: "0.618" Date: Wed, 20 Mar 2024 15:00:00 -0700 Subject: [PATCH 1/5] chore: upgrade webpack-dev-server to v5 --- packages/amplify-velocity-template/examples/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-velocity-template/examples/package.json b/packages/amplify-velocity-template/examples/package.json index 0751e8652e8..28ba3c2d9bf 100644 --- a/packages/amplify-velocity-template/examples/package.json +++ b/packages/amplify-velocity-template/examples/package.json @@ -12,7 +12,7 @@ "devDependencies": { "webpack": "^4.44.2", "webpack-cli": "^3.3.12", - "webpack-dev-server": "^3.11.0" + "webpack-dev-server": "^5.0.4" }, "dependencies": { "velocityjs": "^1.0.1" From 724f288f9c96733f16e3fe0b65a9f71e58d4a721 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Wed, 20 Mar 2024 15:37:48 -0700 Subject: [PATCH 2/5] chore: pin follow-redirects@^1.15.6 --- package.json | 3 ++- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 593bee830ae..67a00fa1824 100644 --- a/package.json +++ b/package.json @@ -173,6 +173,7 @@ "pkg-fetch": "https://github.com/aws-amplify/pkg-fetch#ad4a21feb533d338bf951e7ba28cea7256aedeff", "tough-cookie": "^4.1.3", "semver": "^7.5.4", - "word-wrap": "^1.2.4" + "word-wrap": "^1.2.4", + "follow-redirects": "^1.15.6" } } diff --git a/yarn.lock b/yarn.lock index 5f8d32ea7cb..45e0ed15583 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19917,13 +19917,13 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.4": - version: 1.15.5 - resolution: "follow-redirects@npm:1.15.5" +"follow-redirects@npm:^1.15.6": + version: 1.15.6 + resolution: "follow-redirects@npm:1.15.6" peerDependenciesMeta: debug: optional: true - checksum: 418d71688ceaf109dfd6f85f747a0c75de30afe43a294caa211def77f02ef19865b547dfb73fde82b751e1cc507c06c754120b848fe5a7400b0a669766df7615 + checksum: 9ff767f0d7be6aa6870c82ac79cf0368cd73e01bbc00e9eb1c2a16fbb198ec105e3c9b6628bb98e9f3ac66fe29a957b9645bcb9a490bb7aa0d35f908b6b85071 languageName: node linkType: hard From e00489d248548124f4e534ea1353fcd6b2eade04 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Fri, 22 Mar 2024 16:30:56 -0700 Subject: [PATCH 3/5] Revert "chore: upgrade webpack-dev-server to v5" This reverts commit 35904ac3ba7fa7bec9406a3fad9729254669139c. --- packages/amplify-velocity-template/examples/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-velocity-template/examples/package.json b/packages/amplify-velocity-template/examples/package.json index 28ba3c2d9bf..0751e8652e8 100644 --- a/packages/amplify-velocity-template/examples/package.json +++ b/packages/amplify-velocity-template/examples/package.json @@ -12,7 +12,7 @@ "devDependencies": { "webpack": "^4.44.2", "webpack-cli": "^3.3.12", - "webpack-dev-server": "^5.0.4" + "webpack-dev-server": "^3.11.0" }, "dependencies": { "velocityjs": "^1.0.1" From af7d3398f212dd908af88fd2338dbd087e4393da Mon Sep 17 00:00:00 2001 From: "0.618" Date: Thu, 4 Apr 2024 09:18:13 -0700 Subject: [PATCH 4/5] fix: lint and threshold --- package.json | 2 +- .../src/server/subscription/websocket-server/server.ts | 1 - .../src/channel-in-app-msg.ts | 7 +------ .../amplify-go-function-runtime-provider/src/runtime.ts | 2 -- .../src/display-helpful-urls.ts | 4 ++-- .../amplify-graphql-resource-manager.ts | 2 +- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 698421e45a9..b4dd39022ce 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "link-dev": "mkdir -p .bin/ && cd packages/amplify-cli && ln -s \"$(pwd)/bin/amplify\" ../../.bin/amplify-dev && cd ../../", "link-win": "node ./scripts/link-bin.js packages/amplify-cli/bin/amplify amplify-dev", "lint-check-package-json": "yarn eslint --no-eslintrc --config .eslint.package.json.js '**/package.json'", - "lint-check": "yarn eslint . --ext .js,.jsx,.ts,.tsx --max-warnings=755", + "lint-check": "yarn eslint . --ext .js,.jsx,.ts,.tsx --max-warnings=750", "lint-fix-package-json": "yarn lint-check-package-json --fix", "lint-fix": "git diff --name-only --cached --diff-filter d | grep -E '\\.(js|jsx|ts|tsx)$' | xargs eslint --fix --quiet", "mergewords": "yarn ts-node ./scripts/handle-dict-conflicts.ts", diff --git a/packages/amplify-appsync-simulator/src/server/subscription/websocket-server/server.ts b/packages/amplify-appsync-simulator/src/server/subscription/websocket-server/server.ts index 7ba06d3cb89..90b91ed1f75 100644 --- a/packages/amplify-appsync-simulator/src/server/subscription/websocket-server/server.ts +++ b/packages/amplify-appsync-simulator/src/server/subscription/websocket-server/server.ts @@ -5,7 +5,6 @@ import * as WebSocket from 'ws'; import { Server as WebSocketServer, ServerOptions } from 'ws'; import { GQLMessageConnectionAck, - GQLMessageConnectionInit, GQLMessageSubscriptionStart, GQLMessageSubscriptionStop, isSubscriptionConnectionInitMessage, diff --git a/packages/amplify-category-notifications/src/channel-in-app-msg.ts b/packages/amplify-category-notifications/src/channel-in-app-msg.ts index a56ce303fcc..ab1f57f676a 100644 --- a/packages/amplify-category-notifications/src/channel-in-app-msg.ts +++ b/packages/amplify-category-notifications/src/channel-in-app-msg.ts @@ -23,12 +23,7 @@ import { } from './plugin-client-api-analytics'; import { IChannelAPIResponse, ChannelAction, ChannelConfigDeploymentType } from './channel-types'; -import { - buildPinpointChannelResponseSuccess, - getPinpointAppStatusFromMeta, - IPinpointAppStatus, - IPinpointDeploymentStatus, -} from './pinpoint-helper'; +import { buildPinpointChannelResponseSuccess, getPinpointAppStatusFromMeta, IPinpointDeploymentStatus } from './pinpoint-helper'; import { ChannelType, getChannelViewName, isChannelEnabledNotificationsBackendConfig } from './notifications-backend-cfg-channel-api'; import { getNotificationsAppMeta } from './notifications-amplify-meta-api'; import { getNotificationsAppConfig } from './notifications-backend-cfg-api'; diff --git a/packages/amplify-go-function-runtime-provider/src/runtime.ts b/packages/amplify-go-function-runtime-provider/src/runtime.ts index d22443a4288..5ef2e480394 100644 --- a/packages/amplify-go-function-runtime-provider/src/runtime.ts +++ b/packages/amplify-go-function-runtime-provider/src/runtime.ts @@ -73,8 +73,6 @@ export const buildResource = async ({ buildType, srcRoot, lastBuildTimeStamp }: const outDir = path.join(srcRoot, buildDir); const isWindows = process.platform.startsWith('win'); - const executableName = isWindows && buildType === BuildType.DEV ? MAIN_BINARY_WIN : MAIN_BINARY; - const executablePath = path.join(outDir, executableName); if (!lastBuildTimeStamp || isBuildStale(srcRoot, lastBuildTimeStamp, outDir)) { const srcDir = path.join(srcRoot, SRC); diff --git a/packages/amplify-provider-awscloudformation/src/display-helpful-urls.ts b/packages/amplify-provider-awscloudformation/src/display-helpful-urls.ts index 9d1253f2c96..fd27422fd7f 100644 --- a/packages/amplify-provider-awscloudformation/src/display-helpful-urls.ts +++ b/packages/amplify-provider-awscloudformation/src/display-helpful-urls.ts @@ -271,7 +271,7 @@ export const showSMSSandboxWarning = async (context): Promise => { const showGraphQLTransformerMigrationMessage = (): void => { const hasGraphqlApi = !!Object.entries(stateManager.getMeta().api || {}) - .filter(([__, apiResource]) => (apiResource as $TSAny).service === 'AppSync') + .filter(([, apiResource]) => (apiResource as $TSAny).service === 'AppSync') .map(([name]) => name).length; const suppressMessage = FeatureFlags.getBoolean('graphqltransformer.suppressSchemaMigrationPrompt'); const usingV2 = FeatureFlags.getNumber('graphqltransformer.transformerVersion') === 2; @@ -293,7 +293,7 @@ export const showGraphQLTransformerVersion = async (context): Promise => { const meta = stateManager.getMeta(); const apiObject = (meta && meta.api) || {}; const hasGraphqlApi = !!Object.entries(apiObject) - .filter(([__, apiResource]) => (apiResource as $TSAny).service === 'AppSync') + .filter(([, apiResource]) => (apiResource as $TSAny).service === 'AppSync') .map(([name]) => name).length; if (!hasGraphqlApi) { diff --git a/packages/amplify-provider-awscloudformation/src/graphql-resource-manager/amplify-graphql-resource-manager.ts b/packages/amplify-provider-awscloudformation/src/graphql-resource-manager/amplify-graphql-resource-manager.ts index 858add2a347..1e11b4be5f0 100644 --- a/packages/amplify-provider-awscloudformation/src/graphql-resource-manager/amplify-graphql-resource-manager.ts +++ b/packages/amplify-provider-awscloudformation/src/graphql-resource-manager/amplify-graphql-resource-manager.ts @@ -481,5 +481,5 @@ export class GraphQLResourceManager { }; private getTableNameFromTemplate = (template: Template): string | undefined => - Object.entries(template?.Resources || {}).find(([_, resource]) => resource.Type === 'AWS::DynamoDB::Table')?.[0]; + Object.entries(template?.Resources || {}).find(([, resource]) => resource.Type === 'AWS::DynamoDB::Table')?.[0]; } From 46037320c386665e9e70cdb634a9c76d8c592554 Mon Sep 17 00:00:00 2001 From: "0.618" Date: Thu, 4 Apr 2024 09:48:12 -0700 Subject: [PATCH 5/5] fix: fix lint error --- packages/amplify-util-mock/src/api/lambda-arn-to-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts b/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts index 50871068c55..f2759587e0a 100644 --- a/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts +++ b/packages/amplify-util-mock/src/api/lambda-arn-to-config.ts @@ -34,7 +34,7 @@ export const lambdaArnToConfig = async (context: $TSContext, arn: $TSAny): Promi throw new Error(`Cannot interpret Lambda ARN [${JSON.stringify(arn)}]${errorSuffix}`); } const lambdaNames = _.entries<{ service: string }>(_.get(stateManager.getMeta(), ['function'])) - .filter(([_, funcMeta]) => funcMeta.service === ServiceName.LambdaFunction) + .filter(([, funcMeta]) => funcMeta.service === ServiceName.LambdaFunction) .map(([key]) => key); const foundLambdaName = lambdaNames.find((name) => searchString.includes(name)); if (!foundLambdaName) {