Skip to content

Commit 5af101a

Browse files
authored
Revert "pin cdk versions for create amplify (#2535)" (#2544)
* Revert "pin cdk versions for create amplify (#2535)" This reverts commit 07c7e43. * add changeset
1 parent 07c7e43 commit 5af101a

17 files changed

+44
-512
lines changed

.changeset/fifty-ads-boil.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/rude-vans-sparkle.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
---

.eslint_dictionary.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@
184184
"tsconfig",
185185
"tsdoc",
186186
"tslint",
187-
"tsx",
188187
"typename",
189188
"typeof",
190189
"ubuntu",

.github/workflows/health_checks.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -694,22 +694,6 @@ jobs:
694694
cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
695695
cdk-cli-version: ${{ needs.resolve_inputs.outputs.cdk_cli_version }}
696696
- run: npm run check:api
697-
check_create_amplify_deps:
698-
runs-on: ubuntu-latest
699-
needs:
700-
- install
701-
- resolve_inputs
702-
steps:
703-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
704-
- uses: ./.github/actions/setup_node
705-
with:
706-
node-version: 18
707-
- uses: ./.github/actions/restore_install_cache
708-
with:
709-
node-version: 18
710-
cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
711-
cdk-cli-version: ${{ needs.resolve_inputs.outputs.cdk_cli_version }}
712-
- run: npm run check:create-amplify-deps
713697
docs_build_and_publish:
714698
runs-on: ubuntu-latest
715699
needs:

.husky/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22
. "$(dirname "$0")/_/husky.sh"
33

4-
npm run update:create-amplify-deps
54
npm run update:tsconfig-refs
65
npm run check:package-lock
76
npx lint-staged

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"scripts": {
77
"build": "tsc --build packages/* scripts",
88
"check:api": "npm run update:api && tsx scripts/check_api_extract.ts",
9-
"check:create-amplify-deps": "npm run update:create-amplify-deps && tsx scripts/check_no_git_diff.ts",
109
"check:dependencies": "tsx scripts/check_dependencies.ts",
1110
"check:package-lock": "tsx scripts/check_package_lock.ts",
1211
"check:package-versions": "tsx scripts/check_package_versions.ts",
@@ -36,7 +35,6 @@
3635
"test:dir": "tsx scripts/run_tests.ts",
3736
"test:scripts": "npm run test:dir $(glob --cwd=scripts --absolute **/*.test.ts)",
3837
"update:api": "tsx scripts/concurrent_workspace_script.ts update:api --if-present",
39-
"update:create-amplify-deps": "tsx scripts/update_create_amplify_deps.ts",
4038
"update:tsconfig-refs": "tsx scripts/update_tsconfig_refs.ts",
4139
"vend": "npm run start:npm-proxy && npm run publish:local",
4240
"watch": "npm run build -- --watch"

packages/create-amplify/src/amplify_project_creator.ts

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { PackageManagerController } from '@aws-amplify/plugin-types';
44
import { ProjectRootValidator } from './project_root_validator.js';
55
import { GitIgnoreInitializer } from './gitignore_initializer.js';
66
import { InitialProjectFileGenerator } from './initial_project_file_generator.js';
7-
import defaultPackages from './default_packages.json';
87

98
const LEARN_MORE_USAGE_DATA_TRACKING_LINK =
109
'https://docs.amplify.aws/react/reference/telemetry';
@@ -13,8 +12,19 @@ const LEARN_MORE_USAGE_DATA_TRACKING_LINK =
1312
* Orchestration class that sets up a new Amplify project
1413
*/
1514
export class AmplifyProjectCreator {
16-
private readonly defaultDevPackages: string[];
17-
private readonly defaultProdPackages: string[];
15+
private readonly defaultDevPackages = [
16+
'@aws-amplify/backend',
17+
'@aws-amplify/backend-cli',
18+
'aws-cdk@^2',
19+
'aws-cdk-lib@^2',
20+
'constructs@^10.0.0',
21+
'typescript@^5.0.0',
22+
'tsx',
23+
'esbuild',
24+
];
25+
26+
private readonly defaultProdPackages = ['aws-amplify'];
27+
1828
/**
1929
* Orchestrator for the create-amplify workflow.
2030
* Delegates out to other classes that handle parts of the getting started experience
@@ -25,10 +35,7 @@ export class AmplifyProjectCreator {
2535
private readonly projectRootValidator: ProjectRootValidator,
2636
private readonly gitIgnoreInitializer: GitIgnoreInitializer,
2737
private readonly initialProjectFileGenerator: InitialProjectFileGenerator
28-
) {
29-
this.defaultDevPackages = defaultPackages.defaultDevPackages;
30-
this.defaultProdPackages = defaultPackages.defaultProdPackages;
31-
}
38+
) {}
3239

3340
/**
3441
* Executes the create-amplify workflow

packages/create-amplify/src/default_packages.json

Lines changed: 0 additions & 13 deletions
This file was deleted.

packages/create-amplify/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": { "rootDir": "src", "outDir": "lib" },
4-
"include": ["**/*", "src/**/*.json"],
54
"exclude": ["templates", "lib"],
65
"references": [
76
{ "path": "../cli-core" },

scripts/components/create_amplify_dep_updater.test.ts

Lines changed: 0 additions & 145 deletions
This file was deleted.

0 commit comments

Comments
 (0)