diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
index 6b6f3492c52..536a972dfbc 100644
--- a/codebuild_specs/e2e_workflow_generated.yml
+++ b/codebuild_specs/e2e_workflow_generated.yml
@@ -565,203 +565,202 @@ batch:
           TEST_SUITE: src/__tests__/auth_5g.test.ts|src/__tests__/auth/admin-api.test.ts|src/__tests__/auth/hosted-ui.test.ts
       depend-on:
         - upb
-    - identifier: l_user_groups_s3_access_user_groups_build_function
+    - identifier: l_user_groups_s3_access_user_groups_build_function_yarn_modern
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/auth/user-groups-s3-access.test.ts|src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function.test.ts
+          TEST_SUITE: src/__tests__/auth/user-groups-s3-access.test.ts|src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function-yarn-modern.test.ts
       depend-on:
         - upb
-    - identifier: l_custom_resource_with_storage_dynamodb_simulator_export_pull_c
+    - identifier: l_build_function_custom_resource_with_storage_dynamodb_simulator
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/custom-resource-with-storage.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts|src/__tests__/export-pull-c.test.ts
+          TEST_SUITE: src/__tests__/build-function.test.ts|src/__tests__/custom-resource-with-storage.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - upb
-    - identifier: l_function_12_function_13_function_14
+    - identifier: l_export_pull_c_function_12_function_13
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts
+          TEST_SUITE: src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts
       depend-on:
         - upb
-    - identifier: l_function_15_function_2d_general_config_headless_init
+    - identifier: l_function_14_function_15_function_2d
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_15.test.ts|src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts
+          TEST_SUITE: src/__tests__/function_14.test.ts|src/__tests__/function_15.test.ts|src/__tests__/function_2d.test.ts
       depend-on:
         - upb
-    - identifier: l_help_hooks_c_init_force_push
+    - identifier: l_general_config_headless_init_help_hooks_c
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/help.test.ts|src/__tests__/hooks-c.test.ts|src/__tests__/init-force-push.test.ts
+          TEST_SUITE: src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts|src/__tests__/hooks-c.test.ts
       depend-on:
         - upb
-    - identifier: l_interactions_1_interactions_2_minify_cloudformation
+    - identifier: l_init_force_push_interactions_1_interactions_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts|src/__tests__/minify-cloudformation.test.ts
+          TEST_SUITE: src/__tests__/init-force-push.test.ts|src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - upb
-    - identifier: l_notifications_multi_env_notifications_sms_update_opensearch_simulator
+    - identifier: l_minify_cloudformation_notifications_multi_env_notifications_sms_update
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts|src/__tests__/opensearch-simulator/opensearch-simulator.test.ts
+          TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts
       depend-on:
         - upb
-    - identifier: l_parameter_store_1_parameter_store_2_android_analytics_pinpoint_config
+    - identifier: l_opensearch_simulator_parameter_store_1_parameter_store_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts|src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts
+          TEST_SUITE: src/__tests__/opensearch-simulator/opensearch-simulator.test.ts|src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts
       depend-on:
         - upb
-    - identifier: l_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config
+    - identifier: l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-notifications-pinpoint-config.test.ts
+          TEST_SUITE: src/__tests__/pinpoint/android-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/android-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/flutter-analytics-pinpoint-config.test.ts
       depend-on:
         - upb
-    - identifier: l_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config
+    - identifier: l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/pinpoint/ios-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-analytics-pinpoint-config.test.ts
+          TEST_SUITE: src/__tests__/pinpoint/flutter-notifications-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/ios-notifications-pinpoint-config.test.ts
       depend-on:
         - upb
-    - identifier: l_javascript_notifications_pinpoint_config_pr_previews_multi_env_1_pull_2
+    - identifier: l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/pinpoint/javascript-notifications-pinpoint-config.test.ts|src/__tests__/pr-previews-multi-env-1.test.ts|src/__tests__/pull-2.test.ts
+          TEST_SUITE: src/__tests__/pinpoint/javascript-analytics-pinpoint-config.test.ts|src/__tests__/pinpoint/javascript-notifications-pinpoint-config.test.ts|src/__tests__/pr-previews-multi-env-1.test.ts
       depend-on:
         - upb
-    - identifier: l_push_smoketest_ios_smoketest
+    - identifier: l_pull_2_push_smoketest_ios
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts
+          TEST_SUITE: src/__tests__/pull-2.test.ts|src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
       depend-on:
         - upb
-    - identifier: l_S3server_api_8_function_8
+    - identifier: l_smoketest_S3server_api_8
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts|src/__tests__/function_8.test.ts
+          TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/storage-simulator/S3server.test.ts|src/__tests__/api_8.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_iterative_update_locking_api_lambda_auth_2_layer_2
+    - identifier: l_function_8_schema_iterative_update_locking_api_lambda_auth_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/layer-2.test.ts
+          TEST_SUITE: src/__tests__/function_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_auth_13_function_5_schema_iterative_update_1
+    - identifier: l_layer_2_schema_auth_13_function_5
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts
+          TEST_SUITE: src/__tests__/layer-2.test.ts|src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
       depend-on:
         - upb
-    - identifier: l_auth_6_function_2a_schema_connection_2
+    - identifier: l_schema_iterative_update_1_auth_6_function_2a
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts
+          TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_function_1_api_9b_custom_policies_container
+    - identifier: l_schema_connection_2_schema_function_1_api_9b
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts
+          TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
       depend-on:
         - upb
-    - identifier: l_function_9b_schema_iterative_update_2_storage_1a
+    - identifier: l_custom_policies_container_function_9b_schema_iterative_update_2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts
+          TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts
       depend-on:
         - upb
-    - identifier: l_storage_1b_function_11_function_2b
+    - identifier: l_storage_1a_storage_1b_function_11
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts
+          TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
       depend-on:
         - upb
-    - identifier: l_function_7_api_connection_migration2_api_4
+    - identifier: l_function_2b_function_7_api_connection_migration2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts
+          TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/function_7.test.ts|src/__tests__/migration/api.connection.migration2.test.ts
       depend-on:
         - upb
-    - identifier: l_containers_api_secrets_storage_4_schema_auth_10
+    - identifier: l_api_4_containers_api_secrets_storage_4
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts
+          TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts
       depend-on:
         - upb
-    - identifier: l_geo_multi_env_searchable_datastore_resolvers
+    - identifier: l_schema_auth_10_geo_multi_env_searchable_datastore
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts
+          TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts
       depend-on:
         - upb
-    - identifier: l_schema_key_api_5_apigw
+    - identifier: l_resolvers_schema_key_api_5
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts
+          TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts
       depend-on:
         - upb
-    - identifier: l_api_lambda_auth_1_api_key_migration2_schema_searchable
+    - identifier: l_apigw_api_lambda_auth_1_api_key_migration2
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts
+          TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts
       depend-on:
         - upb
-    - identifier: l_api_key_migration1_schema_auth_14_api_3
+    - identifier: l_schema_searchable_api_key_migration1_schema_auth_14
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts
+          TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts
       depend-on:
         - upb
-    - identifier: l_api_6b_api_1_layer_1
+    - identifier: l_api_3_api_6b_api_1
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts
+          TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts
       depend-on:
         - upb
-    - identifier: l_api_key_migration4_schema_iterative_update_4_function_1
+    - identifier: l_layer_1_api_key_migration4_schema_iterative_update_4
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          TEST_SUITE: src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts
+          TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts
       depend-on:
         - upb
-    - identifier: l_storage_5
+    - identifier: l_function_1_storage_5
       buildspec: codebuild_specs/run_e2e_tests_linux.yml
       env:
         variables:
-          compute-type: BUILD_GENERAL1_SMALL
-          TEST_SUITE: src/__tests__/storage-5.test.ts
+          TEST_SUITE: src/__tests__/function_1.test.ts|src/__tests__/storage-5.test.ts
       depend-on:
         - upb
     - identifier: l_datastore_modelgen
@@ -1847,315 +1846,324 @@ batch:
       depend-on:
         - build_windows
         - upb
-    - identifier: w_user_groups_build_function
+    - identifier: w_user_groups_build_function_yarn_modern
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function.test.ts
+          TEST_SUITE: src/__tests__/auth/user-groups.test.ts|src/__tests__/build-function-yarn-modern.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_dynamodb_simulator_export_pull_c
+    - identifier: w_build_function_dynamodb_simulator
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts|src/__tests__/export-pull-c.test.ts
+          TEST_SUITE: src/__tests__/build-function.test.ts|src/__tests__/dynamodb-simulator/dynamodb-simulator.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_12_function_13
+    - identifier: w_export_pull_c_function_12
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_12.test.ts|src/__tests__/function_13.test.ts
+          TEST_SUITE: src/__tests__/export-pull-c.test.ts|src/__tests__/function_12.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_14_function_2d
+    - identifier: w_function_13_function_14
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_14.test.ts|src/__tests__/function_2d.test.ts
+          TEST_SUITE: src/__tests__/function_13.test.ts|src/__tests__/function_14.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_general_config_headless_init_help
+    - identifier: w_function_2d_general_config_headless_init
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/general-config/general-config-headless-init.test.ts|src/__tests__/help.test.ts
+          TEST_SUITE: src/__tests__/function_2d.test.ts|src/__tests__/general-config/general-config-headless-init.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_init_force_push_interactions_1
+    - identifier: w_help_init_force_push
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/init-force-push.test.ts|src/__tests__/interactions-1.test.ts
-          CLI_REGION: us-west-2
+          TEST_SUITE: src/__tests__/help.test.ts|src/__tests__/init-force-push.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_interactions_2_minify_cloudformation
+    - identifier: w_interactions_1_interactions_2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/interactions-2.test.ts|src/__tests__/minify-cloudformation.test.ts
+          TEST_SUITE: src/__tests__/interactions-1.test.ts|src/__tests__/interactions-2.test.ts
           CLI_REGION: us-west-2
       depend-on:
         - build_windows
         - upb
-    - identifier: w_notifications_multi_env_notifications_sms_update
+    - identifier: w_minify_cloudformation_notifications_multi_env
+      buildspec: codebuild_specs/run_e2e_tests_windows.yml
+      env:
+        type: WINDOWS_SERVER_2019_CONTAINER
+        image: $WINDOWS_IMAGE_2019
+        variables:
+          TEST_SUITE: src/__tests__/minify-cloudformation.test.ts|src/__tests__/notifications-multi-env.test.ts
+      depend-on:
+        - build_windows
+        - upb
+    - identifier: w_notifications_sms_update_parameter_store_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/notifications-multi-env.test.ts|src/__tests__/notifications-sms-update.test.ts
+          TEST_SUITE: src/__tests__/notifications-sms-update.test.ts|src/__tests__/parameter-store-1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_parameter_store_1_parameter_store_2
+    - identifier: w_parameter_store_2_push
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/parameter-store-1.test.ts|src/__tests__/parameter-store-2.test.ts
+          TEST_SUITE: src/__tests__/parameter-store-2.test.ts|src/__tests__/push.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_push_smoketest_ios
+    - identifier: w_smoketest_ios_smoketest
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/push.test.ts|src/__tests__/smoke-tests/smoketest-ios.test.ts
+          TEST_SUITE: src/__tests__/smoke-tests/smoketest-ios.test.ts|src/__tests__/smoke-tests/smoketest.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_smoketest_api_8
+    - identifier: w_api_8_schema_iterative_update_locking
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/smoke-tests/smoketest.test.ts|src/__tests__/api_8.test.ts
+          TEST_SUITE: src/__tests__/api_8.test.ts|src/__tests__/schema-iterative-update-locking.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_iterative_update_locking_api_lambda_auth_2
+    - identifier: w_api_lambda_auth_2_schema_auth_13
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-locking.test.ts|src/__tests__/graphql-v2/api_lambda_auth_2.test.ts
+          TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_2.test.ts|src/__tests__/schema-auth-13.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_auth_13_function_5
+    - identifier: w_function_5_schema_iterative_update_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-auth-13.test.ts|src/__tests__/function_5.test.ts
+          TEST_SUITE: src/__tests__/function_5.test.ts|src/__tests__/schema-iterative-update-1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_iterative_update_1_auth_6
+    - identifier: w_auth_6_function_2a
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-1.test.ts|src/__tests__/auth_6.test.ts
+          TEST_SUITE: src/__tests__/auth_6.test.ts|src/__tests__/function_2a.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_2a_schema_connection_2
+    - identifier: w_schema_connection_2_schema_function_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_2a.test.ts|src/__tests__/schema-connection-2.test.ts
+          TEST_SUITE: src/__tests__/schema-connection-2.test.ts|src/__tests__/schema-function-1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_function_1_api_9b
+    - identifier: w_api_9b_custom_policies_container
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-function-1.test.ts|src/__tests__/api_9b.test.ts
+          TEST_SUITE: src/__tests__/api_9b.test.ts|src/__tests__/custom_policies_container.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_custom_policies_container_function_9b
+    - identifier: w_function_9b_schema_iterative_update_2
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/custom_policies_container.test.ts|src/__tests__/function_9b.test.ts
+          TEST_SUITE: src/__tests__/function_9b.test.ts|src/__tests__/schema-iterative-update-2.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_iterative_update_2_storage_1a
+    - identifier: w_storage_1a_storage_1b
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-2.test.ts|src/__tests__/storage-1a.test.ts
+          TEST_SUITE: src/__tests__/storage-1a.test.ts|src/__tests__/storage-1b.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_storage_1b_function_11
+    - identifier: w_function_11_function_2b
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/storage-1b.test.ts|src/__tests__/function_11.test.ts
+          TEST_SUITE: src/__tests__/function_11.test.ts|src/__tests__/function_2b.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_function_2b_api_connection_migration2
+    - identifier: w_api_connection_migration2_api_4
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/function_2b.test.ts|src/__tests__/migration/api.connection.migration2.test.ts
+          TEST_SUITE: src/__tests__/migration/api.connection.migration2.test.ts|src/__tests__/api_4.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_4_containers_api_secrets
+    - identifier: w_containers_api_secrets_storage_4
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_4.test.ts|src/__tests__/containers-api-secrets.test.ts
+          TEST_SUITE: src/__tests__/containers-api-secrets.test.ts|src/__tests__/storage-4.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_storage_4_schema_auth_10
+    - identifier: w_schema_auth_10_geo_multi_env
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/storage-4.test.ts|src/__tests__/schema-auth-10.test.ts
+          TEST_SUITE: src/__tests__/schema-auth-10.test.ts|src/__tests__/geo-multi-env.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_geo_multi_env_searchable_datastore
+    - identifier: w_searchable_datastore_resolvers
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/geo-multi-env.test.ts|src/__tests__/graphql-v2/searchable-datastore.test.ts
+          TEST_SUITE: src/__tests__/graphql-v2/searchable-datastore.test.ts|src/__tests__/resolvers.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_resolvers_schema_key
+    - identifier: w_schema_key_api_5
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/resolvers.test.ts|src/__tests__/schema-key.test.ts
+          TEST_SUITE: src/__tests__/schema-key.test.ts|src/__tests__/api_5.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_5_apigw
+    - identifier: w_apigw_api_lambda_auth_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_5.test.ts|src/__tests__/apigw.test.ts
+          TEST_SUITE: src/__tests__/apigw.test.ts|src/__tests__/graphql-v2/api_lambda_auth_1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_lambda_auth_1_api_key_migration2
+    - identifier: w_api_key_migration2_schema_searchable
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/graphql-v2/api_lambda_auth_1.test.ts|src/__tests__/migration/api.key.migration2.test.ts
+          TEST_SUITE: src/__tests__/migration/api.key.migration2.test.ts|src/__tests__/schema-searchable.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_searchable_api_key_migration1
+    - identifier: w_api_key_migration1_schema_auth_14
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-searchable.test.ts|src/__tests__/migration/api.key.migration1.test.ts
+          TEST_SUITE: src/__tests__/migration/api.key.migration1.test.ts|src/__tests__/schema-auth-14.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_auth_14_api_3
+    - identifier: w_api_3_api_6b
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-auth-14.test.ts|src/__tests__/api_3.test.ts
+          TEST_SUITE: src/__tests__/api_3.test.ts|src/__tests__/api_6b.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_api_6b_api_1
+    - identifier: w_api_1_layer_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/api_6b.test.ts|src/__tests__/api_1.test.ts
+          TEST_SUITE: src/__tests__/api_1.test.ts|src/__tests__/layer-1.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_layer_1_api_key_migration4
+    - identifier: w_api_key_migration4_schema_iterative_update_4
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/layer-1.test.ts|src/__tests__/migration/api.key.migration4.test.ts
+          TEST_SUITE: src/__tests__/migration/api.key.migration4.test.ts|src/__tests__/schema-iterative-update-4.test.ts
       depend-on:
         - build_windows
         - upb
-    - identifier: w_schema_iterative_update_4_function_1
+    - identifier: w_function_1
       buildspec: codebuild_specs/run_e2e_tests_windows.yml
       env:
         type: WINDOWS_SERVER_2019_CONTAINER
         image: $WINDOWS_IMAGE_2019
         variables:
-          TEST_SUITE: src/__tests__/schema-iterative-update-4.test.ts|src/__tests__/function_1.test.ts
+          TEST_SUITE: src/__tests__/function_1.test.ts
       depend-on:
         - build_windows
         - upb
diff --git a/codebuild_specs/wait_for_ids.json b/codebuild_specs/wait_for_ids.json
index 57bc8a8a436..a91e9c19004 100644
--- a/codebuild_specs/wait_for_ids.json
+++ b/codebuild_specs/wait_for_ids.json
@@ -1,18 +1,16 @@
 [
-  "l_S3server_api_8_function_8",
   "l_amplify_app",
   "l_amplify_configure_env_2_init_d",
   "l_analytics_kinesis_analytics_pinpoint_flutter_analytics_pinpoint_js",
-  "l_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config_flutter_notifications_pinpoint_config",
+  "l_android_analytics_pinpoint_config_android_notifications_pinpoint_config_flutter_analytics_pinpoint_config",
   "l_api_2b_api_6c_api_9a",
+  "l_api_3_api_6b_api_1",
+  "l_api_4_containers_api_secrets_storage_4",
   "l_api_6a_auth_7b_export_pull_b",
-  "l_api_6b_api_1_layer_1",
   "l_api_7_export_pull_a_function_9a",
-  "l_api_key_migration1_schema_auth_14_api_3",
-  "l_api_key_migration4_schema_iterative_update_4_function_1",
   "l_api_key_migration_2_v8",
   "l_api_key_migration_v8",
-  "l_api_lambda_auth_1_api_key_migration2_schema_searchable",
+  "l_apigw_api_lambda_auth_1_api_key_migration2",
   "l_auth_12_auth_2g_auth_2h",
   "l_auth_1a_auth_trigger_custom_policies_function",
   "l_auth_1b_delete_geo_add_c",
@@ -25,7 +23,6 @@
   "l_auth_4b_auth_8a_export_pull_d",
   "l_auth_4c_auth_5a_auth_5c",
   "l_auth_5g_admin_api_hosted_ui",
-  "l_auth_6_function_2a_schema_connection_2",
   "l_auth_7a_auth_8c_feature_flags",
   "l_auth_9_custom_resources_env_5",
   "l_auth_app_client_secret_migration_v12",
@@ -36,19 +33,22 @@
   "l_auth_migration_amplify_remove_api_2a",
   "l_auth_migration_v12",
   "l_auth_oauth_lambda_migration_v12",
+  "l_build_function_custom_resource_with_storage_dynamodb_simulator",
   "l_container_hosting_init_b_notifications_apns",
   "l_containers_api_1",
   "l_containers_api_2",
-  "l_containers_api_secrets_storage_4_schema_auth_10",
-  "l_custom_resource_with_storage_dynamodb_simulator_export_pull_c",
+  "l_custom_policies_container_function_9b_schema_iterative_update_2",
   "l_datastore_modelgen",
   "l_diagnose_hooks_a_mock_api",
   "l_env_1_geo_add_a_init_a",
   "l_env_3",
   "l_env_4_frontend_config_drift_schema_auth_4d",
+  "l_export_pull_c_function_12_function_13",
+  "l_flutter_notifications_pinpoint_config_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config",
   "l_function_10_function_9c_function_permissions",
-  "l_function_12_function_13_function_14",
-  "l_function_15_function_2d_general_config_headless_init",
+  "l_function_14_function_15_function_2d",
+  "l_function_1_storage_5",
+  "l_function_2b_function_7_api_connection_migration2",
   "l_function_2c_function_3b_function_4",
   "l_function_3a_init_go",
   "l_function_3a_init_python",
@@ -57,8 +57,8 @@
   "l_special_case",
   "l_http_migration",
   "l_function_6_storage_2_export",
-  "l_function_7_api_connection_migration2_api_4",
-  "l_function_9b_schema_iterative_update_2_storage_1a",
+  "l_function_8_schema_iterative_update_locking_api_lambda_auth_2",
+  "l_general_config_headless_init_help_hooks_c",
   "l_geo_add_b_s3_sse_schema_auth_4a",
   "l_geo_add_d_geo_import_3_hosting",
   "l_geo_add_e",
@@ -66,14 +66,12 @@
   "l_geo_headless_api_key_migration5_schema_auth_1a",
   "l_geo_import_1a_geo_import_2_global_sandbox_b",
   "l_geo_import_1b_global_sandbox_a_init_e",
-  "l_geo_multi_env_searchable_datastore_resolvers",
   "l_geo_remove_1",
   "l_geo_remove_2",
   "l_geo_remove_3",
   "l_geo_update_1",
   "l_geo_update_2",
   "l_git_clone_attach_init_c_layer_4",
-  "l_help_hooks_c_init_force_push",
   "l_hooks_b_notifications_analytics_compatibility_sms_1_plugin",
   "l_hostingPROD",
   "l_iam_permissions_boundary_node_function_notifications_sms",
@@ -92,24 +90,26 @@
   "l_import_s3_2c",
   "l_import_s3_3",
   "l_init_f_auth_5d_configure_project",
-  "l_interactions_1_interactions_2_minify_cloudformation",
+  "l_init_force_push_interactions_1_interactions_2",
   "l_interactions_schema_model_a_tags",
-  "l_ios_analytics_pinpoint_config_ios_notifications_pinpoint_config_javascript_analytics_pinpoint_config",
-  "l_javascript_notifications_pinpoint_config_pr_previews_multi_env_1_pull_2",
+  "l_javascript_analytics_pinpoint_config_javascript_notifications_pinpoint_config_pr_previews_multi_env_1",
   "l_js_frontend_config",
+  "l_layer_1_api_key_migration4_schema_iterative_update_4",
+  "l_layer_2_schema_auth_13_function_5",
   "l_layer_3_api_connection_migration_api_key_migration3",
+  "l_minify_cloudformation_notifications_multi_env_notifications_sms_update",
   "l_notifications_analytics_compatibility_in_app_2_schema_auth_11_c_schema_auth_2b",
   "l_notifications_analytics_compatibility_sms_2_analytics_2_global_sandbox_c",
   "l_notifications_fcm_notifications_in_app_messaging_env_2_with_babel_config",
   "l_notifications_in_app_messaging",
-  "l_notifications_multi_env_notifications_sms_update_opensearch_simulator",
   "l_notifications_sms_pull_pull_auth_10",
-  "l_parameter_store_1_parameter_store_2_android_analytics_pinpoint_config",
+  "l_opensearch_simulator_parameter_store_1_parameter_store_2",
   "l_predictions_schema_auth_11_b_schema_auth_1b",
-  "l_push_smoketest_ios_smoketest",
+  "l_pull_2_push_smoketest_ios",
+  "l_resolvers_schema_key_api_5",
+  "l_schema_auth_10_geo_multi_env_searchable_datastore",
   "l_schema_auth_11_a",
   "l_schema_auth_12_schema_auth_3_schema_function_2",
-  "l_schema_auth_13_function_5_schema_iterative_update_1",
   "l_schema_auth_15",
   "l_schema_auth_2a_schema_auth_7a_schema_auth_7b",
   "l_schema_auth_4b_schema_model_e_schema_versioned",
@@ -123,32 +123,38 @@
   "l_schema_auth_9_b_schema_iterative_rollback_1_predictions_migration",
   "l_schema_auth_9_c_storage_3_auth_11",
   "l_schema_connection_1",
-  "l_schema_function_1_api_9b_custom_policies_container",
-  "l_schema_iterative_update_locking_api_lambda_auth_2_layer_2",
-  "l_schema_key_api_5_apigw",
+  "l_schema_connection_2_schema_function_1_api_9b",
+  "l_schema_iterative_update_1_auth_6_function_2a",
   "l_schema_model_b_schema_model_d_auth_5f",
   "l_schema_predictions_model_migration_auth_3c",
+  "l_schema_searchable_api_key_migration1_schema_auth_14",
   "l_searchable_migration",
+  "l_smoketest_S3server_api_8",
   "l_smoketest_amplify_app",
-  "l_storage_1b_function_11_function_2b",
-  "l_storage_5",
+  "l_storage_1a_storage_1b_function_11",
   "l_studio_modelgen_custom_transformers_notifications_in_app_messaging_env_1",
   "l_uibuilder",
-  "l_user_groups_s3_access_user_groups_build_function",
+  "l_user_groups_s3_access_user_groups_build_function_yarn_modern",
   "w_amplify_configure_init_d",
   "w_amplify_remove_api_2a",
   "w_analytics_2_global_sandbox_c",
   "w_analytics_kinesis_analytics_pinpoint_flutter",
   "w_analytics_pinpoint_js_auth_2a",
   "w_api_10_api_7",
+  "w_api_1_layer_1",
   "w_api_2b_api_6c",
-  "w_api_4_containers_api_secrets",
-  "w_api_5_apigw",
+  "w_api_3_api_6b",
   "w_api_6a_auth_7b",
-  "w_api_6b_api_1",
+  "w_api_8_schema_iterative_update_locking",
   "w_api_9a_auth_2h",
+  "w_api_9b_custom_policies_container",
+  "w_api_connection_migration2_api_4",
   "w_api_connection_migration_api_key_migration3",
-  "w_api_lambda_auth_1_api_key_migration2",
+  "w_api_key_migration1_schema_auth_14",
+  "w_api_key_migration2_schema_searchable",
+  "w_api_key_migration4_schema_iterative_update_4",
+  "w_api_lambda_auth_2_schema_auth_13",
+  "w_apigw_api_lambda_auth_1",
   "w_auth_11_auth_1b",
   "w_auth_2b_auth_2d",
   "w_auth_2c",
@@ -160,38 +166,41 @@
   "w_auth_5a_auth_5c",
   "w_auth_5e_auth_8b",
   "w_auth_5g_admin_api",
+  "w_auth_6_function_2a",
   "w_auth_7a_auth_8c",
   "w_auth_9_env_5",
   "w_auth_trigger_custom_policies_function",
+  "w_build_function_dynamodb_simulator",
   "w_configure_project_init_c",
   "w_container_hosting_init_b",
   "w_containers_api_1",
   "w_containers_api_2",
-  "w_custom_policies_container_function_9b",
+  "w_containers_api_secrets_storage_4",
   "w_custom_transformers_notifications_in_app_messaging_env_1",
   "w_delete_geo_add_c",
-  "w_dynamodb_simulator_export_pull_c",
   "w_env_1_geo_add_a",
   "w_env_3",
   "w_env_4_frontend_config_drift",
   "w_export_pull_a_function_9a",
   "w_export_pull_b_init_special_case",
+  "w_export_pull_c_function_12",
   "w_export_pull_d_schema_auth_5a",
   "w_feature_flags_geo_import_1b",
+  "w_function_1",
   "w_function_10_function_9c",
-  "w_function_12_function_13",
-  "w_function_14_function_2d",
-  "w_function_2a_schema_connection_2",
-  "w_function_2b_api_connection_migration2",
+  "w_function_11_function_2b",
+  "w_function_13_function_14",
+  "w_function_2d_general_config_headless_init",
+  "w_function_5_schema_iterative_update_1",
+  "w_function_9b_schema_iterative_update_2",
   "w_function_permissions_geo_import_1a",
-  "w_general_config_headless_init_help",
   "w_geo_add_b_s3_sse",
   "w_geo_add_d_geo_import_3",
   "w_geo_headless_api_key_migration5",
   "w_geo_import_2_global_sandbox_b",
-  "w_geo_multi_env_searchable_datastore",
   "w_geo_remove_1",
   "w_global_sandbox_a_init_e",
+  "w_help_init_force_push",
   "w_hooks_b_notifications_analytics_compatibility_sms_1",
   "w_hosted_ui_user_groups_s3_access",
   "w_hostingPROD",
@@ -202,28 +211,24 @@
   "w_import_s3_3",
   "w_init_a_schema_auth_4c",
   "w_init_f_auth_5d",
-  "w_init_force_push_interactions_1",
-  "w_interactions_2_minify_cloudformation",
+  "w_interactions_1_interactions_2",
   "w_interactions_schema_model_a",
   "w_js_frontend_config",
-  "w_layer_1_api_key_migration4",
   "w_layer_4_function_2c",
+  "w_minify_cloudformation_notifications_multi_env",
   "w_node_function_notifications_sms",
   "w_notifications_analytics_compatibility_in_app_1_notifications_analytics_compatibility_sms_2",
   "w_notifications_analytics_compatibility_in_app_2_schema_auth_11_c",
   "w_notifications_apns_notifications_fcm",
   "w_notifications_in_app_messaging",
   "w_notifications_in_app_messaging_env_2_with_babel_config",
-  "w_notifications_multi_env_notifications_sms_update",
   "w_notifications_sms_pull_auth_10",
-  "w_parameter_store_1_parameter_store_2",
+  "w_notifications_sms_update_parameter_store_1",
+  "w_parameter_store_2_push",
   "w_plugin_studio_modelgen",
   "w_predictions_schema_auth_11_b",
-  "w_push_smoketest_ios",
-  "w_resolvers_schema_key",
+  "w_schema_auth_10_geo_multi_env",
   "w_schema_auth_11_a",
-  "w_schema_auth_13_function_5",
-  "w_schema_auth_14_api_3",
   "w_schema_auth_15",
   "w_schema_auth_1a_schema_auth_5b",
   "w_schema_auth_1b_schema_auth_2a",
@@ -242,22 +247,18 @@
   "w_schema_auth_9_b_predictions_migration",
   "w_schema_auth_9_c_storage_3",
   "w_schema_connection_1",
+  "w_schema_connection_2_schema_function_1",
   "w_schema_data_access_patterns_schema_model_c",
-  "w_schema_function_1_api_9b",
-  "w_schema_iterative_update_1_auth_6",
-  "w_schema_iterative_update_2_storage_1a",
   "w_schema_iterative_update_3_auth_migration",
-  "w_schema_iterative_update_4_function_1",
-  "w_schema_iterative_update_locking_api_lambda_auth_2",
+  "w_schema_key_api_5",
   "w_schema_model_d_auth_5f",
   "w_schema_predictions_model_migration",
-  "w_schema_searchable_api_key_migration1",
   "w_schema_versioned_auth_1c",
+  "w_searchable_datastore_resolvers",
   "w_searchable_migration",
-  "w_smoketest_api_8",
-  "w_storage_1b_function_11",
+  "w_smoketest_ios_smoketest",
+  "w_storage_1a_storage_1b",
   "w_storage_2_iam_permissions_boundary",
-  "w_storage_4_schema_auth_10",
   "w_tags_auth_1a",
-  "w_user_groups_build_function"
+  "w_user_groups_build_function_yarn_modern"
 ]
diff --git a/packages/amplify-cli-core/API.md b/packages/amplify-cli-core/API.md
index d9ee3f5db5d..935143587ee 100644
--- a/packages/amplify-cli-core/API.md
+++ b/packages/amplify-cli-core/API.md
@@ -1488,7 +1488,7 @@ export interface PackageManager {
     // (undocumented)
     readonly executable: string;
     // (undocumented)
-    getInstallArgs: (buildType: BuildType) => string[];
+    getInstallArgs: (buildType: BuildType, resourceDir?: string) => string[];
     // (undocumented)
     getRunScriptArgs: (scriptName: string) => string[];
     // (undocumented)
diff --git a/packages/amplify-cli-core/src/utils/packageManager.ts b/packages/amplify-cli-core/src/utils/packageManager.ts
index d58fd3a4031..d97a962dfd3 100644
--- a/packages/amplify-cli-core/src/utils/packageManager.ts
+++ b/packages/amplify-cli-core/src/utils/packageManager.ts
@@ -22,7 +22,7 @@ export interface PackageManager {
   readonly displayValue: string;
   version?: SemVer;
   getRunScriptArgs: (scriptName: string) => string[];
-  getInstallArgs: (buildType: BuildType) => string[];
+  getInstallArgs: (buildType: BuildType, resourceDir?: string) => string[];
 }
 
 class NpmPackageManager implements PackageManager {
@@ -43,9 +43,22 @@ class YarnPackageManager implements PackageManager {
   version?: SemVer;
 
   getRunScriptArgs = (scriptName: string) => [scriptName];
-  getInstallArgs = (buildType = BuildType.PROD) => {
+  getInstallArgs = (buildType = BuildType.PROD, resourceDir = '') => {
     const useYarnModern = this.version?.major && this.version?.major > 1;
-    return (useYarnModern ? ['install'] : ['--no-bin-links']).concat(buildType === 'PROD' ? ['--production'] : []);
+    /**
+     * Since Yarn 2, resourceDir needs to be treated as a separate project,
+     * otherwise it'll be hoisted to use the lock.file from the parent directory,
+     * so we need to create a lock file for it.
+     * ref: https://github.com/yarnpkg/yarn/issues/5716#issuecomment-817330338
+     */
+    if (useYarnModern) {
+      if (fs.existsSync(`${resourceDir}/${this.lockFile}`)) {
+        console.log(`${resourceDir}/${this.lockFile} already exists.`);
+      } else {
+        fs.writeFileSync(`${resourceDir}/${this.lockFile}`, '');
+      }
+    }
+    return (useYarnModern ? ['workspaces', 'focus'] : ['--no-bin-links']).concat(buildType === 'PROD' ? ['--production'] : []);
   };
 }
 
diff --git a/packages/amplify-e2e-tests/src/__tests__/build-function-yarn-modern.test.ts b/packages/amplify-e2e-tests/src/__tests__/build-function-yarn-modern.test.ts
new file mode 100644
index 00000000000..aebac9607cf
--- /dev/null
+++ b/packages/amplify-e2e-tests/src/__tests__/build-function-yarn-modern.test.ts
@@ -0,0 +1,37 @@
+import execa from 'execa';
+import {
+  addFunction,
+  createNewProjectDir,
+  deleteProject,
+  deleteProjectDir,
+  functionBuild,
+  initJSProjectWithProfile,
+} from '@aws-amplify/amplify-e2e-core';
+
+describe('build successfully via Yarn Modern', () => {
+  let projRoot: string;
+
+  beforeEach(async () => {
+    projRoot = await createNewProjectDir('analytics');
+    await execa('corepack', ['enable'], { cwd: projRoot });
+    await execa('yarn', ['init', '-2'], { cwd: projRoot });
+    await execa('yarn', ['--version'], { cwd: projRoot });
+  });
+
+  afterEach(async () => {
+    await deleteProject(projRoot);
+    deleteProjectDir(projRoot);
+  });
+
+  it('add analytics and function', async () => {
+    await initJSProjectWithProfile(projRoot, {});
+    await addFunction(
+      projRoot,
+      {
+        functionTemplate: 'Hello World',
+      },
+      'nodejs',
+    );
+    await functionBuild(projRoot);
+  });
+});
diff --git a/packages/amplify-graphiql-explorer/package.json b/packages/amplify-graphiql-explorer/package.json
index 3af12bb5cdc..c81646f7bfd 100644
--- a/packages/amplify-graphiql-explorer/package.json
+++ b/packages/amplify-graphiql-explorer/package.json
@@ -66,7 +66,7 @@
     "util": "^0.12.4",
     "web-vitals": "^0.2.4",
     "webpack": "^5.64.4",
-    "webpack-dev-server": "^4.6.0",
+    "webpack-dev-server": "^4.15.2",
     "webpack-manifest-plugin": "^4.0.2",
     "workbox-webpack-plugin": "^6.4.1"
   },
diff --git a/packages/amplify-nodejs-function-runtime-provider/src/utils/legacyBuild.ts b/packages/amplify-nodejs-function-runtime-provider/src/utils/legacyBuild.ts
index c31b1fdd46c..f6d8a0d3e71 100644
--- a/packages/amplify-nodejs-function-runtime-provider/src/utils/legacyBuild.ts
+++ b/packages/amplify-nodejs-function-runtime-provider/src/utils/legacyBuild.ts
@@ -53,7 +53,7 @@ const runPackageManagerInstall = async (resourceDir: string, buildType: BuildTyp
     return;
   }
 
-  const args = packageManager.getInstallArgs(buildType);
+  const args = packageManager.getInstallArgs(buildType, resourceDir);
   await runPackageManager(packageManager, args, resourceDir);
 };
 
diff --git a/shared-scripts.sh b/shared-scripts.sh
index 7013479a6fa..0f035056693 100644
--- a/shared-scripts.sh
+++ b/shared-scripts.sh
@@ -40,7 +40,7 @@ function loadCache {
     # create directory if it doesn't exist yet
     mkdir -p $localPath
     # check if cache exists in s3
-    if ! aws s3 ls $s3Path > /dev/null; then
+    if ! aws s3 ls $s3Path >/dev/null; then
         echo "Cache not found."
         exit 0
     fi
@@ -57,7 +57,7 @@ function loadCacheFile {
     s3Path="s3://$CACHE_BUCKET_NAME/$CODEBUILD_SOURCE_VERSION/$alias"
     echo loading cache file from $s3Path
     # check if cache file exists in s3
-    if ! aws s3 ls $s3Path > /dev/null; then
+    if ! aws s3 ls $s3Path >/dev/null; then
         echo "Cache file not found."
         exit 0
     fi
@@ -90,6 +90,7 @@ function _installAndCacheDependencies {
     storeCache $CODEBUILD_SRC_DIR repo
     storeCache $HOME/.cache .cache
 }
+
 function _buildLinux {
     echo Linux Build
     yarn --immutable
@@ -115,8 +116,8 @@ function _validateRollbackTargetVersion {
     loadCache repo $CODEBUILD_SRC_DIR
     loadCache .cache $HOME/.cache
     if [ -z "$ROLLBACK_TARGET_VERSION" ]; then
-      echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
-      exit 1
+        echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
+        exit 1
     fi
     yarn ts-node scripts/verify-deployment.ts -v $ROLLBACK_TARGET_VERSION
 }
@@ -154,28 +155,28 @@ function _verifyGeneratedE2EWorkflow {
     loadCache .cache $HOME/.cache
 
     # backup current file and remove regions, they are not deterministic
-    cat codebuild_specs/e2e_workflow_generated.yml | grep -v "CLI_REGION:" > codebuild_specs/e2e_workflow_generated.yml.old.trimmed
+    cat codebuild_specs/e2e_workflow_generated.yml | grep -v "CLI_REGION:" >codebuild_specs/e2e_workflow_generated.yml.old.trimmed
 
     # regenerate e2e workflow
     yarn split-e2e-tests-codebuild
 
     # remove regions from generated file, they are not deterministic
-    cat codebuild_specs/e2e_workflow_generated.yml | grep -v "CLI_REGION:" > codebuild_specs/e2e_workflow_generated.yml.trimmed
+    cat codebuild_specs/e2e_workflow_generated.yml | grep -v "CLI_REGION:" >codebuild_specs/e2e_workflow_generated.yml.trimmed
 
     changed_lines_in_e2e_workflow_generated=$(diff codebuild_specs/e2e_workflow_generated.yml.old.trimmed codebuild_specs/e2e_workflow_generated.yml.trimmed | wc -l)
 
     if [[ changed_lines_in_e2e_workflow_generated -gt 0 ]]; then
-      echo "Fail! An uncommitted drift in E2E workflow has been detected - e2e_workflow_generated.yml. Please run 'yarn split-e2e-tests-codebuild' and commit the result."
-      diff codebuild_specs/e2e_workflow_generated.yml.old.trimmed codebuild_specs/e2e_workflow_generated.yml.trimmed
-      exit 1;
+        echo "Fail! An uncommitted drift in E2E workflow has been detected - e2e_workflow_generated.yml. Please run 'yarn split-e2e-tests-codebuild' and commit the result."
+        diff codebuild_specs/e2e_workflow_generated.yml.old.trimmed codebuild_specs/e2e_workflow_generated.yml.trimmed
+        exit 1
     fi
 
     # check if wait_for_ids.json changed.
     changed_wait_for_ids_manifest=$(git status | grep -F wait_for_ids.json | wc -l)
 
     if [[ changed_wait_for_ids_manifest -gt 0 ]]; then
-      echo "Fail! An uncommitted drift in E2E workflow has been detected - wait_for_ids.json. Please run 'yarn split-e2e-tests-codebuild' and commit the result."
-      exit 1;
+        echo "Fail! An uncommitted drift in E2E workflow has been detected - wait_for_ids.json. Please run 'yarn split-e2e-tests-codebuild' and commit the result."
+        exit 1
     fi
 
     echo "Success! No drift detected in E2E workflow."
@@ -231,7 +232,7 @@ function _publishToLocalRegistry {
     cat UNIFIED_CHANGELOG.md
 
     echo Save new amplify Github tag
-    node scripts/echo-current-cli-version.js > .amplify-pkg-version
+    node scripts/echo-current-cli-version.js >.amplify-pkg-version
 
     echo LS HOME
     ls $CODEBUILD_SRC_DIR/..
@@ -306,8 +307,7 @@ function _convertCoverage {
 }
 # https://docs.codecov.com/docs/codecov-uploader#integrity-checking-the-uploader
 function _uploadCoverageLinux {
-    if [ -z ${CODECOV_TOKEN+x} ]
-    then
+    if [ -z ${CODECOV_TOKEN+x} ]; then
         echo "CODECOV_TOKEN not set: No coverage will be uploaded."
     else
         curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import # One-time step
@@ -564,7 +564,8 @@ function _integrationTest {
 
     echo "running auth server in background"
     export NODE_OPTIONS=--openssl-legacy-provider
-    nohup yarn start > server_output.txt & disown $!
+    nohup yarn start >server_output.txt &
+    disown $!
     echo "Polling for server ready message"
     while ! grep -Fxq "You can now view aws-amplify-cypress-auth in the browser." server_output.txt; do echo "Waiting for server to start" && sleep 1; done
     echo "server started"
@@ -584,7 +585,6 @@ function _integrationTest {
     expect ../amplify-cli/codebuild_specs/exp-files/delete.exp
     aws s3 rb "$DEPLOYMENT_BUCKET" --force
 
-
     echo "Clone API test package"
     cd .. && pwd
     git clone $API_CLONE_URL
@@ -605,7 +605,8 @@ function _integrationTest {
 
     echo "running api server in background"
     export NODE_OPTIONS=--openssl-legacy-provider
-    nohup yarn start > server_output.txt & disown $!
+    nohup yarn start >server_output.txt &
+    disown $!
     echo "Polling for server ready message"
     while ! grep -Fxq "You can now view aws-amplify-cypress-api in the browser." server_output.txt; do echo "Waiting for server to start" && sleep 1; done
     echo "server started"
@@ -714,7 +715,7 @@ function _publishToNpm {
 
     ./out/amplify-pkg-linux-x64 --version
     echo Authenticate with npm
-    echo "//registry.npmjs.org/:_authToken=$NPM_PUBLISH_TOKEN" > ~/.npmrc
+    echo "//registry.npmjs.org/:_authToken=$NPM_PUBLISH_TOKEN" >~/.npmrc
 
     source ./.circleci/cb-publish-step-3-npm.sh
 }
@@ -722,12 +723,12 @@ function _rollbackNpm {
     loadCache repo $CODEBUILD_SRC_DIR
 
     if [ -z "$ROLLBACK_TARGET_VERSION" ]; then
-      echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
-      exit 1
+        echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
+        exit 1
     fi
 
     echo Authenticate with npm
-    echo "//registry.npmjs.org/:_authToken=$NPM_PUBLISH_TOKEN" > ~/.npmrc
+    echo "//registry.npmjs.org/:_authToken=$NPM_PUBLISH_TOKEN" >~/.npmrc
 
     npm dist-tag add @aws-amplify/cli@$ROLLBACK_TARGET_VERSION "latest"
 }
@@ -750,8 +751,8 @@ function _githubRollback {
     loadCache repo $CODEBUILD_SRC_DIR
     echo Rollback Amplify CLI GitHub release
     if [ -z "$ROLLBACK_TARGET_VERSION" ]; then
-      echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
-      exit 1
+        echo "Rollback target version is missing. Make sure CodeBuild workflow was started with ROLLBACK_TARGET_VERSION environment variable"
+        exit 1
     fi
     yarn ts-node scripts/github-rollback.ts $ROLLBACK_TARGET_VERSION
 }
@@ -768,7 +769,6 @@ function _amplifyGeneralConfigTests {
     retry yarn general-config-e2e --no-cache --maxWorkers=3 --forceExit $TEST_SUITE
 }
 
-
 function _cleanUpResources {
     _loadTestAccountCredentials
     echo "Executing resource cleanup"
diff --git a/yarn.lock b/yarn.lock
index 5f8d32ea7cb..402c9e99115 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -715,7 +715,7 @@ __metadata:
     util: ^0.12.4
     web-vitals: ^0.2.4
     webpack: ^5.64.4
-    webpack-dev-server: ^4.6.0
+    webpack-dev-server: ^4.15.2
     webpack-manifest-plugin: ^4.0.2
     workbox-webpack-plugin: ^6.4.1
   languageName: unknown
@@ -12573,6 +12573,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/http-errors@npm:*":
+  version: 2.0.4
+  resolution: "@types/http-errors@npm:2.0.4"
+  checksum: 494670a57ad4062fee6c575047ad5782506dd35a6b9ed3894cea65830a94367bd84ba302eb3dde331871f6d70ca287bfedb1b2cf658e6132cd2cbd427ab56836
+  languageName: node
+  linkType: hard
+
 "@types/http-proxy@npm:^1.17.8":
   version: 1.17.8
   resolution: "@types/http-proxy@npm:1.17.8"
@@ -12694,10 +12701,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mime@npm:^1":
-  version: 1.3.2
-  resolution: "@types/mime@npm:1.3.2"
-  checksum: 61d144e5170c6cdf6de334ec0ee4bb499b1a0fb0233834a9e8cec6d289b0e3042bedf35cbc1c995d71a247635770dae3f13a9ddae69098bb54b933429bc08d35
+"@types/mime@npm:*":
+  version: 3.0.4
+  resolution: "@types/mime@npm:3.0.4"
+  checksum: db478bc0f99e40f7b3e01d356a9bdf7817060808a294978111340317bcd80ca35382855578c5b60fbc84ae449674bd9bb38427b18417e1f8f19e4f72f8b242cd
   languageName: node
   linkType: hard
 
@@ -12734,6 +12741,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node-forge@npm:^1.3.0":
+  version: 1.3.11
+  resolution: "@types/node-forge@npm:1.3.11"
+  dependencies:
+    "@types/node": "*"
+  checksum: 3d7d23ca0ba38ac0cf74028393bd70f31169ab9aba43f21deb787840170d307d662644bac07287495effe2812ddd7ac8a14dbd43f16c2936bbb06312e96fc3b9
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:*, @types/node@npm:^18.16.1":
   version: 18.16.1
   resolution: "@types/node@npm:18.16.1"
@@ -12914,13 +12930,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.3":
-  version: 1.13.10
-  resolution: "@types/serve-static@npm:1.13.10"
+"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10, @types/serve-static@npm:^1.13.3":
+  version: 1.15.5
+  resolution: "@types/serve-static@npm:1.15.5"
   dependencies:
-    "@types/mime": ^1
+    "@types/http-errors": "*"
+    "@types/mime": "*"
     "@types/node": "*"
-  checksum: 7f3de245cbb11f3a9d7977b6e763585c6022ebfc079fa746f8d824411bb6b343521c1cff5407edc0d5196f4b7d6fea431fb36455843f4a6717d295c235065cf2
+  checksum: 811d1a2f7e74a872195e7a013bcd87a2fb1edf07eaedcb9dcfd20c1eb4bc56ad4ea0d52141c13192c91ccda7c8aeb8a530d8a7e60b9c27f5990d7e62e0fecb03
   languageName: node
   linkType: hard
 
@@ -13050,12 +13067,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^8.0.0, @types/ws@npm:^8.2.2, @types/ws@npm:^8.5.1":
-  version: 8.5.3
-  resolution: "@types/ws@npm:8.5.3"
+"@types/ws@npm:^8.0.0, @types/ws@npm:^8.2.2, @types/ws@npm:^8.5.5":
+  version: 8.5.10
+  resolution: "@types/ws@npm:8.5.10"
   dependencies:
     "@types/node": "*"
-  checksum: af36857b804e6df615b401bacf34e9312f073ed9dbeda35be16ee3352d18a4449f27066169893166a6ec17ae51557c3adf8d232ac4a4a0226aafb3267e1f1b39
+  checksum: e9af279b984c4a04ab53295a40aa95c3e9685f04888df5c6920860d1dd073fcc57c7bd33578a04b285b2c655a0b52258d34bee0a20569dca8defb8393e1e5d29
   languageName: node
   linkType: hard
 
@@ -14710,7 +14727,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^2.6.2, async@npm:^2.6.4":
+"async@npm:^2.6.4":
   version: 2.6.4
   resolution: "async@npm:2.6.4"
   dependencies:
@@ -16850,10 +16867,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"connect-history-api-fallback@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "connect-history-api-fallback@npm:1.6.0"
-  checksum: 6d59c68070fcb2f6d981992f88d050d7544e8e1af6600c23ad680d955e316216794a742a1669d1f14ed5171fc628b916f8a4e15c5a1e55bffc8ccc60bfeb0b2c
+"connect-history-api-fallback@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "connect-history-api-fallback@npm:2.0.0"
+  checksum: 90fa8b16ab76e9531646cc70b010b1dbd078153730c510d3142f6cf07479ae8a812c5a3c0e40a28528dd1681a62395d0cfdef67da9e914c4772ac85d69a3ed87
   languageName: node
   linkType: hard
 
@@ -17788,7 +17805,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^3.1.1, debug@npm:^3.2.7":
+"debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -20151,10 +20168,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-monkey@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "fs-monkey@npm:1.0.3"
-  checksum: 197fd276d224d54a27c6267c69887ec29ccd4bedd83d72b5050abf3b6c6ef83d7b86a85a87f615c24a4e6f9a4888fd151c9f16a37ffb23e37c4c2d14c1da6275
+"fs-monkey@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "fs-monkey@npm:1.0.5"
+  checksum: 815025e75549fb1ac6c403413b82fd631eded862ae27694a515c0f666069e95874ab34e79c33d1b3b8c87d1e54350d5e4262090d0aa5bd7130143cbc627537e4
   languageName: node
   linkType: hard
 
@@ -24061,6 +24078,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"launch-editor@npm:^2.6.0":
+  version: 2.6.1
+  resolution: "launch-editor@npm:2.6.1"
+  dependencies:
+    picocolors: ^1.0.0
+    shell-quote: ^1.8.1
+  checksum: 82d0bd9a44e7a972157719e63dac1b8196db6ec7066c1ec57a495f6c3d6e734f3c4da89549e7b33eb3b0356668ad02a9e7782b6733f5ebd7a61b7c5f635a3ee9
+  languageName: node
+  linkType: hard
+
 "lazystream@npm:^1.0.0":
   version: 1.0.1
   resolution: "lazystream@npm:1.0.1"
@@ -24844,12 +24871,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"memfs@npm:^3.1.2, memfs@npm:^3.4.1":
-  version: 3.4.11
-  resolution: "memfs@npm:3.4.11"
+"memfs@npm:^3.1.2, memfs@npm:^3.4.3":
+  version: 3.5.3
+  resolution: "memfs@npm:3.5.3"
   dependencies:
-    fs-monkey: ^1.0.3
-  checksum: 31792e27e6622d63e44aafccf9650d432ba51bcdfddf6ebefcf5fe7c5279da8a3d5481b1597bd21331e68f37c2040a496066c972cc66f18a5022d265c800d395
+    fs-monkey: ^1.0.4
+  checksum: 038fc81bce17ea92dde15aaa68fa0fdaf4960c721ce3ffc7c2cb87a259333f5159784ea48b3b72bf9e054254d9d0d0d5209d0fdc3d07d08653a09933b168fbd7
   languageName: node
   linkType: hard
 
@@ -25252,7 +25279,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:0.5.x, mkdirp@npm:^0.5.0, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
+"mkdirp@npm:0.5.x, mkdirp@npm:^0.5.0, mkdirp@npm:~0.5.1":
   version: 0.5.5
   resolution: "mkdirp@npm:0.5.5"
   dependencies:
@@ -27219,17 +27246,6 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"portfinder@npm:^1.0.28":
-  version: 1.0.28
-  resolution: "portfinder@npm:1.0.28"
-  dependencies:
-    async: ^2.6.2
-    debug: ^3.1.1
-    mkdirp: ^0.5.5
-  checksum: fefd3d65a6464b498e0e9b4a4b82f29489441bb1892a3350403cfdf6e591e583d9e75bac1c6ae8ca2cdf1a942ae18890831a0a855bb1bb977678acdf9e5a560f
-  languageName: node
-  linkType: hard
-
 "postcss-attribute-case-insensitive@npm:^5.0.0":
   version: 5.0.0
   resolution: "postcss-attribute-case-insensitive@npm:5.0.0"
@@ -29731,12 +29747,13 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"selfsigned@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "selfsigned@npm:2.0.1"
+"selfsigned@npm:^2.1.1":
+  version: 2.4.1
+  resolution: "selfsigned@npm:2.4.1"
   dependencies:
+    "@types/node-forge": ^1.3.0
     node-forge: ^1
-  checksum: 3f5d5b88f072db51d1c8184db571a466c5a60d46f888dee62b7396c9c27a10cc98c151fde5441140da29abc493a82530666911468d3a57bd8c6d81b8e6a8f830
+  checksum: 521829ec36ea042f7e9963bf1da2ed040a815cf774422544b112ec53b7edc0bc50a0f8cc2ae7aa6cc19afa967c641fd96a15de0fc650c68651e41277d2e1df09
   languageName: node
   linkType: hard
 
@@ -29974,10 +29991,10 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"shell-quote@npm:^1.7.3":
-  version: 1.7.4
-  resolution: "shell-quote@npm:1.7.4"
-  checksum: 54a9f16eee9449879290b9ab082d380ff229b9176608879087d1c21c423ad0bf954fe02941963ee80cafce6e09d629ae5b209ac7061de22cf8e1b9b3edf3e694
+"shell-quote@npm:^1.7.3, shell-quote@npm:^1.8.1":
+  version: 1.8.1
+  resolution: "shell-quote@npm:1.8.1"
+  checksum: 8cec6fd827bad74d0a49347057d40dfea1e01f12a6123bf82c4649f3ef152fc2bc6d6176e6376bffcd205d9d0ccb4f1f9acae889384d20baff92186f01ea455a
   languageName: node
   linkType: hard
 
@@ -30190,7 +30207,7 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"sockjs@npm:^0.3.21":
+"sockjs@npm:^0.3.24":
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"
   dependencies:
@@ -32600,62 +32617,65 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"webpack-dev-middleware@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "webpack-dev-middleware@npm:5.3.1"
+"webpack-dev-middleware@npm:^5.3.4":
+  version: 5.3.4
+  resolution: "webpack-dev-middleware@npm:5.3.4"
   dependencies:
     colorette: ^2.0.10
-    memfs: ^3.4.1
+    memfs: ^3.4.3
     mime-types: ^2.1.31
     range-parser: ^1.2.1
     schema-utils: ^4.0.0
   peerDependencies:
     webpack: ^4.0.0 || ^5.0.0
-  checksum: 705553c7af45eae6d8f93c5d8e6a6254085d7e1a7a789c58b1aec1c6c6c8f4bb65d5663a7c34c793920351d3c580cf566690d4fd5776a198d39a3b2c708e6ca5
+  checksum: 257df7d6bc5494d1d3cb66bba70fbdf5a6e0423e39b6420f7631aeb52435afbfbff8410a62146dcdf3d2f945c62e03193aae2ac1194a2f7d5a2523b9d194e9e1
   languageName: node
   linkType: hard
 
-"webpack-dev-server@npm:^4.6.0":
-  version: 4.8.1
-  resolution: "webpack-dev-server@npm:4.8.1"
+"webpack-dev-server@npm:^4.15.2":
+  version: 4.15.2
+  resolution: "webpack-dev-server@npm:4.15.2"
   dependencies:
     "@types/bonjour": ^3.5.9
     "@types/connect-history-api-fallback": ^1.3.5
     "@types/express": ^4.17.13
     "@types/serve-index": ^1.9.1
+    "@types/serve-static": ^1.13.10
     "@types/sockjs": ^0.3.33
-    "@types/ws": ^8.5.1
+    "@types/ws": ^8.5.5
     ansi-html-community: ^0.0.8
     bonjour-service: ^1.0.11
     chokidar: ^3.5.3
     colorette: ^2.0.10
     compression: ^1.7.4
-    connect-history-api-fallback: ^1.6.0
+    connect-history-api-fallback: ^2.0.0
     default-gateway: ^6.0.3
     express: ^4.17.3
     graceful-fs: ^4.2.6
     html-entities: ^2.3.2
     http-proxy-middleware: ^2.0.3
     ipaddr.js: ^2.0.1
+    launch-editor: ^2.6.0
     open: ^8.0.9
     p-retry: ^4.5.0
-    portfinder: ^1.0.28
     rimraf: ^3.0.2
     schema-utils: ^4.0.0
-    selfsigned: ^2.0.1
+    selfsigned: ^2.1.1
     serve-index: ^1.9.1
-    sockjs: ^0.3.21
+    sockjs: ^0.3.24
     spdy: ^4.0.2
-    webpack-dev-middleware: ^5.3.1
-    ws: ^8.4.2
+    webpack-dev-middleware: ^5.3.4
+    ws: ^8.13.0
   peerDependencies:
     webpack: ^4.37.0 || ^5.0.0
   peerDependenciesMeta:
+    webpack:
+      optional: true
     webpack-cli:
       optional: true
   bin:
     webpack-dev-server: bin/webpack-dev-server.js
-  checksum: 9ba5b127e3ef51f9a24df35563042b61f60473d319b895fa5877a1c1b4d5e03214605423db7c6a9ddb5c70616933e4a62eb5038acfe0beee2341c3bf792eeccf
+  checksum: 625bd5b79360afcf98782c8b1fd710b180bb0e96d96b989defff550c546890010ceea82ffbecb2a0a23f7f018bc72f2dee7b3070f7b448fb0110df6657fb2904
   languageName: node
   linkType: hard
 
@@ -33317,18 +33337,18 @@ node-pty@beta:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.3.0, ws@npm:^8.4.2, ws@npm:^8.5.0":
-  version: 8.8.1
-  resolution: "ws@npm:8.8.1"
+"ws@npm:^8.13.0, ws@npm:^8.3.0, ws@npm:^8.5.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
   peerDependencies:
     bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
+    utf-8-validate: ">=5.0.2"
   peerDependenciesMeta:
     bufferutil:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: ae7f679a0d43ee50c00f97df1165e4111d5434176bb1335c2cd8460ceb191324a09764d7409774c6c9420d58bf3047b9ca02f8be73042f6106b1f9908440c7dc
+  checksum: a7783bb421c648b1e622b423409cb2a58ac5839521d2f689e84bc9dc41d59379c692dd405b15a997ea1d4c0c2e5314ad707332d0c558f15232d2bc07c0b4618a
   languageName: node
   linkType: hard