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.

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

Minor updates #378

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 4 additions & 9 deletions packages/microapps-cdk/.projen/tasks.json

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

20 changes: 11 additions & 9 deletions packages/microapps-cdk/.projenrc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// eslint-disable-next-line import/no-extraneous-dependencies
const { awscdk, javascript } = require('projen');
const project = new awscdk.AwsCdkConstructLibrary({
name: '@pwrdrvr/microapps-cdk',
license: 'MIT',
author: 'PwrDrvr LLC',
authorAddress: '[email protected]',
authorOrganization: true,
Expand All @@ -11,8 +13,6 @@ const project = new awscdk.AwsCdkConstructLibrary({
copyrightOwner: 'PwrDrvr LLC',
copyrightPeriod: '2020',
defaultReleaseBranch: 'main',
license: 'MIT',
name: '@pwrdrvr/microapps-cdk',
releaseToNpm: true,
npmAccess: javascript.NpmAccess.PUBLIC,
packageManager: javascript.NodePackageManager.YARN_CLASSIC,
Expand Down Expand Up @@ -84,24 +84,26 @@ const project = new awscdk.AwsCdkConstructLibrary({

// 114 ? K | `${K}.${PathImpl<T[K], Exclude<keyof T[K], keyof any[]>>}`
//
project.preCompileTask.exec(
'rm -rf ../../node_modules/@types/prettier/ ../../node_modules/@types/convict/ ../../node_modules/@types/convict-format-with-validator/',
// 'patch-package && if [ -d ../../node_modules ] ; then mv ../../node_modules ../../node_modules_hide; fi',
);

// 2024-05-15 - This is no longer needed now that JSII has been upgrade from v1 to v5.4
// project.preCompileTask.exec(
// 'rm -rf ../../node_modules/@types/prettier/ ../../node_modules/@types/convict/ ../../node_modules/@types/convict-format-with-validator/',
// // 'patch-package && if [ -d ../../node_modules ] ; then mv ../../node_modules ../../node_modules_hide; fi',
// );

// Move the parent node_modules back into place now that jsii is done
// project.compileTask.exec(
// 'if [ -d ../../node_modules_hide ] ; then mv ../../node_modules_hide ../../node_modules; fi',
// );

project.compileTask.exec(
'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',
'esbuild ../microapps-edge-to-origin/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --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=node16 --external:aws-sdk --outfile=lib/microapps-deployer/index.js',
'esbuild ../microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --external:aws-sdk --outfile=lib/microapps-deployer/index.js',
);
project.compileTask.exec(
'esbuild ../microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node16 --external:aws-sdk --outfile=lib/microapps-router/index.js',
'esbuild ../microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --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
18 changes: 0 additions & 18 deletions tsconfig.bundle-deployer.json

This file was deleted.

19 changes: 0 additions & 19 deletions tsconfig.bundle-router.json

This file was deleted.

Loading