Skip to content

Commit 4883c24

Browse files
authored
Merge pull request #950 from aws-amplify/main
chore: Release PR
2 parents 9174eab + 9ceba4b commit 4883c24

File tree

9 files changed

+429
-130
lines changed

9 files changed

+429
-130
lines changed

dependency_licenses.txt

Lines changed: 316 additions & 46 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"packages/*"
7777
],
7878
"devDependencies": {
79-
"@aws-amplify/amplify-cli-core": "^4.3.11",
79+
"@aws-amplify/amplify-cli-core": "^4.4.0",
8080
"@commitlint/cli": "^17.0.3",
8181
"@commitlint/config-conventional": "^17.0.3",
8282
"@commitlint/config-lerna-scopes": "^17.0.2",
@@ -124,17 +124,20 @@
124124
"typescript": "4.7.4"
125125
},
126126
"resolutions": {
127-
"minimist": "^1.2.6",
128-
"lodash": "^4.17.21",
129-
"node-fetch": "^2.6.7",
127+
"**/@aws-amplify/amplify-codegen-e2e-tests/**/cookie": "^0.7.0",
128+
"**/@aws-amplify/amplify-codegen-e2e-tests/**/fast-xml-parser": "^4.4.1",
129+
"@octokit/plugin-paginate-rest": "^9.2.2",
130+
"@octokit/request": "^8.4.1",
131+
"@octokit/request-error": "^5.1.1",
132+
"axios": "^1.7.4",
130133
"cross-fetch": "^2.2.6",
131134
"glob-parent": "^6.0.2",
132-
"parse-url": "^8.1.0",
133135
"graphql": "15.8.0",
134-
"xml2js": "0.5.0",
135-
"axios": "^1.7.4",
136-
"**/@aws-amplify/amplify-codegen-e2e-tests/**/fast-xml-parser": "^4.4.1",
137-
"**/@aws-amplify/amplify-codegen-e2e-tests/**/cookie": "^0.7.0"
136+
"lodash": "^4.17.21",
137+
"minimist": "^1.2.6",
138+
"node-fetch": "^2.6.7",
139+
"parse-url": "^8.1.0",
140+
"xml2js": "0.5.0"
138141
},
139142
"config": {
140143
"commitizen": {

packages/amplify-codegen-e2e-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@types/ini": "^1.3.31"
4444
},
4545
"peerDependencies": {
46-
"@aws-amplify/amplify-cli-core": "^4.3.11",
46+
"@aws-amplify/amplify-cli-core": "^4.4.0",
4747
"amplify-headless-interface": "^1.13.1",
4848
"graphql-transformer-core": "^8.0.0"
4949
}

packages/amplify-codegen-e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"ts-node": "^8.10.1"
4848
},
4949
"peerDependencies": {
50-
"@aws-amplify/amplify-cli-core": "^4.3.11",
50+
"@aws-amplify/amplify-cli-core": "^4.4.0",
5151
"graphql-transformer-core": "^8.0.0"
5252
},
5353
"jest": {

packages/amplify-codegen-e2e-tests/src/__tests__/build-app-android.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
addCodegen,
1111
AmplifyFrontend,
1212
apiGqlCompile,
13+
deleteProject
1314
} from '@aws-amplify/amplify-codegen-e2e-core';
1415
const { schemas } = require('@aws-amplify/graphql-schema-test-library');
1516
import { existsSync, writeFileSync, readdirSync, rmSync, readFileSync } from 'fs';
@@ -44,6 +45,7 @@ describe('build app - Android', () => {
4445
});
4546

4647
afterAll(async () => {
48+
await deleteProject(projectRoot);
4749
rmSync(path.join(projectRoot, 'amplify'), { recursive: true, force: true });
4850
rmSync(path.join(projectRoot, '.graphqlconfig.yml'), { recursive: true, force: true });
4951
});

packages/amplify-codegen-e2e-tests/src/__tests__/build-app-swift.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
addCodegen,
1010
AmplifyFrontend,
1111
apiGqlCompile,
12+
deleteProject
1213
} from '@aws-amplify/amplify-codegen-e2e-core';
1314
const { schemas } = require('@aws-amplify/graphql-schema-test-library');
1415
import { writeFileSync, readdirSync, readFileSync, rmSync, mkdirSync } from 'fs';
@@ -46,6 +47,7 @@ describe('build app - Swift', () => {
4647
});
4748

4849
afterAll(async () => {
50+
await deleteProject(projectRoot);
4951
await rmSync(path.join(projectRoot, 'amplify'), { recursive: true, force: true });
5052
rmSync(path.join(projectRoot, '.graphqlconfig.yml'), { recursive: true, force: true });
5153

packages/amplify-codegen-e2e-tests/src/__tests__/build-app-ts.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
addCodegen,
1111
AmplifyFrontend,
1212
apiGqlCompile,
13+
deleteProject
1314
} from '@aws-amplify/amplify-codegen-e2e-core';
1415
const { schemas } = require('@aws-amplify/graphql-schema-test-library');
1516
import { existsSync, writeFileSync, readdirSync, rmSync } from 'fs';
@@ -37,6 +38,7 @@ describe('build app - JS', () => {
3738
});
3839

3940
afterAll(async () => {
41+
await deleteProject(projectRoot);
4042
await rmSync(path.join(projectRoot, 'amplify'), { recursive: true, force: true });
4143
rmSync(path.join(projectRoot, '.graphqlconfig.yml'), { recursive: true, force: true });
4244
});

shared-scripts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ function _buildLinux {
141141
}
142142

143143
function _buildWindows {
144-
echo "Linux Build"
145144
echo "Setup Node Version $AMPLIFY_NODE_VERSION for Windows"
146145
_setupNodeVersionWindows $AMPLIFY_NODE_VERSION
146+
echo "Windows Build"
147147
yarn run production-build
148148
storeCacheForWindowsBuildJob
149149
}

0 commit comments

Comments
 (0)