Skip to content
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
14 changes: 7 additions & 7 deletions .github/actions/configure-nodejs/action.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: "Configure Node.js"
description: "Install Node.js and install Node.js modules or restore cache"
name: 'Configure Node.js'
description: 'Install Node.js and install Node.js modules or restore cache'

inputs:
node-version:
description: "NodeJS Version"
default: "18"
description: 'NodeJS Version'
default: '22'
lookup-only:
description: "If true, only checks if cache entry exists and skips download. Does not change save cache behavior"
default: "false"
description: 'If true, only checks if cache entry exists and skips download. Does not change save cache behavior'
default: 'false'

runs:
using: "composite"
using: 'composite'
steps:
- uses: actions/setup-node@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/main-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download Publish Tool build artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -239,7 +239,7 @@ jobs:
java-version: 11.x
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -261,7 +261,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- uses: actions/setup-python@v5
with:
python-version: 3.x
Expand All @@ -286,7 +286,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.x
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ./.github/actions/configure-nodejs
with:
lookup-only: 'true' # We only want to lookup from the cache - if a hit, this job does nothing
lookup-only: "true" # We only want to lookup from the cache - if a hit, this job does nothing

version:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
outputs:
latest_commit: ${{ steps.git_remote.outputs.latest_commit }}
env:
CI: 'true'
CI: "true"
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -195,7 +195,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download Publish Tool build artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
java-version: 11.x
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- name: Download build artifacts
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -284,7 +284,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- uses: actions/setup-python@v5
with:
python-version: 3.x
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 22
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 3.x
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v18.17.1
v22.0.0
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Instructions, tools, and tips for those wishing to contribute.
# Prerequisites

- `nvm`
- `node 16` installed with `nvm`
- `node 22` installed with `nvm`
- `npm i -g aws-cdk`

# TIP: Installing npm Modules
Expand Down Expand Up @@ -66,7 +66,7 @@ Below are tips, tricks, and commands used to build and release `pwrdrvr` to NPM

Note: this _has_ to be run in the root of the project on a clean tree (no changed files).

Note: this _has_ to be done with `npm 7.18.1` in `node 16` as a fix from April, 2021 is required in some cases: https://github.com/npm/libnpmversion/pull/12
Note: this _has_ to be done with `npm 7.18.1` in `node 22` as a fix from April, 2021 is required in some cases: https://github.com/npm/libnpmversion/pull/12

`npm version from-git --allow-same-version --no-git-tag-version`

Expand Down
6 changes: 3 additions & 3 deletions DockerfileSuperchain
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM jsii/superchain:1-buster-slim-node16 as base
FROM jsii/superchain:1-buster-slim-node22 as base

# RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash

# Set nvm up in the root .bashrc
# RUN echo "export NVM_DIR=\"\$HOME/.nvm\"" >> /root/.bashrc
# RUN echo "[ -s \"\$NVM_DIR/nvm.sh\" ] && \. \"\$NVM_DIR/nvm.sh\"" >> /root/.bashrc

# Setup NVM in Docker build and install node 16
# Setup NVM in Docker build and install node 22
# RUN export NVM_DIR="$HOME/.nvm" && \
# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
# nvm install v16
# nvm install v22

# Make sure nvm gets setup on container init
ENTRYPOINT [ "/bin/bash", "-l"]
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"build:all": "yarn build && yarn build:publish && yarn esbuild:deployer && yarn esbuild:router && yarn esbuild:edge-to-origin",
"build": "tsc --build tsconfig.json",
"build:publish": "tsc --build tsconfig.publish.json",
"esbuild:deployer": "esbuild packages/microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --external:aws-sdk --outfile=packages/cdk/dist/microapps-deployer/index.js",
"esbuild:router": "esbuild packages/microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --external:aws-sdk --outfile=packages/cdk/dist/microapps-router/index.js",
"esbuild:edge-to-origin": "esbuild packages/microapps-edge-to-origin/src/index.ts --bundle --minify --sourcemap --platform=node --target=node18 --external:aws-sdk --outfile=packages/microapps-cdk/lib/microapps-edge-to-origin/index.js",
"esbuild:deployer": "esbuild packages/microapps-deployer/src/index.ts --bundle --minify --sourcemap --platform=node --target=node22 --external:aws-sdk --outfile=packages/cdk/dist/microapps-deployer/index.js",
"esbuild:router": "esbuild packages/microapps-router/src/index.ts --bundle --minify --sourcemap --platform=node --target=node22 --external:aws-sdk --outfile=packages/cdk/dist/microapps-router/index.js",
"esbuild:edge-to-origin": "esbuild packages/microapps-edge-to-origin/src/index.ts --bundle --minify --sourcemap --platform=node --target=node22 --external:aws-sdk --outfile=packages/microapps-cdk/lib/microapps-edge-to-origin/index.js",
"test": "AWS_PROFILE= AWS_EMF_ENVIRONMENT=Local jest",
"lint": "eslint ./ --ext .ts --ext .tsx",
"lint-and-fix": "eslint ./ --ext .ts --ext .tsx --fix",
Expand All @@ -46,15 +46,15 @@
},
"devDependencies": {
"@types/jest": "29.5.0",
"@types/node": "^18.0.0",
"@types/node": "^22.0.0",
"@typescript-eslint/eslint-plugin": "5.54.0",
"@typescript-eslint/parser": "5.54.0",
"aws-cdk": "^2.117.0",
"aws-cdk-lib": "2.117.0",
"aws-cdk": "^2.168.0",
"aws-cdk-lib": "2.168.0",
"axios": "1.6.0",
"constructs": "10.0.5",
"cross-env": "7.0.3",
"esbuild": "0.20.2",
"esbuild": "0.24.0",
"eslint": "8.35.0",
"eslint-config-prettier": "8.6.0",
"eslint-import-resolver-node": "0.3.7",
Expand All @@ -72,7 +72,7 @@
"rimraf": "5.0.1",
"ts-jest": "29.0.5",
"ts-node": "10.9.1",
"typescript": "4.9.5"
"typescript": "5.7.2"
},
"husky": {
"hooks": {
Expand Down
2 changes: 1 addition & 1 deletion packages/cdk/lib/DemoApp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class DemoApp extends Construct implements IDemoApp {
//
this._lambdaFunction = new lambdaNodejs.NodejsFunction(this, 'app-lambda', {
entry: './packages/demo-app/src/index.ts',
runtime: lambda.Runtime.NODEJS_18_X,
runtime: lambda.Runtime.NODEJS_22_X,
handler: 'handler',
functionName: assetNameRoot ? `${assetNameRoot}-app-${appName}${assetNameSuffix}` : undefined,
logRetention: logs.RetentionDays.ONE_WEEK,
Expand Down
4 changes: 2 additions & 2 deletions packages/cdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
"@pwrdrvr/microapps-app-nextjs-demo-cdk": "0.7.0",
"@pwrdrvr/microapps-app-release-cdk": "0.5.3",
"source-map-support": "0.5.21",
"aws-cdk-lib": "2.117.0",
"aws-cdk-lib": "2.168.0",
"constructs": "10.0.5"
},
"devDependencies": {
"@types/node": "^18.0.0",
"@types/node": "^22.0.0",
"tslib": "2.5.0"
}
}
4 changes: 2 additions & 2 deletions packages/demo-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"engine": {
"node": ">= 16.0.0"
"node": ">= 22.0.0"
},
"repository": {
"type": "git",
Expand All @@ -27,7 +27,7 @@
},
"devDependencies": {
"@types/aws-lambda": "8.10.110",
"@types/node": "16.9.2"
"@types/node": "^22.0.0"
},
"files": [
"dist",
Expand Down
10 changes: 5 additions & 5 deletions packages/microapps-cdk/.projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
authorOrganization: true,
description:
'MicroApps framework, by PwrDrvr LLC, delivered as an AWS CDK construct that provides the DynamoDB, Router service, Deploy service, API Gateway, and CloudFront distribution.',
cdkVersion: '2.117.0',
cdkVersion: '2.168.0',
cdkVersionPinning: false,
copyrightOwner: 'PwrDrvr LLC',
copyrightPeriod: '2020',
Expand All @@ -16,7 +16,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
releaseToNpm: true,
npmAccess: javascript.NpmAccess.PUBLIC,
packageManager: javascript.NodePackageManager.YARN_CLASSIC,
minNodeVersion: '18.0.0',
minNodeVersion: '22.0.0',
jsiiVersion: '^5.4',
// .projenrc.ts causes failed `ts-node` runs from `npx projen` unless
// the generated `tsconfig.json` (but .gitignore'd) file is deleted before
Expand Down Expand Up @@ -95,13 +95,13 @@ project.preCompileTask.exec(
// );

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=node22 --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=node22 --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=node22 --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
10 changes: 5 additions & 5 deletions packages/microapps-cdk/package.json

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

2 changes: 1 addition & 1 deletion packages/microapps-cdk/src/MicroAppsChildDeployer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class MicroAppsChildDeployer extends Construct implements IMicroAppsChild
role: iamRoleDeployer,
memorySize: 1769,
logRetention: logs.RetentionDays.ONE_MONTH,
runtime: lambda.Runtime.NODEJS_18_X,
runtime: lambda.Runtime.NODEJS_22_X,
timeout: deployerTimeout,
environment: {
NODE_ENV: appEnv,
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-cdk/src/MicroAppsEdgeToOrigin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ ${
role: this._edgeToOriginRole,
memorySize: 1769,
logRetention: logs.RetentionDays.ONE_MONTH,
runtime: lambda.Runtime.NODEJS_18_X,
runtime: lambda.Runtime.NODEJS_22_X,
timeout: Duration.seconds(5),
...(removalPolicy ? { removalPolicy } : {}),
};
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-cdk/src/MicroAppsSvcs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export class MicroAppsSvcs extends Construct implements IMicroAppsSvcs {
role: iamRoleDeployer,
memorySize: 1769,
logRetention: logs.RetentionDays.ONE_MONTH,
runtime: lambda.Runtime.NODEJS_18_X,
runtime: lambda.Runtime.NODEJS_22_X,
timeout: deployerTimeout,
environment: {
NODE_ENV: appEnv,
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-datalib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"engine": {
"node": ">= 16.0.0"
"node": ">= 22.0.0"
},
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-deployer-lib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
},
"homepage": "https://github.com/pwrdrvr/microapps-core#readme",
"devDependencies": {
"@types/node": "^18.0.0"
"@types/node": "^22.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/microapps-deployer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"@types/fs-extra": "^9.0.11",
"@types/js-yaml": "^4.0.1",
"@types/lambda-log": "^2.2.0",
"@types/node": "^18.0.0",
"@types/node": "^22.0.0",
"@types/sinon": "^10.0.0",
"@types/source-map-support": "0.5.6",
"aws-sdk-client-mock": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/microapps-edge-to-origin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@types/convict": "^6.0.2",
"@types/convict-format-with-validator": "^6.0.2",
"@types/lambda-log": "^2.2.0",
"@types/node": "^18.0.0",
"@types/node": "^22.0.0",
"aws-sdk-client-mock": "2.1.0"
},
"dependencies": {
Expand Down
Loading