Skip to content

Commit

Permalink
Hoist aws-cdk-lib
Browse files Browse the repository at this point in the history
  • Loading branch information
huntharo committed Jan 9, 2023
1 parent 889c320 commit c2ba889
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ jobs:
# and become part of the cache - if we don't then
# their install will get skipped during `build-jsii` but they won't
# be present in the cache so the build will fail
- name: Optionally Install CDK Construct Deps
if: steps.cache-node-modules.outputs.cache-hit != 'true'
working-directory: packages/microapps-cdk/
run: yarn install --frozen-lockfile
# - name: Optionally Install CDK Construct Deps
# if: steps.cache-node-modules.outputs.cache-hit != 'true'
# working-directory: packages/microapps-cdk/
# run: yarn install --frozen-lockfile

- name: Extract App NPM Versions
id: appVersions
Expand Down Expand Up @@ -443,10 +443,10 @@ jobs:
# - name: Move root modules out of the way for CDK Construct build
# run: mv node_modules node_modules_hide

- name: Optionally Install CDK Construct Deps
if: steps.cache-node-modules.outputs.cache-hit != 'true'
working-directory: packages/microapps-cdk/
run: yarn install --frozen-lockfile
# - name: Optionally Install CDK Construct Deps
# if: steps.cache-node-modules.outputs.cache-hit != 'true'
# working-directory: packages/microapps-cdk/
# run: yarn install --frozen-lockfile

# - name: Post Install Patch of api-gatewayv2
# working-directory: packages/microapps-cdk/
Expand Down
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@
"./packages/*/"
],
"nohoist": [
"**/constructs",
"**/@types/convict-format-with-validator",
"**/@types/convict-format-with-validator/**"
"**/@types/convict-format-with-validator/**",
"**/aws-cdk-lib",
"**/aws-cdk-lib/**",
"**/constructs"
]
},
"private": true,
Expand Down
6 changes: 3 additions & 3 deletions packages/microapps-cdk/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions packages/microapps-cdk/.projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,13 @@ project.preCompileTask.exec(
// );

project.compileTask.exec(
'esbuild ../microapps-edge-to-origin/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=lib/microapps-edge-to-origin/index.js',
'esbuild ../microapps-edge-to-origin/src/index.ts --bundle --minify --sourcemap --platform=node --target=node16 --external:aws-sdk --outfile=lib/microapps-edge-to-origin/index.js',
);
project.compileTask.exec(
'esbuild ../microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=lib/microapps-deployer/index.js',
'esbuild ../microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node16 --external:aws-sdk --outfile=lib/microapps-deployer/index.js',
);
project.compileTask.exec(
'esbuild ../microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node14 --external:aws-sdk --outfile=lib/microapps-router/index.js',
'esbuild ../microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node16 --external:aws-sdk --outfile=lib/microapps-router/index.js',
);
project.compileTask.exec('cp -R ../microapps-router/templates lib/microapps-router/');
project.compileTask.exec('cp ../microapps-router/templates/* lib/microapps-edge-to-origin/');
Expand Down

0 comments on commit c2ba889

Please sign in to comment.