Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #320

Merged
merged 5 commits into from
Mar 5, 2023
Merged

Update deps #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1d45516
Update deps
huntharo Mar 5, 2023
0205dce
Fix one error
huntharo Mar 5, 2023
ab95b94
Fix conflict
huntharo Mar 5, 2023
e499dee
Fix path
huntharo Mar 5, 2023
6b6ce8e
Adjust paths
huntharo Mar 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ jobs:
id: appVersions
run: |
# find . -type d -name microapps-app-nextjs-demo-cdk
echo 'NEXTJS_DEMO_APP_PACKAGE_VERSION='$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version") >> $GITHUB_ENV
echo 'RELEASE_APP_PACKAGE_VERSION='$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version") >> $GITHUB_ENV
echo "::set-output name=nextjsDemoAppPackageVersion::$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version")"
echo "::set-output name=releaseAppPackageVersion::$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version")"
echo 'NEXTJS_DEMO_APP_PACKAGE_VERSION='$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version") >> $GITHUB_ENV
echo 'RELEASE_APP_PACKAGE_VERSION='$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version") >> $GITHUB_ENV
echo "::set-output name=nextjsDemoAppPackageVersion::$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version")"
echo "::set-output name=releaseAppPackageVersion::$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version")"

- name: Versions
run: |
Expand Down Expand Up @@ -430,7 +430,7 @@ jobs:
-n ${{ needs.build.outputs.nextjsDemoAppPackageVersion }} \
-d ${DEPLOYER_LAMBDA_NAME} \
-l ${NEXTJS_DEMO_APP_LAMBDA_VERSION_ARN} \
-s packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/ \
-s node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/ \
--overwrite

- name: Nextjs Demo App URL
Expand Down Expand Up @@ -462,7 +462,7 @@ jobs:
-n ${{ needs.build.outputs.releaseAppPackageVersion }} \
-d ${DEPLOYER_LAMBDA_NAME} \
-l ${RELEASE_APP_LAMBDA_VERSION_ARN} \
-s packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/static_files/ \
-s node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/static_files/ \
--overwrite

- name: Release App URL
Expand Down
2 changes: 1 addition & 1 deletion .nextjs-demo-replace.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// https://www.npmjs.com/package/replace-in-file
module.exports = {
files:
'packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/server/.next/**/*,packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/**/*',
'node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/server/.next/**/*,node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/**/*',
};
5 changes: 3 additions & 2 deletions .release-replace.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// https://www.npmjs.com/package/replace-in-file
module.exports = {
files: 'packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.next/**/*,packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/next.config.js,packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.static_files/**/*',
};
files:
'node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.next/**/*,node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/next.config.js,node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.static_files/**/*',
};
38 changes: 0 additions & 38 deletions DockerfileDeployer
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions DockerfileRouter
View file
Open in desktop

This file was deleted.

49 changes: 20 additions & 29 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
"nohoist": [
"**/@types/convict-format-with-validator",
"**/@types/convict-format-with-validator/**",
"**/aws-cdk-lib",
"**/aws-cdk-lib/**",
"**/constructs"
"packages/microapps-cdk/aws-cdk-lib/**",
"packages/microapps-cdk/constructs/**"
]
},
"private": true,
Expand All @@ -48,38 +47,30 @@
"postinstall": "npx patch-package"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^17.1.0",
"@rollup/plugin-json": "^4.1.0",
"@rollup/plugin-node-resolve": "^10.0.0",
"@tsconfig/node14": "^1.0.0",
"@types/jest": "29.4.0",
"@types/node": "16.9.2",
"@typescript-eslint/eslint-plugin": "^4.9.0",
"@typescript-eslint/parser": "^4.9.0",
"@typescript-eslint/eslint-plugin": "5.54.0",
"@typescript-eslint/parser": "5.54.0",
"aws-cdk": "^2.24.1",
"aws-cdk-lib": "^2.24.1",
"aws-cdk-lib": "2.24.1",
"constructs": "10.0.5",
"cross-env": "^7.0.3",
"esbuild": "^0.14.39",
"eslint": "^7.15.0",
"eslint-config-prettier": "^7.0.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^2.5.0",
"eslint-plugin-import": "^2.25.3",
"eslint-plugin-prettier": "^3.2.0",
"husky": "^4.2.5",
"cross-env": "7.0.3",
"esbuild": "0.17.11",
"eslint": "8.35.0",
"eslint-config-prettier": "8.6.0",
"eslint-import-resolver-node": "0.3.7",
"eslint-import-resolver-typescript": "3.5.3",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-prettier": "4.2.1",
"husky": "8.0.3",
"jest": "29.4.3",
"jest-dynalite": "3.6.1",
"lint-staged": "^10.2.11",
"patch-package": "^6.4.7",
"prettier": "^2.6.2",
"projen": "~0.56.19",
"replace-in-file": "^6.3.2",
"rimraf": "^3.0.2",
"rollup": "^2.39.0",
"rollup-plugin-node-externals": "^2.2.0",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.30.0",
"lint-staged": "12.1.2",
"patch-package": "6.5.1",
"prettier": "2.8.4",
"projen": "0.56.19",
"replace-in-file": "6.3.5",
"rimraf": "4.3.0",
"start-server-and-test": "^1.14.0",
"ts-jest": "29.0.5",
"ts-node": "10.9.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk/lib/MicroApps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ export class MicroAppsStack extends Stack {
removalPolicy,
});

const appVersion = (app.lambdaFunction as lambda.Function).currentVersion;
const appVersion = (app.lambdaFunction as unknown as lambda.Function).currentVersion;
appVersion.applyRemovalPolicy(RemovalPolicy.RETAIN);

new CfnOutput(this, 'release-app-func-name', {
Expand Down
12 changes: 5 additions & 7 deletions packages/cdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@
},
"dependencies": {
"@pwrdrvr/microapps-app-nextjs-demo-cdk": "0.6.3",
"@pwrdrvr/microapps-app-release-cdk": "0.5.2",
"source-map-support": "0.5.21"
"@pwrdrvr/microapps-app-release-cdk": "0.5.3",
"source-map-support": "0.5.21",
"aws-cdk-lib": "2.24.1",
"constructs": "10.0.5"
},
"devDependencies": {
"@types/node": "16.9.2",
"aws-cdk-lib": "2.24.1",
"constructs": "10.0.5",
"ts-node": "^9.0.0",
"tslib": "^2.1.0",
"typescript": "^4.6.0"
"tslib": "2.5.0"
}
}
2 changes: 1 addition & 1 deletion packages/microapps-cdk/.projenrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
devDeps: [
'esbuild',
'@types/yargs@^16.0.0', // This is a dummy to prevent jsii from failing
'@types/jest@^26.0.24', // This is a dummy to prevent jsii from failing
'@types/jest@29.4.0', // This is a dummy to prevent jsii from failing
// '@aws-cdk/[email protected]',
// '@aws-cdk/[email protected]',
// 'patch-package@^6.4.7',
Expand Down
12 changes: 7 additions & 5 deletions packages/microapps-datalib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"peerDependencies": {
"@aws-sdk/client-dynamodb": "^3.20.0",
"@aws-sdk/lib-dynamodb": "^3.20.0",
"class-transformer": "^0.5.1",
"tslib": "^2.1.0"
"@aws-sdk/client-dynamodb": "^3.78.0",
"@aws-sdk/lib-dynamodb": "^3.78.0",
"class-transformer": "0.5.1",
"tslib": "2.5.0"
},
"dependencies": {
"class-transformer": "^0.5.1"
"@aws-sdk/client-dynamodb": "3.78.0",
"@aws-sdk/lib-dynamodb": "3.78.0",
"class-transformer": "0.5.1"
},
"devDependencies": {
"@types/node-fetch": "^2.5.8",
Expand Down
17 changes: 8 additions & 9 deletions packages/microapps-deployer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"dependencies": {
"@aws-sdk/client-apigatewayv2": "^3.20.0",
"@aws-sdk/client-dynamodb": "^3.20.0",
"@aws-sdk/client-iam": "^3.20.0",
"@aws-sdk/client-lambda": "^3.20.0",
"@aws-sdk/client-s3": "^3.20.0",
"@aws-sdk/client-sts": "^3.20.0",
"@aws-sdk/lib-dynamodb": "^3.20.0",
"@aws-sdk/client-apigatewayv2": "3.78.0",
"@aws-sdk/client-dynamodb": "3.78.0",
"@aws-sdk/client-iam": "3.78.0",
"@aws-sdk/client-lambda": "3.78.0",
"@aws-sdk/client-s3": "3.78.0",
"@aws-sdk/client-sts": "3.78.0",
"@aws-sdk/lib-dynamodb": "3.78.0",
"convict": "^6.1.0",
"convict-format-with-validator": "^6.0.1",
"fs-extra": "^9.1.0",
Expand All @@ -36,14 +36,13 @@
"reflect-metadata": "^0.1.13",
"source-map-support": "0.5.21",
"ts-convict": "^1.1.0",
"tslib": "^2.1.0"
"tslib": "2.5.0"
},
"devDependencies": {
"@types/aws-lambda": "8.10.110",
"@types/convict": "^6.0.2",
"@types/convict-format-with-validator": "^6.0.2",
"@types/fs-extra": "^9.0.11",
"@types/jest": "^26.0.24",
"@types/js-yaml": "^4.0.1",
"@types/lambda-log": "^2.2.0",
"@types/node": "16.9.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/microapps-edge-to-origin/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
"aws-sdk-client-mock": "^0.6.2"
},
"dependencies": {
"@aws-crypto/sha256-browser": "^2.0.1",
"@aws-sdk/client-secrets-manager": "~3.78.0",
"@aws-sdk/credential-provider-node": "~3.78.0",
"@aws-sdk/signature-v4": "~3.78.0",
"@aws-sdk/protocol-http": "~3.78.0",
"@aws-sdk/node-http-handler": "~3.78.0",
"@aws-crypto/sha256-browser": "4.0.0",
"@aws-sdk/client-secrets-manager": "3.78.0",
"@aws-sdk/credential-provider-node": "3.78.0",
"@aws-sdk/signature-v4": "3.78.0",
"@aws-sdk/protocol-http": "3.78.0",
"@aws-sdk/node-http-handler": "3.78.0",
"convict": "^6.1.0",
"convict-format-with-validator": "^6.0.1",
"fs-extra": "^9.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/microapps-publish/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"dependencies": {
"@aws-sdk/client-lambda": "^3.20.0",
"@aws-sdk/client-s3": "^3.20.0",
"@aws-sdk/client-sts": "^3.20.0",
"@aws-sdk/lib-storage": "^3.20.0",
"@aws-sdk/client-lambda": "3.78.0",
"@aws-sdk/client-s3": "3.78.0",
"@aws-sdk/client-sts": "3.78.0",
"@aws-sdk/lib-storage": "3.78.0",
"@oclif/command": "^1.8.4",
"@oclif/config": "^1.17.1",
"@oclif/core": "^1.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-router-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"dependencies": {
"@aws-sdk/client-dynamodb": "^3.21.0",
"@aws-sdk/client-dynamodb": "3.78.0",
"fs-extra": "^9.1.0",
"lambda-log": "^3.1.0",
"source-map-support": "0.5.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"dependencies": {
"@aws-sdk/client-dynamodb": "^3.21.0",
"@aws-sdk/client-dynamodb": "3.78.0",
"convict": "^6.1.0",
"convict-format-with-validator": "^6.0.1",
"fs-extra": "^9.1.0",
Expand Down
40 changes: 0 additions & 40 deletions rollup.deployer.js
View file
Open in desktop

This file was deleted.

Loading