diff --git a/.projen/deps.json b/.projen/deps.json index f4e0c7a68..d8ad5d0ca 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -18,22 +18,10 @@ "name": "@commitlint/config-conventional", "type": "build" }, - { - "name": "@nrwl/cli", - "type": "build" - }, { "name": "@nrwl/devkit", "type": "build" }, - { - "name": "@nrwl/nx-cloud", - "type": "build" - }, - { - "name": "@nrwl/workspace", - "type": "build" - }, { "name": "@types/node", "version": "^16", @@ -107,8 +95,13 @@ "name": "npm-check-updates", "type": "build" }, + { + "name": "nx-cloud", + "type": "build" + }, { "name": "nx", + "version": "16.0.0", "type": "build" }, { @@ -200,8 +193,14 @@ "version": "^1.12.1", "type": "override" }, + { + "name": "nx", + "version": "^16", + "type": "peer" + }, { "name": "@pnpm/types", + "version": "^9.0.0", "type": "runtime" }, { diff --git a/.projenrc.ts b/.projenrc.ts index e6d61e045..c30d8360b 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -2,7 +2,6 @@ SPDX-License-Identifier: Apache-2.0 */ import { PDKProject } from "./private/pdk-project"; import { AwsArchProject } from "./private/projects/aws-arch"; -import { AwsPrototypingSdkProject } from "./private/projects/aws-prototyping-sdk-project"; import { CdkGraphProject } from "./private/projects/cdk-graph"; import { CdkGraphPluginDiagramProject } from "./private/projects/cdk-graph-plugin-diagram"; import { CloudscapeReactTsWebsiteProject } from "./private/projects/cloudscape-react-ts-website"; @@ -19,15 +18,10 @@ import { TypeSafeApiProject } from "./private/projects/type-safe-api-project"; // root/parent project const monorepoProject = new PDKMonorepoProject(); -// docs -const docsProject = new DocsProject(monorepoProject); - -const pdkNagProject = new PDKNagProject(monorepoProject); +new PDKNagProject(monorepoProject); // public packages -const nxMonorepoProject = new NXMonorepoProject(monorepoProject); -const pipelineProject = new PipelineProject(monorepoProject); -const awsPrototypingSdkProject = new AwsPrototypingSdkProject(monorepoProject); +new NXMonorepoProject(monorepoProject); new StaticWebsiteProject(monorepoProject); new IdentityProject(monorepoProject); new OpenApiGatewayProject(monorepoProject); @@ -36,10 +30,14 @@ new CloudscapeReactTsWebsiteProject(monorepoProject); new AwsArchProject(monorepoProject); new CdkGraphProject(monorepoProject); new CdkGraphPluginDiagramProject(monorepoProject); +const pipelineProject = new PipelineProject(monorepoProject); + +// docs +const docsProject = new DocsProject(monorepoProject); // implicit dependencies pipelineProject.samples.forEach((sample) => - monorepoProject.addImplicitDependency(sample, awsPrototypingSdkProject) + monorepoProject.addImplicitDependency(sample, pipelineProject) ); // Docs should have a dependency on all publishable packages @@ -47,14 +45,4 @@ monorepoProject.subProjects .filter((s: any) => s instanceof PDKProject && s.pdkRelease) .forEach((p) => monorepoProject.addImplicitDependency(docsProject, p)); -monorepoProject.addImplicitDependency(awsPrototypingSdkProject, pdkNagProject); -monorepoProject.addImplicitDependency( - awsPrototypingSdkProject, - pipelineProject -); -monorepoProject.addImplicitDependency( - awsPrototypingSdkProject, - nxMonorepoProject -); - monorepoProject.synth(); diff --git a/nx.json b/nx.json index 44dd7fb41..37983f4ab 100644 --- a/nx.json +++ b/nx.json @@ -1,9 +1,9 @@ { - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "npmScope": "monorepo", "tasksRunnerOptions": { "default": { - "runner": "@nrwl/nx-cloud", + "runner": "nx-cloud", "options": { "useDaemonProcess": false, "cacheableOperations": [ @@ -38,34 +38,13 @@ "projects": "dependencies" } ] + }, + "install": { + "dependsOn": [ + "^install" + ] } }, - "targetDependencies": { - "build": [ - { - "target": "build", - "projects": "dependencies" - } - ], - "release:mainline": [ - { - "target": "release:mainline", - "projects": "dependencies" - } - ], - "upgrade": [ - { - "target": "upgrade", - "projects": "dependencies" - } - ], - "install": [ - { - "target": "install", - "projects": "dependencies" - } - ] - }, "affected": { "defaultBase": "mainline" }, diff --git a/package.json b/package.json index 5fd304430..e167702c2 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,7 @@ "@aws-prototyping-sdk/pipeline": "^0.x", "@commitlint/cli": "^17.4.2", "@commitlint/config-conventional": "^17.4.2", - "@nrwl/cli": "^15.9.1", "@nrwl/devkit": "^15.9.1", - "@nrwl/nx-cloud": "^15.3.5", - "@nrwl/workspace": "^15.9.1", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -51,21 +48,25 @@ "lerna": "^6.4.1", "license-checker": "^25.0.1", "npm-check-updates": "^16.6.2", - "nx": "^15.9.1", + "nx": "16.0.0", + "nx-cloud": "^16.0.5", "oss-attribution-generator": "^1.7.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "syncpack": "^8.4.11", "ts-node": "^10.9.1", "typescript": "^4.9.4" }, + "peerDependencies": { + "nx": "^16" + }, "dependencies": { - "@pnpm/types": "*", + "@pnpm/types": "^9.0.0", "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", "fast-xml-parser": "^4.0.13", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "pnpm": { "overrides": { @@ -105,14 +106,8 @@ }, "workspaces": { "packages": [ - "public/docs", "packages/pdk-nag", "packages/nx-monorepo", - "packages/pipeline", - "packages/pipeline/samples/typescript", - "packages/pipeline/samples/python", - "packages/pipeline/samples/java", - "packages/aws-prototyping-sdk", "packages/static-website", "packages/identity", "packages/open-api-gateway", @@ -121,7 +116,12 @@ "packages/cloudscape-react-ts-website/samples", "packages/aws-arch", "packages/cdk-graph", - "packages/cdk-graph-plugin-diagram" + "packages/cdk-graph-plugin-diagram", + "packages/pipeline", + "samples/pipeline/typescript", + "samples/pipeline/python", + "samples/pipeline/java", + "public/docs" ] }, "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \"npx projen\"." diff --git a/packages/aws-arch/package.json b/packages/aws-arch/package.json index 347f52e0f..f0716559d 100644 --- a/packages/aws-arch/package.json +++ b/packages/aws-arch/package.json @@ -72,7 +72,7 @@ "lodash": "^4.17.21", "node-fetch": "^2.6.7", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "sharp": "^0.31.3", "tree-cli": "^0.6.7", "ts-jest": "^27", @@ -81,7 +81,7 @@ "xml-flow": "^1.0.4" }, "peerDependencies": { - "projen": "^0.71.27" + "projen": "^0.71.35" }, "pnpm": { "overrides": { diff --git a/packages/aws-prototyping-sdk/.eslintrc.json b/packages/aws-prototyping-sdk/.eslintrc.json deleted file mode 100644 index dd4c9027a..000000000 --- a/packages/aws-prototyping-sdk/.eslintrc.json +++ /dev/null @@ -1,141 +0,0 @@ -// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -{ - "env": { - "jest": true, - "node": true - }, - "root": true, - "plugins": [ - "@typescript-eslint", - "import", - "prettier", - "header" - ], - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaVersion": 2018, - "sourceType": "module", - "project": "./tsconfig.dev.json" - }, - "extends": [ - "plugin:import/typescript", - "prettier", - "plugin:prettier/recommended" - ], - "settings": { - "import/parsers": { - "@typescript-eslint/parser": [ - ".ts", - ".tsx" - ] - }, - "import/resolver": { - "node": {}, - "typescript": { - "project": "./tsconfig.dev.json", - "alwaysTryTypes": true - } - } - }, - "ignorePatterns": [ - "*.js", - "*.d.ts", - "node_modules/", - "*.generated.ts", - "coverage", - "scripts/**" - ], - "rules": { - "prettier/prettier": [ - "error" - ], - "@typescript-eslint/no-require-imports": [ - "error" - ], - "import/no-extraneous-dependencies": [ - "error", - { - "devDependencies": [ - "**/test/**", - "**/build-tools/**" - ], - "optionalDependencies": false, - "peerDependencies": true - } - ], - "import/no-unresolved": [ - "error" - ], - "import/order": [ - "warn", - { - "groups": [ - "builtin", - "external" - ], - "alphabetize": { - "order": "asc", - "caseInsensitive": true - } - } - ], - "no-duplicate-imports": [ - "error" - ], - "no-shadow": [ - "off" - ], - "@typescript-eslint/no-shadow": [ - "error" - ], - "key-spacing": [ - "error" - ], - "no-multiple-empty-lines": [ - "error" - ], - "@typescript-eslint/no-floating-promises": [ - "error" - ], - "no-return-await": [ - "off" - ], - "@typescript-eslint/return-await": [ - "error" - ], - "no-trailing-spaces": [ - "error" - ], - "dot-notation": [ - "error" - ], - "no-bitwise": [ - "error" - ], - "@typescript-eslint/member-ordering": [ - "error", - { - "default": [ - "public-static-field", - "public-static-method", - "protected-static-field", - "protected-static-method", - "private-static-field", - "private-static-method", - "field", - "constructor", - "method" - ] - } - ], - "header/header": [ - 2, - "block", - [ - "! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved.", - "SPDX-License-Identifier: Apache-2.0 " - ] - ] - }, - "overrides": [] -} diff --git a/packages/aws-prototyping-sdk/.gitattributes b/packages/aws-prototyping-sdk/.gitattributes deleted file mode 100644 index 50a9281a2..000000000 --- a/packages/aws-prototyping-sdk/.gitattributes +++ /dev/null @@ -1,18 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -/.eslintrc.json linguist-generated -/.gitattributes linguist-generated -/.gitignore linguist-generated -/.npmignore linguist-generated -/.npmrc linguist-generated -/.prettierignore linguist-generated -/.prettierrc.json linguist-generated -/.projen/** linguist-generated -/.projen/deps.json linguist-generated -/.projen/files.json linguist-generated -/.projen/tasks.json linguist-generated -/docs/api linguist-generated -/LICENSE linguist-generated -/package.json linguist-generated -/pnpm-lock.yaml linguist-generated -/tsconfig.dev.json linguist-generated \ No newline at end of file diff --git a/packages/aws-prototyping-sdk/.gitignore b/packages/aws-prototyping-sdk/.gitignore deleted file mode 100644 index 2267beca6..000000000 --- a/packages/aws-prototyping-sdk/.gitignore +++ /dev/null @@ -1,64 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -!/.gitattributes -!/.projen/tasks.json -!/.projen/deps.json -!/.projen/files.json -!/package.json -!/LICENSE -!/.npmignore -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -lerna-debug.log* -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json -pids -*.pid -*.seed -*.pid.lock -lib-cov -coverage -*.lcov -.nyc_output -build/Release -node_modules/ -jspm_packages/ -*.tsbuildinfo -.eslintcache -*.tgz -.yarn-integrity -.cache -* -!node_modules -!.eslintrc.json -!.git* -!.npm* -!scripts -!scripts/*.ts -!.projen -!LICENSE -!README.md -!.prettierignore -!.prettierrc.json -!tsconfig.dev.json -!package.json -LICENSE_THIRD_PARTY -!/.projenrc.js -/test-reports/ -junit.xml -/coverage/ -!/.prettierignore -!/.prettierrc.json -!/.npmrc -!/test/ -!/tsconfig.dev.json -!/src/ -/lib -/dist/ -!/.eslintrc.json -.jsii -tsconfig.json -/dist/changelog.md -/dist/version.txt -/docs/api diff --git a/packages/aws-prototyping-sdk/.npmignore b/packages/aws-prototyping-sdk/.npmignore deleted file mode 100644 index ed69da4ef..000000000 --- a/packages/aws-prototyping-sdk/.npmignore +++ /dev/null @@ -1,28 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -/.projen/ -/test-reports/ -junit.xml -/coverage/ -/test/ -/tsconfig.dev.json -/src/ -!/lib/ -!/lib/**/*.js -!/lib/**/*.d.ts -dist -/tsconfig.json -/.github/ -/.vscode/ -/.idea/ -/.projenrc.js -tsconfig.tsbuildinfo -/.eslintrc.json -!.jsii -/dist/changelog.md -/dist/version.txt -!LICENSE_THIRD_PARTY -/scripts/ -**/*.ts -!**/*.d.ts -!**/samples/**/*.ts -!samples diff --git a/packages/aws-prototyping-sdk/.prettierignore b/packages/aws-prototyping-sdk/.prettierignore deleted file mode 100644 index 46704c733..000000000 --- a/packages/aws-prototyping-sdk/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". diff --git a/packages/aws-prototyping-sdk/.prettierrc.json b/packages/aws-prototyping-sdk/.prettierrc.json deleted file mode 100644 index 84c85a388..000000000 --- a/packages/aws-prototyping-sdk/.prettierrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "overrides": [] -} diff --git a/packages/aws-prototyping-sdk/.projen/deps.json b/packages/aws-prototyping-sdk/.projen/deps.json deleted file mode 100644 index 6cb7637de..000000000 --- a/packages/aws-prototyping-sdk/.projen/deps.json +++ /dev/null @@ -1,224 +0,0 @@ -{ - "dependencies": [ - { - "name": "@types/fs-extra", - "version": "9.0.13", - "type": "build" - }, - { - "name": "@types/jest", - "version": "^27", - "type": "build" - }, - { - "name": "@types/node", - "version": "^16", - "type": "build" - }, - { - "name": "@typescript-eslint/eslint-plugin", - "version": "^5", - "type": "build" - }, - { - "name": "@typescript-eslint/parser", - "version": "^5", - "type": "build" - }, - { - "name": "aws-cdk-lib", - "type": "build" - }, - { - "name": "cdk-nag", - "type": "build" - }, - { - "name": "constructs", - "type": "build" - }, - { - "name": "eslint-config-prettier", - "type": "build" - }, - { - "name": "eslint-import-resolver-node", - "type": "build" - }, - { - "name": "eslint-import-resolver-typescript", - "type": "build" - }, - { - "name": "eslint-plugin-header", - "type": "build" - }, - { - "name": "eslint-plugin-import", - "type": "build" - }, - { - "name": "eslint-plugin-prettier", - "type": "build" - }, - { - "name": "eslint", - "version": "^8", - "type": "build" - }, - { - "name": "fs-extra", - "type": "build" - }, - { - "name": "jest-junit", - "version": "^15", - "type": "build" - }, - { - "name": "jest", - "version": "^27", - "type": "build" - }, - { - "name": "jsii-diff", - "type": "build" - }, - { - "name": "jsii-docgen", - "type": "build" - }, - { - "name": "jsii-pacmak", - "type": "build" - }, - { - "name": "jsii", - "version": "1.x", - "type": "build" - }, - { - "name": "license-checker", - "type": "build" - }, - { - "name": "prettier", - "type": "build" - }, - { - "name": "projen", - "type": "build" - }, - { - "name": "ts-jest", - "version": "^27", - "type": "build" - }, - { - "name": "ts-node", - "type": "build" - }, - { - "name": "typescript", - "type": "build" - }, - { - "name": "@nrwl/devkit", - "type": "bundled" - }, - { - "name": "@pnpm/reviewing.dependencies-hierarchy", - "type": "bundled" - }, - { - "name": "fs-extra", - "type": "bundled" - }, - { - "name": "semver", - "type": "bundled" - }, - { - "name": "@types/babel__traverse", - "version": "7.18.2", - "type": "override" - }, - { - "name": "@types/prettier", - "version": "2.6.0", - "type": "override" - }, - { - "name": "@types/yargs", - "version": "17.0.10", - "type": "override" - }, - { - "name": "ansi-regex", - "version": "^5.0.1", - "type": "override" - }, - { - "name": "argparse", - "version": "^1.0.10", - "type": "override" - }, - { - "name": "async", - "version": "^2.6.4", - "type": "override" - }, - { - "name": "debug", - "version": "^2.6.9", - "type": "override" - }, - { - "name": "deep-extend", - "version": "^0.5.1", - "type": "override" - }, - { - "name": "ejs", - "version": "^3.1.7", - "type": "override" - }, - { - "name": "got", - "version": "^11.8.5", - "type": "override" - }, - { - "name": "minimist", - "version": "^1.2.6", - "type": "override" - }, - { - "name": "nth-check", - "version": "^2.0.1", - "type": "override" - }, - { - "name": "underscore", - "version": "^1.12.1", - "type": "override" - }, - { - "name": "aws-cdk-lib", - "type": "peer" - }, - { - "name": "cdk-nag", - "type": "peer" - }, - { - "name": "constructs", - "type": "peer" - }, - { - "name": "projen", - "type": "peer" - } - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/packages/aws-prototyping-sdk/.projen/files.json b/packages/aws-prototyping-sdk/.projen/files.json deleted file mode 100644 index 9e99ed65d..000000000 --- a/packages/aws-prototyping-sdk/.projen/files.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "files": [ - ".eslintrc.json", - ".gitattributes", - ".gitignore", - ".npmrc", - ".prettierignore", - ".prettierrc.json", - ".projen/deps.json", - ".projen/files.json", - ".projen/tasks.json", - "LICENSE", - "tsconfig.dev.json" - ], - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/packages/aws-prototyping-sdk/.projen/tasks.json b/packages/aws-prototyping-sdk/.projen/tasks.json deleted file mode 100644 index e66926758..000000000 --- a/packages/aws-prototyping-sdk/.projen/tasks.json +++ /dev/null @@ -1,291 +0,0 @@ -{ - "tasks": { - "build": { - "name": "build", - "description": "Full release build", - "steps": [ - { - "spawn": "pre-compile" - }, - { - "spawn": "compile" - }, - { - "spawn": "post-compile" - }, - { - "spawn": "test" - }, - { - "spawn": "package" - } - ] - }, - "bump": { - "name": "bump", - "description": "Bumps version based on latest git tag and generates a changelog entry", - "env": { - "OUTFILE": "package.json", - "CHANGELOG": "dist/changelog.md", - "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt", - "RELEASE_TAG_PREFIX": "" - }, - "steps": [ - { - "builtin": "release/bump-version" - } - ], - "condition": "! git log --oneline -1 | grep -q \"chore(release):\"" - }, - "clean": { - "name": "clean", - "steps": [ - { - "exec": "find . -maxdepth 1 ! -name \".\" ! -name \"..\" ! -name \"dist\" ! -name \"node_modules\" ! -name \".eslintrc.json\" ! -name \".git*\" ! -name \".npm*\" ! -name \"scripts\" ! -name \"scripts/*.ts\" ! -name \".projen\" ! -name \"LICENSE\" ! -name \"README.md\" ! -name \".prettierignore\" ! -name \".prettierrc.json\" ! -name \"tsconfig.dev.json\" ! -name \"tsconfig.json\" ! -name \"package.json\" -exec rm -rf {} \\;" - } - ] - }, - "compat": { - "name": "compat", - "description": "Perform API compatibility check against latest version", - "steps": [ - { - "exec": "jsii-diff npm:$(node -p \"require('./package.json').name\") -k --ignore-file .compatignore || (echo \"\nUNEXPECTED BREAKING CHANGES: add keys such as 'removed:constructs.Node.of' to .compatignore to skip.\n\" && exit 1)" - } - ] - }, - "compile": { - "name": "compile", - "description": "Only compile", - "steps": [ - { - "exec": "jsii --silence-warnings=reserved-word" - } - ] - }, - "default": { - "name": "default", - "description": "Synthesize project files" - }, - "docgen": { - "name": "docgen", - "description": "Generate API docs from .jsii manifest", - "steps": [ - { - "exec": "mkdir -p docs/api/typescript && jsii-docgen -r -o docs/api/typescript/index.md" - }, - { - "exec": "mkdir -p docs/api/python && jsii-docgen -l python -r -o docs/api/python/index.md" - }, - { - "exec": "mkdir -p docs/api/java && jsii-docgen -l java -r -o docs/api/java/index.md" - } - ] - }, - "eslint": { - "name": "eslint", - "description": "Runs eslint against the codebase", - "steps": [ - { - "exec": "eslint --ext .ts,.tsx ${CI:-'--fix'} --no-error-on-unmatched-pattern src test", - "receiveArgs": true - } - ] - }, - "eslint-staged": { - "name": "eslint-staged", - "description": "Run eslint against the staged files only", - "steps": [ - { - "exec": "eslint --fix --no-error-on-unmatched-pattern $(git diff --name-only --relative --staged HEAD . | grep -E '.(ts|tsx)$' | grep -v 'samples/*' | xargs)" - } - ] - }, - "install": { - "name": "install", - "description": "Install project dependencies and update lockfile (non-frozen)", - "steps": [ - { - "exec": "pnpm i --no-frozen-lockfile" - } - ] - }, - "install:ci": { - "name": "install:ci", - "description": "Install project dependencies using frozen lockfile", - "steps": [ - { - "exec": "pnpm i --frozen-lockfile" - } - ] - }, - "jest": { - "name": "jest", - "steps": [ - { - "exec": "jest --passWithNoTests ${CI:-'--updateSnapshot'} ${NX_INVOKED_BY_RUNNER:+'--runInBand'}", - "receiveArgs": true - } - ] - }, - "package": { - "name": "package", - "description": "Creates the distribution package", - "steps": [ - { - "exec": "pnpm exec license-checker --summary --production --onlyAllow 'MIT;Apache-2.0;Unlicense;BSD;BSD-2-Clause;BSD-3-Clause;ISC;'" - }, - { - "spawn": "package-all" - } - ] - }, - "package-all": { - "name": "package-all", - "description": "Packages artifacts for all target languages", - "steps": [ - { - "spawn": "package:js" - }, - { - "spawn": "package:java" - }, - { - "spawn": "package:python" - } - ] - }, - "package:java": { - "name": "package:java", - "description": "Create java language bindings", - "steps": [ - { - "exec": "[ -d ~/.m2/repository ] && [ ! -d \"../../node_modules/.cache/.m2/repository\" ] && mkdir -p ../../node_modules/.cache/.m2 && ln -s ~/.m2/repository ../../node_modules/.cache/.m2/repository || true" - }, - { - "exec": "jsii-pacmak -v --target java --maven-local-repository=../../node_modules/.cache/.m2/repository --pack-command='pnpm pack'" - } - ] - }, - "package:js": { - "name": "package:js", - "description": "Create js language bindings", - "steps": [ - { - "exec": "jsii-pacmak -v --target js --pack-command='pnpm pack'" - } - ] - }, - "package:python": { - "name": "package:python", - "description": "Create python language bindings", - "steps": [ - { - "exec": "jsii-pacmak -v --target python --pack-command='pnpm pack'" - } - ] - }, - "post-compile": { - "name": "post-compile", - "description": "Runs after successful compilation", - "steps": [ - { - "spawn": "docgen" - } - ] - }, - "pre-compile": { - "name": "pre-compile", - "description": "Prepare the project for compilation", - "steps": [ - { - "spawn": "clean" - }, - { - "exec": "./scripts/bundle.ts" - } - ] - }, - "release:mainline": { - "name": "release:mainline", - "description": "Prepare a release from \"mainline\" branch", - "env": { - "RELEASE": "true" - }, - "steps": [ - { - "exec": "rm -rf dist" - }, - { - "spawn": "bump" - }, - { - "spawn": "pre-compile" - }, - { - "spawn": "compile" - }, - { - "spawn": "post-compile" - }, - { - "spawn": "package" - }, - { - "spawn": "unbump" - } - ] - }, - "test": { - "name": "test", - "description": "Run tests", - "steps": [ - { - "spawn": "jest" - }, - { - "spawn": "eslint" - } - ] - }, - "test:watch": { - "name": "test:watch", - "description": "Run jest in watch mode", - "steps": [ - { - "exec": "jest --watch" - } - ] - }, - "unbump": { - "name": "unbump", - "description": "Restores version to 0.0.0", - "env": { - "OUTFILE": "package.json", - "CHANGELOG": "dist/changelog.md", - "BUMPFILE": "dist/version.txt", - "RELEASETAG": "dist/releasetag.txt", - "RELEASE_TAG_PREFIX": "" - }, - "steps": [ - { - "builtin": "release/reset-version" - } - ] - }, - "watch": { - "name": "watch", - "description": "Watch & compile in the background", - "steps": [ - { - "exec": "jsii -w --silence-warnings=reserved-word" - } - ] - } - }, - "env": { - "PATH": "$(npx -c \"node -e \\\"console.log(process.env.PATH)\\\"\")" - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/packages/aws-prototyping-sdk/README.md b/packages/aws-prototyping-sdk/README.md deleted file mode 100644 index b29d29586..000000000 --- a/packages/aws-prototyping-sdk/README.md +++ /dev/null @@ -1,39 +0,0 @@ -> **DEPRECATION NOTICE:** The `aws-prototyping-sdk` is on path to deprecation. This package is simply a wrapper around the individual `@aws-prototyping-skd/*` packages and has no unique code aside from bundling the other packages. Due to lack of significant value compared to maintenance overhead, this package will be deprecated soon in favor of using the individual packages directly. Please use the individual packages starting now to prevent future migration and loss of update capabilities. - -The aws-prototyping-sdk provides stable CDK and Projen constructs, allowing developers to have access to higher level abstractions than provided by the CDK or Projen alone. - -For detailed documentation, please refer to the [documentation website](https://aws.github.io/aws-prototyping-sdk/). - -## Bundling - -This package simply bundles various packages from the `@aws-prototyping-sdk` namespace which have been marked as `stable`. As such, not all constructs or classes may be exported from this package and will need to be explicitly imported by creating a dependency on the individual packages. - -To illustrate, at the time of writing the following individual packages are published: - -``` -@aws-prototyping-sdk - |_ pipeline : [stable] - |_ nx-monorepo : [stable] - |_ static-website : [experimental] - |_ identity : [experimental] -``` - -The aws-prototyping-sdk package will bundle all stable packages and export them as namespaces as follows: - -``` -aws-prototyping-sdk - |_ pipeline - |_ nx_monorepo -``` - -This means if you wanted to access the PDKPipeline which is a stable construct, you simply add a dependency on the `aws-prototyping-sdk` and import it as follows: - -```ts -import { nx_monorepo, pipeline } from "aws-prototyping-sdk"; -``` - -To import `experimental` constructs, a dependency on the individual package is required. In the case of `static-website`, a dependency on `@aws-prototyping-sdk/static-website` is required. The constructs can then be imported as follows: - -```ts -import { StaticWebsite } from "@aws-prototyping-sdk/static-website"; -``` diff --git a/packages/aws-prototyping-sdk/package.json b/packages/aws-prototyping-sdk/package.json deleted file mode 100644 index 03bc2409e..000000000 --- a/packages/aws-prototyping-sdk/package.json +++ /dev/null @@ -1,223 +0,0 @@ -{ - "name": "aws-prototyping-sdk", - "repository": { - "type": "git", - "url": "https://github.com/aws/aws-prototyping-sdk" - }, - "scripts": { - "build": "pnpm exec projen build", - "bump": "pnpm exec projen bump", - "clean": "pnpm exec projen clean", - "compat": "pnpm exec projen compat", - "compile": "pnpm exec projen compile", - "default": "pnpm exec projen default", - "docgen": "pnpm exec projen docgen", - "eslint": "pnpm exec projen eslint", - "eslint-staged": "pnpm exec projen eslint-staged", - "jest": "pnpm exec projen jest", - "package": "pnpm exec projen package", - "package-all": "pnpm exec projen package-all", - "package:java": "pnpm exec projen package:java", - "package:js": "pnpm exec projen package:js", - "package:python": "pnpm exec projen package:python", - "post-compile": "pnpm exec projen post-compile", - "pre-compile": "pnpm exec projen pre-compile", - "release:mainline": "pnpm exec projen release:mainline", - "test": "pnpm exec projen test", - "test:watch": "pnpm exec projen test:watch", - "unbump": "pnpm exec projen unbump", - "watch": "pnpm exec projen watch", - "projen": "pnpm exec projen" - }, - "author": { - "name": "AWS APJ COPE", - "email": "apj-cope@amazon.com", - "organization": false - }, - "devDependencies": { - "@types/fs-extra": "9.0.13", - "@types/jest": "^27", - "@types/node": "^16", - "@typescript-eslint/eslint-plugin": "^5", - "@typescript-eslint/parser": "^5", - "aws-cdk-lib": "^2.60.0", - "cdk-nag": "^2.21.65", - "constructs": "^10.1.222", - "eslint": "^8", - "eslint-config-prettier": "^8.6.0", - "eslint-import-resolver-node": "^0.3.7", - "eslint-import-resolver-typescript": "^3.5.3", - "eslint-plugin-header": "^3.1.1", - "eslint-plugin-import": "^2.27.5", - "eslint-plugin-prettier": "^4.2.1", - "fs-extra": "^10.1.0", - "jest": "^27", - "jest-junit": "^15", - "jsii": "1.x", - "jsii-diff": "^1.80.0", - "jsii-docgen": "^7.2.1", - "jsii-pacmak": "^1.80.0", - "license-checker": "^25.0.1", - "prettier": "^2.8.3", - "projen": "^0.71.27", - "ts-jest": "^27", - "ts-node": "^10.9.1", - "typescript": "^4.9.4" - }, - "peerDependencies": { - "aws-cdk-lib": "^2.60.0", - "cdk-nag": "^2.21.65", - "constructs": "^10.1.222", - "projen": "^0.71.27" - }, - "dependencies": { - "@nrwl/devkit": "^15.9.1", - "@pnpm/reviewing.dependencies-hierarchy": "^2.0.2", - "fs-extra": "^10.1.0", - "semver": "^4.3.6" - }, - "bundledDependencies": [ - "@nrwl/devkit", - "@pnpm/reviewing.dependencies-hierarchy", - "fs-extra", - "semver" - ], - "pnpm": { - "overrides": { - "@types/prettier": "2.6.0", - "@types/babel__traverse": "7.18.2", - "ansi-regex": "^5.0.1", - "underscore": "^1.12.1", - "deep-extend": "^0.5.1", - "argparse": "^1.0.10", - "debug": "^2.6.9", - "minimist": "^1.2.6", - "ejs": "^3.1.7", - "async": "^2.6.4", - "nth-check": "^2.0.1", - "got": "^11.8.5", - "@types/yargs": "17.0.10" - } - }, - "keywords": [ - "aws", - "jsii", - "pdk", - "projen" - ], - "main": "./index.js", - "license": "Apache-2.0", - "publishConfig": { - "access": "public" - }, - "version": "0.0.0", - "jest": { - "testMatch": [ - "/src/**/__tests__/**/*.ts?(x)", - "/(test|src)/**/*(*.)@(spec|test).ts?(x)" - ], - "clearMocks": true, - "collectCoverage": true, - "coverageReporters": [ - "json", - "lcov", - "clover", - "cobertura", - "text" - ], - "coverageDirectory": "coverage", - "coveragePathIgnorePatterns": [ - "/node_modules/" - ], - "testPathIgnorePatterns": [ - "/node_modules/" - ], - "watchPathIgnorePatterns": [ - "/node_modules/" - ], - "reporters": [ - "default", - [ - "jest-junit", - { - "outputDirectory": "test-reports" - } - ] - ], - "preset": "ts-jest", - "globals": { - "ts-jest": { - "tsconfig": "tsconfig.dev.json" - } - } - }, - "types": "./index.d.ts", - "stability": "stable", - "jsii": { - "outdir": "dist", - "targets": { - "java": { - "package": "software.aws.awsprototypingsdk", - "maven": { - "groupId": "software.aws.awsprototypingsdk", - "artifactId": "aws-prototyping-sdk" - } - }, - "python": { - "distName": "aws_prototyping_sdk", - "module": "aws_prototyping_sdk" - } - }, - "tsc": { - "outDir": ".", - "rootDir": "." - }, - "excludeTypescript": [ - "**/samples/**" - ] - }, - "nx": { - "targets": { - "build": { - "outputs": [ - "{projectRoot}/dist", - "{projectRoot}/lib", - "{projectRoot}/build", - "{projectRoot}/coverage", - "{projectRoot}/test-reports", - "{projectRoot}/target", - "{projectRoot}/LICENSE_THIRD_PARTY", - "{projectRoot}/.jsii", - "{projectRoot}/docs/api", - "{projectRoot}/nx-monorepo", - "{projectRoot}/pdk-nag", - "{projectRoot}/pipeline" - ], - "dependsOn": [ - { - "target": "build", - "projects": "dependencies" - } - ] - } - }, - "implicitDependencies": [ - "@aws-prototyping-sdk/pdk-nag", - "@aws-prototyping-sdk/pipeline", - "@aws-prototyping-sdk/nx-monorepo" - ] - }, - "bundle": { - "exclude": true - }, - "exports": { - ".": "./index.js", - "./package.json": "./package.json", - "./.jsii": "./.jsii", - "./.warnings.jsii.js": "./.warnings.jsii.js", - "./nx-monorepo": "./nx-monorepo/index.js", - "./pdk-nag": "./pdk-nag/index.js", - "./pipeline": "./pipeline/index.js" - }, - "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." -} diff --git a/packages/aws-prototyping-sdk/scripts/bundle.d.ts b/packages/aws-prototyping-sdk/scripts/bundle.d.ts deleted file mode 100644 index 2f886d7a3..000000000 --- a/packages/aws-prototyping-sdk/scripts/bundle.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env ts-node -export {}; diff --git a/packages/aws-prototyping-sdk/scripts/bundle.ts b/packages/aws-prototyping-sdk/scripts/bundle.ts deleted file mode 100755 index 04780d8fc..000000000 --- a/packages/aws-prototyping-sdk/scripts/bundle.ts +++ /dev/null @@ -1,462 +0,0 @@ -#!/usr/bin/env ts-node - -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. -SPDX-License-Identifier: Apache-2.0 */ -import * as console from "console"; -import * as path from "path"; -import * as process from "process"; -import * as fs from "fs-extra"; -import { Stability } from "projen/lib/cdk"; - -// The directory where our 'package.json' lives -const MONOPACKAGE_ROOT = process.cwd(); - -const ROOT_PATH = findWorkspacePath(); -const LIBRARIES_ROOT = path.resolve(ROOT_PATH, "packages"); -const UBER_PACKAGE_JSON_PATH = path.join(MONOPACKAGE_ROOT, "package.json"); - -const EXCLUDED_PACKAGES: string[] = []; - -async function main() { - console.log(`🌴 workspace root path is: ${ROOT_PATH}`); - const uberPackageJson = (await fs.readJson( - UBER_PACKAGE_JSON_PATH - )) as PackageJson; - const libraries = await findLibrariesToPackage(uberPackageJson); - await verifyDependencies(uberPackageJson, libraries); - await prepareSourceFiles(libraries, uberPackageJson); -} - -main().then( - () => process.exit(0), - (err) => { - console.error("❌ An error occurred: ", err.stack); - process.exit(1); - } -); - -interface LibraryReference { - readonly packageJson: PackageJson; - readonly root: string; - readonly shortName: string; -} - -interface PackageJson { - readonly main?: string; - readonly description?: string; - readonly bundleDependencies?: readonly string[]; - readonly bundledDependencies?: readonly string[]; - readonly dependencies?: { readonly [name: string]: string }; - readonly devDependencies?: { readonly [name: string]: string }; - readonly jsii: { - readonly targets?: { - readonly dotnet?: { - readonly namespace: string; - readonly [key: string]: unknown; - }; - readonly java?: { - readonly package: string; - readonly [key: string]: unknown; - }; - readonly python?: { - readonly module: string; - readonly [key: string]: unknown; - }; - readonly [language: string]: unknown; - }; - }; - readonly name: string; - readonly types: string; - readonly version: string; - readonly stability: string; - readonly [key: string]: unknown; - readonly bundle?: { - readonly deprecatedPackages?: readonly string[]; - - /** - * Whether to exclude this package from the uber package - * - * @default false - */ - readonly exclude?: boolean; - - /** - * The directory where we're going to collect all the libraries. - * - * @default - root of the bundle package - */ - readonly libRoot?: string; - }; - exports?: Record; -} - -/** - * Find the workspace root path. Walk up the directory tree until you find nx.json - */ -function findWorkspacePath(): string { - return _findRootPath(process.cwd()); - - function _findRootPath(part: string): string { - if (part === path.resolve(part, "..")) { - throw new Error( - "couldn't find a 'nx.json' file when walking up the directory tree, are you in a aws-pdk project?" - ); - } - - if (fs.existsSync(path.resolve(part, "nx.json"))) { - return part; - } - - return _findRootPath(path.resolve(part, "..")); - } -} - -async function findLibrariesToPackage( - uberPackageJson: PackageJson -): Promise { - console.log("🔍 Discovering libraries that need packaging..."); - - const deprecatedPackages = uberPackageJson.bundle?.deprecatedPackages; - const result = new Array(); - - for (const dir of await fs.readdir(LIBRARIES_ROOT)) { - const packageJsonPath = path.resolve(LIBRARIES_ROOT, dir, "package.json"); - if (!fs.pathExistsSync(packageJsonPath)) { - continue; - } - - const packageJson = (await fs.readJson(packageJsonPath)) as PackageJson; - - if ( - packageJson.bundle?.exclude || - EXCLUDED_PACKAGES.includes(packageJson.name) - ) { - console.log(`\t⚠️ Skipping (bundle excluded): ${packageJson.name}`); - continue; - } else if (packageJson.jsii == null) { - console.log(`\t⚠️ Skipping (not jsii-enabled): ${packageJson.name}`); - continue; - } else if ( - deprecatedPackages?.some( - (packageName) => packageName === packageJson.name - ) - ) { - console.log(`\t⚠️ Skipping (bundle deprecated): ${packageJson.name}`); - continue; - } else if (packageJson.deprecated) { - console.log(`\t⚠️ Skipping (deprecated): ${packageJson.name}`); - continue; - } else if (packageJson.stability !== Stability.STABLE) { - console.log(`\t⚠️ Skipping (non stable): ${packageJson.name}`); - continue; - } - result.push({ - packageJson, - root: path.join(LIBRARIES_ROOT, dir), - shortName: - packageJson.name === "aws-prototyping-sdk" - ? packageJson.name - : packageJson.name.slice("@aws-prototyping-sdk/".length), - }); - } - - console.log(`\tℹ️ Found ${result.length} relevant packages!`); - - return result; -} - -async function verifyDependencies( - packageJson: any, - libraries: readonly LibraryReference[] -): Promise { - console.log("🧐 Verifying dependencies are complete..."); - const toBundle: Record = {}; - - for (const library of libraries) { - for (const depName of library.packageJson.bundleDependencies ?? - library.packageJson.bundledDependencies ?? - []) { - const requiredVersion = - library.packageJson.devDependencies?.[depName] ?? - library.packageJson.dependencies?.[depName] ?? - "*"; - if (toBundle[depName] != null && toBundle[depName] !== requiredVersion) { - throw new Error( - `Required to bundle different versions of ${depName}: ${toBundle[depName]} and ${requiredVersion}.` - ); - } - toBundle[depName] = requiredVersion; - } - } - - const spuriousBundledDeps = new Set( - packageJson.bundledDependencies ?? [] - ); - for (const [name, version] of Object.entries(toBundle)) { - spuriousBundledDeps.delete(name); - - if (!packageJson.bundledDependencies?.includes(name)) { - throw new Error(`\t⚠️ Missing bundled dependency: ${name} at ${version}`); - } - - if (packageJson.dependencies?.[name] !== version) { - throw new Error( - `\t⚠️ Missing or incorrect dependency: ${name} at ${version}` - ); - } - } - packageJson.bundledDependencies = packageJson.bundledDependencies?.filter( - (dep: string) => !spuriousBundledDeps.has(dep) - ); - if (spuriousBundledDeps.size > 0) { - throw new Error( - `\t⚠️ Spurious bundled dependencies detected. Please remove from dependencies: ${spuriousBundledDeps}` - ); - } - - console.log("\t✅ Dependencies are correct!"); -} - -async function prepareSourceFiles( - libraries: readonly LibraryReference[], - packageJson: PackageJson -) { - console.log("📝 Preparing source files..."); - - const libRoot = resolveLibRoot(packageJson); - - // Should not remove collection directory if we're currently in it. The OS would be unhappy. - if (libRoot !== process.cwd()) { - await fs.remove(libRoot); - } - - const indexStatements = new Array(); - for (const library of libraries) { - const libDir = path.join(libRoot, library.shortName); - const copied = await transformPackage( - library, - packageJson, - libDir, - libraries - ); - - if (!copied) { - continue; - } - - indexStatements.push( - `export * as ${library.shortName.replace(/-/g, "_")} from './${ - library.shortName - }';` - ); - } - - await fs.writeFile( - path.join(libRoot, "index.ts"), - indexStatements.join("\n"), - { encoding: "utf8" } - ); - - console.log("\t🍺 Success!"); -} - -async function transformPackage( - library: LibraryReference, - uberPackageJson: PackageJson, - destination: string, - allLibraries: readonly LibraryReference[] -) { - await fs.mkdirp(destination); - await copyOrTransformFiles( - library.root, - destination, - allLibraries, - uberPackageJson - ); - - await fs.writeFile( - path.join(destination, "index.ts"), - `export * from './src';\n`, - { encoding: "utf8" } - ); - - const config = uberPackageJson.jsii.targets; - await fs.writeJson( - path.join(destination, ".jsiirc.json"), - { - targets: transformTargets(config, library.packageJson.jsii.targets), - }, - { spaces: 2 } - ); - - // if libRoot is _not_ under the root of the package, generate a file at the - // root that will refer to the one under lib/ so that users can still import - // from "monocdk/aws-lambda". - const relativeLibRoot = uberPackageJson.bundle?.libRoot; - if (relativeLibRoot && relativeLibRoot !== ".") { - await fs.writeFile( - path.resolve(MONOPACKAGE_ROOT, `${library.shortName}.ts`), - `export * from './${relativeLibRoot}/${library.shortName}';\n`, - { encoding: "utf8" } - ); - } - - return true; -} - -function transformTargets( - monoConfig: PackageJson["jsii"]["targets"], - targets: PackageJson["jsii"]["targets"] -): PackageJson["jsii"]["targets"] { - if (targets == null) { - return targets; - } - - const result: Record = {}; - for (const [language, config] of Object.entries(targets)) { - switch (language) { - case "dotnet": - if (monoConfig?.dotnet != null) { - result[language] = { - namespace: (config as any).namespace, - }; - } - break; - case "java": - if (monoConfig?.java != null) { - result[language] = { - package: (config as any).package, - }; - } - break; - case "python": - if (monoConfig?.python != null) { - result[language] = { - module: `${monoConfig.python.module}.${( - config as any - ).module.replace(/^aws_prototyping_sdk\./, "")}`, - }; - } - break; - default: - throw new Error( - `Unsupported language for submodule configuration translation: ${language}` - ); - } - } - - return result; -} - -async function copyOrTransformFiles( - from: string, - to: string, - libraries: readonly LibraryReference[], - uberPackageJson: PackageJson -) { - const promises = (await fs.readdir(from)).map(async (name) => { - if (shouldIgnoreFile(name)) { - return; - } - - if (name.endsWith(".d.ts") || name.endsWith(".js")) { - if ( - await fs.pathExists( - path.join(from, name.replace(/\.(d\.ts|js)$/, ".ts")) - ) - ) { - // We won't copy .d.ts and .js files with a corresponding .ts file - return; - } - } - - const source = path.join(from, name); - const destination = path.join(to, name); - - const stat = await fs.stat(source); - if (stat.isDirectory()) { - await fs.mkdirp(destination); - return copyOrTransformFiles( - source, - destination, - libraries, - uberPackageJson - ); - } - - if (name.endsWith(".ts")) { - const sourceCode = fs - .readFileSync(source) - .toString() - .replace( - /(import .* from ["'])@aws-prototyping-sdk(\/.*['"];)/g, - `$1${path.relative( - path.dirname(destination), - path.join(LIBRARIES_ROOT, "aws-prototyping-sdk") - )}$2` - ); - return fs.writeFile(destination, sourceCode); - } else { - return fs.copyFile(source, destination); - } - }); - - await Promise.all(promises); -} - -const IGNORED_FILE_NAMES = new Set([ - ".eslintrc.js", - ".gitignore", - ".jest.config.js", - ".jsii", - ".env", - "target", - "dist", - "lib", - "scripts", - "test", - ".npmignore", - "node_modules", - "package.json", - "project.json", - "tsconfig.json", - "tsconfig.tsbuildinfo", - "LICENSE", - "NOTICE", -]); - -function shouldIgnoreFile(name: string): boolean { - return IGNORED_FILE_NAMES.has(name); -} - -/** - * Resolves the directory where we're going to collect all the libraries. - * - * By default, this is purposely the same as the monopackage root so that our - * two import styles resolve to the same files but it can be overridden by - * seeting `bundle.libRoot` in the package.json of the uber package. - * - * @param uberPackageJson package.json contents of the uber package - * @returns The directory where we should collect all the libraries. - */ -function resolveLibRoot(uberPackageJson: PackageJson): string { - return path.resolve(uberPackageJson.bundle?.libRoot ?? MONOPACKAGE_ROOT); -} diff --git a/packages/aws-prototyping-sdk/tsconfig.dev.json b/packages/aws-prototyping-sdk/tsconfig.dev.json deleted file mode 100644 index 9f81b55ee..000000000 --- a/packages/aws-prototyping-sdk/tsconfig.dev.json +++ /dev/null @@ -1,38 +0,0 @@ -// ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -{ - "compilerOptions": { - "alwaysStrict": true, - "declaration": true, - "esModuleInterop": true, - "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, - "lib": [ - "es2019" - ], - "module": "CommonJS", - "noEmitOnError": false, - "noFallthroughCasesInSwitch": true, - "noImplicitAny": true, - "noImplicitReturns": true, - "noImplicitThis": true, - "noUnusedLocals": true, - "noUnusedParameters": true, - "resolveJsonModule": true, - "strict": true, - "strictNullChecks": true, - "strictPropertyInitialization": true, - "stripInternal": true, - "target": "ES2019", - "outDir": ".", - "rootDir": "." - }, - "include": [ - ".projenrc.js", - "src/**/*.ts", - "test/**/*.ts" - ], - "exclude": [ - "node_modules" - ] -} diff --git a/packages/cdk-graph-plugin-diagram/package.json b/packages/cdk-graph-plugin-diagram/package.json index 4b72e6cfb..799484c7f 100644 --- a/packages/cdk-graph-plugin-diagram/package.json +++ b/packages/cdk-graph-plugin-diagram/package.json @@ -73,7 +73,7 @@ "prebuild": "^11.0.4", "prebuild-install": "^7.1.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "ts-node": "^10.9.1", "typescript": "^4.9.4" @@ -83,7 +83,7 @@ "@aws-prototyping-sdk/cdk-graph": "^0.x", "aws-cdk-lib": "^2.60.0", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@hpcc-js/wasm": "^2.7.0", diff --git a/packages/cdk-graph/package.json b/packages/cdk-graph/package.json index 3f5ec6c49..8a7f5b068 100644 --- a/packages/cdk-graph/package.json +++ b/packages/cdk-graph/package.json @@ -66,14 +66,14 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, "peerDependencies": { "aws-cdk-lib": "^2.60.0", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "chalk": "^4.x", diff --git a/packages/cloudscape-react-ts-website/package.json b/packages/cloudscape-react-ts-website/package.json index fdad5a66c..6db5fb11d 100644 --- a/packages/cloudscape-react-ts-website/package.json +++ b/packages/cloudscape-react-ts-website/package.json @@ -53,12 +53,12 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, "peerDependencies": { - "projen": "^0.71.27" + "projen": "^0.71.35" }, "pnpm": { "overrides": { diff --git a/packages/cloudscape-react-ts-website/samples/package.json b/packages/cloudscape-react-ts-website/samples/package.json index 873ce30d6..401b8f125 100644 --- a/packages/cloudscape-react-ts-website/samples/package.json +++ b/packages/cloudscape-react-ts-website/samples/package.json @@ -29,7 +29,7 @@ "eslint-import-resolver-typescript": "^3.5.3", "eslint-plugin-header": "^3.1.1", "eslint-plugin-import": "^2.27.5", - "projen": "^0.71.27", + "projen": "^0.71.35", "typescript": "^4.0.3" }, "dependencies": { diff --git a/packages/identity/package.json b/packages/identity/package.json index 4698f7231..a6c5eb24e 100644 --- a/packages/identity/package.json +++ b/packages/identity/package.json @@ -57,7 +57,7 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, @@ -66,7 +66,7 @@ "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@aws-prototyping-sdk/pdk-nag": "^0.x" diff --git a/packages/nx-monorepo/.projen/deps.json b/packages/nx-monorepo/.projen/deps.json index ea8efcd5b..2bb11c774 100644 --- a/packages/nx-monorepo/.projen/deps.json +++ b/packages/nx-monorepo/.projen/deps.json @@ -109,10 +109,6 @@ "name": "typescript", "type": "build" }, - { - "name": "@nrwl/devkit", - "type": "bundled" - }, { "name": "@pnpm/reviewing.dependencies-hierarchy", "type": "bundled" diff --git a/packages/nx-monorepo/package.json b/packages/nx-monorepo/package.json index 25f46f26f..743dc1beb 100644 --- a/packages/nx-monorepo/package.json +++ b/packages/nx-monorepo/package.json @@ -60,21 +60,19 @@ "license-checker": "^25.0.1", "nx": "^15.9.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, "peerDependencies": { - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { - "@nrwl/devkit": "^15.9.1", "@pnpm/reviewing.dependencies-hierarchy": "^2.0.2", "fs-extra": "^10.1.0", "semver": "^4.3.6" }, "bundledDependencies": [ - "@nrwl/devkit", "@pnpm/reviewing.dependencies-hierarchy", "fs-extra", "semver" diff --git a/packages/nx-monorepo/src/nx-monorepo.ts b/packages/nx-monorepo/src/nx-monorepo.ts index 5e637c69c..2fb6ff44c 100644 --- a/packages/nx-monorepo/src/nx-monorepo.ts +++ b/packages/nx-monorepo/src/nx-monorepo.ts @@ -377,7 +377,7 @@ export class NxMonorepoProject extends TypeScriptProject { }); } - this.addDevDeps("nx", "@nrwl/cli", "@nrwl/workspace"); + this.addPeerDeps("nx@^16"); this.addDeps("aws-cdk-lib", "constructs", "cdk-nag"); // Needed as this can be bundled in aws-prototyping-sdk this.package.addPackageResolutions("@types/babel__traverse@7.18.2"); @@ -416,8 +416,7 @@ export class NxMonorepoProject extends TypeScriptProject { }); } - options.nxConfig?.nxCloudReadOnlyAccessToken && - this.addDevDeps("@nrwl/nx-cloud"); + options.nxConfig?.nxCloudReadOnlyAccessToken && this.addDevDeps("nx-cloud"); new IgnoreFile(this, ".nxignore").exclude( "test-reports", @@ -429,13 +428,13 @@ export class NxMonorepoProject extends TypeScriptProject { this.nxJson = new JsonFile(this, "nx.json", { obj: { - extends: "@nrwl/workspace/presets/npm.json", + extends: "nx/presets/npm.json", npmScope: "monorepo", tasksRunnerOptions: { default: { runner: options.nxConfig?.nxCloudReadOnlyAccessToken - ? "@nrwl/nx-cloud" - : "@nrwl/workspace/tasks-runners/default", + ? "nx-cloud" + : "nx/tasks-runners/default", options: { useDaemonProcess: false, cacheableOperations: options.nxConfig?.cacheableOperations || [ @@ -451,15 +450,11 @@ export class NxMonorepoProject extends TypeScriptProject { default: ["{projectRoot}/**/*"], ...options.nxConfig?.namedInputs, }, - targetDefaults: options.nxConfig?.targetDefaults, - targetDependencies: { - build: [ - { - target: "build", - projects: "dependencies", - }, - ], - ...(this.nxConfig?.targetDependencies || {}), + targetDefaults: { + build: { + dependsOn: ["^build"], + }, + ...this.nxConfig?.targetDefaults, }, affected: { defaultBase: this.nxConfig?.affectedBranch || "mainline", @@ -764,6 +759,8 @@ export class NxMonorepoProject extends TypeScriptProject { subProjectPackages.push(subNodeProject.package); // @ts-ignore - `installDependencies` is private subNodeProject.package.installDependencies = () => {}; + // @ts-ignore - `resolveDepsAndWritePackageJson` is private + subNodeProject.package.resolveDepsAndWritePackageJson = () => {}; } }); @@ -776,8 +773,13 @@ export class NxMonorepoProject extends TypeScriptProject { // @ts-ignore - `file` is private subProjectPackages.find((pkg) => (pkg.file as JsonFile).changed === true) ) { - // @ts-ignore - `installDependencies` is private - this.package.installDependencies(); + try { + // @ts-ignore - `installDependencies` is private + this.package.installDependencies(); + } finally { + // @ts-ignore - `resolveDepsAndWritePackageJson` is private + this.package.resolveDepsAndWritePackageJson(); + } } } @@ -865,12 +867,9 @@ export class NxMonorepoProject extends TypeScriptProject { ); // Update the nx.json to ensure that install-py follows dependency order - this.nxJson.addOverride("targetDependencies.install", [ - { - target: "install", - projects: "dependencies", - }, - ]); + this.nxJson.addOverride("targetDefaults.install", { + dependsOn: ["^install"], + }); } } } diff --git a/packages/nx-monorepo/src/plugin/nx-monorepo-plugin.js b/packages/nx-monorepo/src/plugin/nx-monorepo-plugin.js deleted file mode 100644 index 0f03f424f..000000000 --- a/packages/nx-monorepo/src/plugin/nx-monorepo-plugin.js +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: Apache-2.0 - -const fs = require("fs"); -const path = require("path"); -const { ProjectGraphBuilder } = require("@nrwl/devkit"); - -exports.processProjectGraph = (graph) => { - const builder = new ProjectGraphBuilder(graph); - - const nx = JSON.parse( - fs - .readFileSync(path.resolve(findRoot(__dirname), "nx.json")) - .toString("utf-8") - ); - const implicitDependencies = - nx.implicitDependencies; - - Object.entries(implicitDependencies).forEach(([dependant, dependees]) => { - dependees.forEach((dependee) => - builder.addImplicitDependency(dependant, dependee) - ); - }); - - return builder.getUpdatedProjectGraph(); -}; - -const findRoot = (dir) => { - if (path.dirname(dir) === dir) { - return process.cwd(); - } else if (fs.existsSync(path.join(dir, "nx.json"))) { - return dir; - } else { - return findRoot(path.dirname(dir)); - } -}; diff --git a/packages/nx-monorepo/test/__snapshots__/nx-monorepo.test.ts.snap b/packages/nx-monorepo/test/__snapshots__/nx-monorepo.test.ts.snap index 90446e5c9..130e768fb 100644 --- a/packages/nx-monorepo/test/__snapshots__/nx-monorepo.test.ts.snap +++ b/packages/nx-monorepo/test/__snapshots__/nx-monorepo.test.ts.snap @@ -248,14 +248,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -303,6 +295,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -329,6 +322,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -580,19 +578,19 @@ target "exec": "pnpm update npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "pnpm i --no-frozen-lockfile", @@ -881,20 +879,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -905,7 +902,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -917,8 +914,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -929,7 +924,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -943,6 +938,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "AdditionalWorkspacePackages", + "peerDependencies": Object { + "nx": "^16", + }, "pnpm": Object { "overrides": Object { "@types/babel__traverse": "7.18.2", @@ -2218,14 +2216,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -2273,6 +2263,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -2299,6 +2290,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -2549,19 +2545,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -2850,20 +2846,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -2874,7 +2869,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -2886,8 +2881,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -2898,7 +2891,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -2912,6 +2905,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "AdditionalWorkspacePackages", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -4172,14 +4168,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -4227,6 +4215,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -4253,6 +4242,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -4503,19 +4497,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install", @@ -4804,20 +4798,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -4828,7 +4821,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -4840,8 +4833,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -4852,7 +4843,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -4866,6 +4857,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "AdditionalWorkspacePackages", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -6125,14 +6119,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -6180,6 +6166,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -6206,6 +6193,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -6456,19 +6448,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -6757,20 +6749,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -6781,7 +6772,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -6793,8 +6784,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -6805,7 +6794,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -6819,6 +6808,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "SynthOrder", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -7986,14 +7978,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -8041,6 +8025,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -8067,6 +8052,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -8325,19 +8315,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -8626,26 +8616,24 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], - "install": Array [ - Object { - "projects": "dependencies", - "target": "install", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, + "install": Object { + "dependsOn": Array [ + "^install", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -8656,7 +8644,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -8668,8 +8656,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -8680,7 +8666,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -8694,6 +8680,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "SynthOrder", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -9743,14 +9732,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -9798,6 +9779,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -9824,6 +9806,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -10074,19 +10061,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -10375,20 +10362,19 @@ target "affected": Object { "defaultBase": "main", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -10399,7 +10385,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -10411,8 +10397,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -10423,7 +10407,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -10437,6 +10421,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "AffectedBranch", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -10785,14 +10772,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -10840,6 +10819,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -10866,6 +10846,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -11124,19 +11109,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -11425,26 +11410,24 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], - "install": Array [ - Object { - "projects": "dependencies", - "target": "install", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, + "install": Object { + "dependsOn": Array [ + "^install", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -11455,7 +11438,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -11467,8 +11450,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -11479,7 +11460,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -11493,6 +11474,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "Composite", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -13965,14 +13949,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -14020,6 +13996,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -14046,6 +14023,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -14296,19 +14278,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -14597,20 +14579,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -14621,7 +14602,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -14633,8 +14614,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -14645,7 +14624,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -14659,6 +14638,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "Defaults", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -15009,14 +14991,6 @@ pattern1.txt ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -15064,6 +15038,7 @@ pattern1.txt Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -15090,6 +15065,11 @@ pattern1.txt "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -15340,19 +15320,19 @@ pattern1.txt "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -15641,20 +15621,19 @@ pattern1.txt "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -15665,7 +15644,7 @@ pattern1.txt ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -15677,8 +15656,6 @@ pattern1.txt "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -15689,7 +15666,7 @@ pattern1.txt "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -15703,6 +15680,9 @@ pattern1.txt "license": "Apache-2.0", "main": "lib/index.js", "name": "IgnorePatterns", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -16057,14 +16037,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -16112,6 +16084,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -16138,6 +16111,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -16389,19 +16367,19 @@ target "exec": "pnpm update npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "pnpm i --no-frozen-lockfile", @@ -16690,20 +16668,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -16714,7 +16691,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -16726,8 +16703,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -16738,7 +16713,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -16752,6 +16727,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "PNPM", + "peerDependencies": Object { + "nx": "^16", + }, "pnpm": Object { "overrides": Object { "@types/babel__traverse": "7.18.2", @@ -18020,14 +17998,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -18075,6 +18045,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -18101,6 +18072,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -18351,19 +18327,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -18652,32 +18628,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], - "eslint": Array [ - Object { - "projects": "self", - "target": "eslint", - }, - ], - "test": Array [ - Object { - "projects": "dependencies", - "target": "test", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -18688,7 +18651,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -18700,8 +18663,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -18712,7 +18673,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -18726,6 +18687,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "TargetDependencies", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", @@ -19074,14 +19038,6 @@ target ".projen/deps.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Array [ - Object { - "name": "@nrwl/cli", - "type": "build", - }, - Object { - "name": "@nrwl/workspace", - "type": "build", - }, Object { "name": "@types/node", "type": "build", @@ -19129,6 +19085,7 @@ target Object { "name": "nx", "type": "build", + "version": "16.0.0", }, Object { "name": "prettier", @@ -19155,6 +19112,11 @@ target "type": "override", "version": "7.18.2", }, + Object { + "name": "nx", + "type": "peer", + "version": "^16", + }, Object { "name": "aws-cdk-lib", "type": "runtime", @@ -19405,19 +19367,19 @@ target "exec": "yarn upgrade npm-check-updates", }, Object { - "exec": "npm-check-updates --dep dev --upgrade --target=minor", + "exec": "npm-check-updates --dep dev --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep optional --upgrade --target=minor", + "exec": "npm-check-updates --dep optional --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep peer --upgrade --target=minor", + "exec": "npm-check-updates --dep peer --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep prod --upgrade --target=minor", + "exec": "npm-check-updates --dep prod --upgrade --target=minor --reject='nx'", }, Object { - "exec": "npm-check-updates --dep bundle --upgrade --target=minor", + "exec": "npm-check-updates --dep bundle --upgrade --target=minor --reject='nx'", }, Object { "exec": "yarn install --check-files", @@ -19706,20 +19668,19 @@ target "affected": Object { "defaultBase": "mainline", }, - "extends": "@nrwl/workspace/presets/npm.json", + "extends": "nx/presets/npm.json", "namedInputs": Object { "default": Array [ "{projectRoot}/**/*", ], }, "npmScope": "monorepo", - "targetDependencies": Object { - "build": Array [ - Object { - "projects": "dependencies", - "target": "build", - }, - ], + "targetDefaults": Object { + "build": Object { + "dependsOn": Array [ + "^build", + ], + }, }, "tasksRunnerOptions": Object { "default": Object { @@ -19730,7 +19691,7 @@ target ], "useDaemonProcess": false, }, - "runner": "@nrwl/workspace/tasks-runners/default", + "runner": "nx/tasks-runners/default", }, }, }, @@ -19742,8 +19703,6 @@ target "constructs": "*", }, "devDependencies": Object { - "@nrwl/cli": "*", - "@nrwl/workspace": "*", "@types/node": "^16", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", @@ -19754,7 +19713,7 @@ target "eslint-plugin-import": "*", "eslint-plugin-prettier": "*", "npm-check-updates": "*", - "nx": "*", + "nx": "16.0.0", "prettier": "*", "projen": "*", "syncpack": "*", @@ -19768,6 +19727,9 @@ target "license": "Apache-2.0", "main": "lib/index.js", "name": "WorkspacePackageOrder", + "peerDependencies": Object { + "nx": "^16", + }, "private": true, "resolutions": Object { "@types/babel__traverse": "7.18.2", diff --git a/packages/open-api-gateway/package.json b/packages/open-api-gateway/package.json index f7180422f..544e6a99d 100644 --- a/packages/open-api-gateway/package.json +++ b/packages/open-api-gateway/package.json @@ -60,7 +60,7 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, @@ -68,7 +68,7 @@ "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@aws-prototyping-sdk/pdk-nag": "^0.x", diff --git a/packages/pipeline/.gitignore b/packages/pipeline/.gitignore index 37e2c1d7a..4863d8182 100644 --- a/packages/pipeline/.gitignore +++ b/packages/pipeline/.gitignore @@ -48,3 +48,4 @@ tsconfig.json /dist/changelog.md /dist/version.txt /docs/api +samples diff --git a/packages/pipeline/.npmignore b/packages/pipeline/.npmignore index 540a6713f..6370ea9c8 100644 --- a/packages/pipeline/.npmignore +++ b/packages/pipeline/.npmignore @@ -21,3 +21,4 @@ tsconfig.tsbuildinfo /dist/changelog.md /dist/version.txt !LICENSE_THIRD_PARTY +!samples diff --git a/packages/pipeline/.projen/tasks.json b/packages/pipeline/.projen/tasks.json index c30c09a8d..a29c5c7e9 100644 --- a/packages/pipeline/.projen/tasks.json +++ b/packages/pipeline/.projen/tasks.json @@ -189,7 +189,12 @@ }, "pre-compile": { "name": "pre-compile", - "description": "Prepare the project for compilation" + "description": "Prepare the project for compilation", + "steps": [ + { + "exec": "rm -rf samples && rsync -a ../../samples . --include=\"*/\" --include=\"pipeline/typescript/src/**\" --include=\"pipeline/typescript/test/**\" --include=\"pipeline/python/infra/*.py\" --include=\"pipeline/python/tests/*.py\" --include=\"pipeline/java/src/**\" --exclude=\"*\" --prune-empty-dirs" + } + ] }, "release:mainline": { "name": "release:mainline", diff --git a/packages/pipeline/package.json b/packages/pipeline/package.json index 40b88bd45..e045cfed5 100644 --- a/packages/pipeline/package.json +++ b/packages/pipeline/package.json @@ -56,7 +56,7 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, @@ -64,7 +64,7 @@ "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@aws-prototyping-sdk/pdk-nag": "^0.x" diff --git a/packages/pipeline/samples/python/requirements.txt b/packages/pipeline/samples/python/requirements.txt deleted file mode 100644 index eae306c17..000000000 --- a/packages/pipeline/samples/python/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". -../../../aws-prototyping-sdk/dist/python/aws_prototyping_sdk-0.0.0-py3-none-any.whl -aws-cdk-lib -constructs -pyhumps diff --git a/packages/pipeline/samples/typescript/.npmrc b/packages/pipeline/samples/typescript/.npmrc deleted file mode 100644 index 6976a1f36..000000000 --- a/packages/pipeline/samples/typescript/.npmrc +++ /dev/null @@ -1,3 +0,0 @@ -# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". - -resolution-mode=highest diff --git a/packages/pipeline/samples/typescript/LICENSE b/packages/pipeline/samples/typescript/LICENSE deleted file mode 100644 index d64569567..000000000 --- a/packages/pipeline/samples/typescript/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/pipeline/src/pdk-pipeline-java-project.ts b/packages/pipeline/src/pdk-pipeline-java-project.ts index f6a391724..182d84ab2 100644 --- a/packages/pipeline/src/pdk-pipeline-java-project.ts +++ b/packages/pipeline/src/pdk-pipeline-java-project.ts @@ -26,7 +26,8 @@ export class PDKPipelineJavaProject extends AwsCdkJavaApp { : 'software.aws.Pipeline -Dexec.classpathScope="test"', }); - this.addDependency("software.aws.awsprototypingsdk/aws-prototyping-sdk@^0"); + this.addDependency("software.aws.awsprototypingsdk/pipeline@^0"); + this.addDependency("software.aws.awsprototypingsdk/pdk-nag@^0"); this.addDependency("io.github.cdklabs/cdknag@^2"); this.testTask.exec("mvn test"); @@ -46,6 +47,7 @@ export class PDKPipelineJavaProject extends AwsCdkJavaApp { __dirname, "..", "samples", + "pipeline", "java", "src", "main", @@ -63,6 +65,7 @@ export class PDKPipelineJavaProject extends AwsCdkJavaApp { __dirname, "..", "samples", + "pipeline", "java", "src", "test", diff --git a/packages/pipeline/src/pdk-pipeline-py-project.ts b/packages/pipeline/src/pdk-pipeline-py-project.ts index e27a0c7f9..881b76dc2 100644 --- a/packages/pipeline/src/pdk-pipeline-py-project.ts +++ b/packages/pipeline/src/pdk-pipeline-py-project.ts @@ -27,14 +27,24 @@ export class PDKPipelinePyProject extends AwsCdkPythonApp { options.appEntrypoint || `${options.moduleName}/pipeline.py`, }); - ["aws_prototyping_sdk", "cdk-nag", "pyhumps"].forEach((dep) => - this.addDependency(dep) - ); + [ + "aws-prototyping-sdk.pipeline", + "aws-prototyping-sdk.pdk-nag", + "cdk-nag", + "pyhumps", + ].forEach((dep) => this.addDependency(dep)); this.addDevDependency("pytest"); new SampleDir(this, this.moduleName, { - sourceDir: path.join(__dirname, "..", "samples", "python", "infra"), + sourceDir: path.join( + __dirname, + "..", + "samples", + "pipeline", + "python", + "infra" + ), }); this.pytest = new Pytest(this, options.pytestOptions); @@ -48,6 +58,7 @@ export class PDKPipelinePyProject extends AwsCdkPythonApp { __dirname, "..", "samples", + "pipeline", "python", "tests", "test_pipeline.py" diff --git a/packages/pipeline/src/pdk-pipeline-ts-project.ts b/packages/pipeline/src/pdk-pipeline-ts-project.ts index 8c254cb3a..ac1c598c0 100644 --- a/packages/pipeline/src/pdk-pipeline-ts-project.ts +++ b/packages/pipeline/src/pdk-pipeline-ts-project.ts @@ -31,18 +31,36 @@ export class PDKPipelineTsProject extends AwsCdkTypeScriptApp { appEntrypoint: options.appEntrypoint || "pipeline.ts", }); - this.addDeps("aws-prototyping-sdk", "cdk-nag"); + this.addDeps( + "@aws-prototyping-sdk/pipeline", + "@aws-prototyping-sdk/pdk-nag", + "cdk-nag" + ); // AwsCdkTypeScriptApp removes ts compilation - add back to err on the side of caution should infrastructure // include NodejsFunctions that won't be type-checked during CDK synthesis this.compileTask.reset("tsc --build"); new SampleDir(this, this.srcdir, { - sourceDir: path.join(__dirname, "..", "samples", "typescript", "src"), + sourceDir: path.join( + __dirname, + "..", + "samples", + "pipeline", + "typescript", + "src" + ), }); new SampleDir(this, this.testdir, { - sourceDir: path.join(__dirname, "..", "samples", "typescript", "test"), + sourceDir: path.join( + __dirname, + "..", + "samples", + "pipeline", + "typescript", + "test" + ), }); } } diff --git a/packages/pipeline/test/__snapshots__/pdk-pipeline-java-project.test.ts.snap b/packages/pipeline/test/__snapshots__/pdk-pipeline-java-project.test.ts.snap index b8c88f193..a67b69cba 100644 --- a/packages/pipeline/test/__snapshots__/pdk-pipeline-java-project.test.ts.snap +++ b/packages/pipeline/test/__snapshots__/pdk-pipeline-java-project.test.ts.snap @@ -172,7 +172,12 @@ dist/java "version": "^2.0.0", }, Object { - "name": "software.aws.awsprototypingsdk/aws-prototyping-sdk", + "name": "software.aws.awsprototypingsdk/pdk-nag", + "type": "runtime", + "version": "^0", + }, + Object { + "name": "software.aws.awsprototypingsdk/pipeline", "type": "runtime", "version": "^0", }, @@ -518,7 +523,12 @@ dist/java software.aws.awsprototypingsdk - aws-prototyping-sdk + pdk-nag + (,1.0.0) + + + software.aws.awsprototypingsdk + pipeline (,1.0.0) @@ -861,7 +871,12 @@ dist/java "version": "^2.0.0", }, Object { - "name": "software.aws.awsprototypingsdk/aws-prototyping-sdk", + "name": "software.aws.awsprototypingsdk/pdk-nag", + "type": "runtime", + "version": "^0", + }, + Object { + "name": "software.aws.awsprototypingsdk/pipeline", "type": "runtime", "version": "^0", }, @@ -1222,7 +1237,12 @@ dist/java software.aws.awsprototypingsdk - aws-prototyping-sdk + pdk-nag + (,1.0.0) + + + software.aws.awsprototypingsdk + pipeline (,1.0.0) diff --git a/packages/pipeline/test/__snapshots__/pdk-pipeline-py-project.test.ts.snap b/packages/pipeline/test/__snapshots__/pdk-pipeline-py-project.test.ts.snap index 459e9a9c9..2af569f59 100644 --- a/packages/pipeline/test/__snapshots__/pdk-pipeline-py-project.test.ts.snap +++ b/packages/pipeline/test/__snapshots__/pdk-pipeline-py-project.test.ts.snap @@ -114,13 +114,17 @@ cython_debug/ "type": "devenv", }, Object { - "name": "aws_prototyping_sdk", + "name": "aws-cdk-lib", "type": "runtime", + "version": "^2.0.0", }, Object { - "name": "aws-cdk-lib", + "name": "aws-prototyping-sdk.pdk-nag", + "type": "runtime", + }, + Object { + "name": "aws-prototyping-sdk.pipeline", "type": "runtime", - "version": "^2.0.0", }, Object { "name": "cdk-nag", @@ -440,8 +444,9 @@ projen==99.99.99 pytest ", "requirements.txt": "# ~~ Generated by projen. To modify, edit .projenrc.py and run \\"npx projen\\". -aws_prototyping_sdk aws-cdk-lib>=2.0.0, <3.0.0 +aws-prototyping-sdk.pdk-nag +aws-prototyping-sdk.pipeline cdk-nag constructs>=10.0.5, <11.0.0 pyhumps @@ -580,13 +585,17 @@ cython_debug/ "type": "devenv", }, Object { - "name": "aws_prototyping_sdk", + "name": "aws-cdk-lib", "type": "runtime", + "version": "^2.0.0", }, Object { - "name": "aws-cdk-lib", + "name": "aws-prototyping-sdk.pdk-nag", + "type": "runtime", + }, + Object { + "name": "aws-prototyping-sdk.pipeline", "type": "runtime", - "version": "^2.0.0", }, Object { "name": "cdk-nag", @@ -906,8 +915,9 @@ projen==99.99.99 pytest ", "requirements.txt": "# ~~ Generated by projen. To modify, edit .projenrc.py and run \\"npx projen\\". -aws_prototyping_sdk aws-cdk-lib>=2.0.0, <3.0.0 +aws-prototyping-sdk.pdk-nag +aws-prototyping-sdk.pipeline cdk-nag constructs>=10.0.5, <11.0.0 pyhumps @@ -1046,13 +1056,17 @@ cython_debug/ "type": "devenv", }, Object { - "name": "aws_prototyping_sdk", + "name": "aws-cdk-lib", + "type": "runtime", + "version": "^2.0.0", + }, + Object { + "name": "aws-prototyping-sdk.pdk-nag", "type": "runtime", }, Object { - "name": "aws-cdk-lib", + "name": "aws-prototyping-sdk.pipeline", "type": "runtime", - "version": "^2.0.0", }, Object { "name": "cdk-nag", @@ -1317,8 +1331,9 @@ projen==99.99.99 pytest ", "requirements.txt": "# ~~ Generated by projen. To modify, edit .projenrc.py and run \\"npx projen\\". -aws_prototyping_sdk aws-cdk-lib>=2.0.0, <3.0.0 +aws-prototyping-sdk.pdk-nag +aws-prototyping-sdk.pipeline cdk-nag constructs>=10.0.5, <11.0.0 pyhumps diff --git a/packages/pipeline/test/__snapshots__/pdk-pipeline-ts-project.test.ts.snap b/packages/pipeline/test/__snapshots__/pdk-pipeline-ts-project.test.ts.snap index d8b2f9d33..30345041f 100644 --- a/packages/pipeline/test/__snapshots__/pdk-pipeline-ts-project.test.ts.snap +++ b/packages/pipeline/test/__snapshots__/pdk-pipeline-ts-project.test.ts.snap @@ -336,14 +336,18 @@ cdk.out/ "type": "build", }, Object { - "name": "aws-cdk-lib", + "name": "@aws-prototyping-sdk/pdk-nag", "type": "runtime", - "version": "^2.0.0", }, Object { - "name": "aws-prototyping-sdk", + "name": "@aws-prototyping-sdk/pipeline", "type": "runtime", }, + Object { + "name": "aws-cdk-lib", + "type": "runtime", + "version": "^2.0.0", + }, Object { "name": "cdk-nag", "type": "runtime", @@ -869,8 +873,9 @@ cdk.out/ "package.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Object { + "@aws-prototyping-sdk/pdk-nag": "*", + "@aws-prototyping-sdk/pipeline": "*", "aws-cdk-lib": "^2.0.0", - "aws-prototyping-sdk": "*", "cdk-nag": "*", "constructs": "^10.0.5", }, @@ -990,8 +995,8 @@ export class ApplicationStage extends Stage { }", "src/pipeline-stack.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ +import { PDKPipeline } from '@aws-prototyping-sdk/pipeline'; import { Stack, StackProps } from 'aws-cdk-lib'; -import { PDKPipeline } from 'aws-prototyping-sdk/pipeline'; import { Construct } from 'constructs'; export class PipelineStack extends Stack { @@ -1012,7 +1017,7 @@ export class PipelineStack extends Stack { }", "src/pipeline.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -import { PDKNag } from 'aws-prototyping-sdk/pdk-nag'; +import { PDKNag } from '@aws-prototyping-sdk/pdk-nag'; import { ApplicationStage } from './application-stage'; import { PipelineStack } from './pipeline-stack'; @@ -3056,14 +3061,18 @@ cdk.out/ "type": "build", }, Object { - "name": "aws-cdk-lib", + "name": "@aws-prototyping-sdk/pdk-nag", "type": "runtime", - "version": "^2.0.0", }, Object { - "name": "aws-prototyping-sdk", + "name": "@aws-prototyping-sdk/pipeline", "type": "runtime", }, + Object { + "name": "aws-cdk-lib", + "type": "runtime", + "version": "^2.0.0", + }, Object { "name": "cdk-nag", "type": "runtime", @@ -3589,8 +3598,9 @@ cdk.out/ "package.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Object { + "@aws-prototyping-sdk/pdk-nag": "*", + "@aws-prototyping-sdk/pipeline": "*", "aws-cdk-lib": "^2.0.0", - "aws-prototyping-sdk": "*", "cdk-nag": "*", "constructs": "^10.0.5", }, @@ -3710,8 +3720,8 @@ export class ApplicationStage extends Stage { }", "src/pipeline-stack.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ +import { PDKPipeline } from '@aws-prototyping-sdk/pipeline'; import { Stack, StackProps } from 'aws-cdk-lib'; -import { PDKPipeline } from 'aws-prototyping-sdk/pipeline'; import { Construct } from 'constructs'; export class PipelineStack extends Stack { @@ -3732,7 +3742,7 @@ export class PipelineStack extends Stack { }", "src/pipeline.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -import { PDKNag } from 'aws-prototyping-sdk/pdk-nag'; +import { PDKNag } from '@aws-prototyping-sdk/pdk-nag'; import { ApplicationStage } from './application-stage'; import { PipelineStack } from './pipeline-stack'; @@ -5776,14 +5786,18 @@ cdk.out/ "type": "build", }, Object { - "name": "aws-cdk-lib", + "name": "@aws-prototyping-sdk/pdk-nag", "type": "runtime", - "version": "^2.0.0", }, Object { - "name": "aws-prototyping-sdk", + "name": "@aws-prototyping-sdk/pipeline", "type": "runtime", }, + Object { + "name": "aws-cdk-lib", + "type": "runtime", + "version": "^2.0.0", + }, Object { "name": "cdk-nag", "type": "runtime", @@ -6324,8 +6338,9 @@ cdk.out/ "package.json": Object { "//": "~~ Generated by projen. To modify, edit .projenrc.ts and run \\"npx projen\\".", "dependencies": Object { + "@aws-prototyping-sdk/pdk-nag": "*", + "@aws-prototyping-sdk/pipeline": "*", "aws-cdk-lib": "^2.0.0", - "aws-prototyping-sdk": "*", "cdk-nag": "*", "constructs": "^10.0.5", }, @@ -6445,8 +6460,8 @@ export class ApplicationStage extends Stage { }", "src/pipeline-stack.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ +import { PDKPipeline } from '@aws-prototyping-sdk/pipeline'; import { Stack, StackProps } from 'aws-cdk-lib'; -import { PDKPipeline } from 'aws-prototyping-sdk/pipeline'; import { Construct } from 'constructs'; export class PipelineStack extends Stack { @@ -6467,7 +6482,7 @@ export class PipelineStack extends Stack { }", "src/pipeline.ts": "/*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -import { PDKNag } from 'aws-prototyping-sdk/pdk-nag'; +import { PDKNag } from '@aws-prototyping-sdk/pdk-nag'; import { ApplicationStage } from './application-stage'; import { PipelineStack } from './pipeline-stack'; diff --git a/packages/static-website/package.json b/packages/static-website/package.json index 67c8f6373..816c8b314 100644 --- a/packages/static-website/package.json +++ b/packages/static-website/package.json @@ -57,7 +57,7 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, @@ -65,7 +65,7 @@ "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@aws-prototyping-sdk/pdk-nag": "^0.x" diff --git a/packages/type-safe-api/package.json b/packages/type-safe-api/package.json index 98cc96217..e8ac07fba 100644 --- a/packages/type-safe-api/package.json +++ b/packages/type-safe-api/package.json @@ -60,7 +60,7 @@ "jsii-pacmak": "^1.80.0", "license-checker": "^25.0.1", "prettier": "^2.8.3", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, @@ -68,7 +68,7 @@ "aws-cdk-lib": "^2.60.0", "cdk-nag": "^2.21.65", "constructs": "^10.1.222", - "projen": "^0.71.27" + "projen": "^0.71.35" }, "dependencies": { "@aws-prototyping-sdk/pdk-nag": "^0.x", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea32e6a54..b969e1a8f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,7 +28,7 @@ importers: .: dependencies: '@pnpm/types': - specifier: '*' + specifier: ^9.0.0 version: 9.0.0 aws-cdk-lib: specifier: ^2.60.0 @@ -43,33 +43,24 @@ importers: specifier: ^4.0.13 version: 4.1.3 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 devDependencies: '@aws-prototyping-sdk/nx-monorepo': specifier: ^0.x - version: 0.14.11(projen@0.71.27) + version: 0.14.11(projen@0.71.35) '@aws-prototyping-sdk/pipeline': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.27) + version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.35) '@commitlint/cli': specifier: ^17.4.2 version: 17.4.4 '@commitlint/config-conventional': specifier: ^17.4.2 version: 17.4.4 - '@nrwl/cli': - specifier: ^15.9.1 - version: 15.9.1 '@nrwl/devkit': specifier: ^15.9.1 - version: 15.9.1(nx@15.9.1) - '@nrwl/nx-cloud': - specifier: ^15.3.5 - version: 15.3.5 - '@nrwl/workspace': - specifier: ^15.9.1 - version: 15.9.1 + version: 15.9.1(nx@16.0.0) '@types/node': specifier: ^16 version: 16.0.0 @@ -122,8 +113,11 @@ importers: specifier: ^16.6.2 version: 16.7.13 nx: - specifier: ^15.9.1 - version: 15.9.1 + specifier: 16.0.0 + version: 16.0.0 + nx-cloud: + specifier: ^16.0.5 + version: 16.0.5 oss-attribution-generator: specifier: ^1.7.1 version: 1.7.1 @@ -233,8 +227,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 sharp: specifier: ^0.31.3 version: 0.31.3 @@ -254,103 +248,6 @@ importers: specifier: ^1.0.4 version: 1.0.4 - packages/aws-prototyping-sdk: - dependencies: - '@nrwl/devkit': - specifier: ^15.9.1 - version: 15.9.1(nx@15.9.1) - '@pnpm/reviewing.dependencies-hierarchy': - specifier: ^2.0.2 - version: 2.0.2(@pnpm/logger@5.0.0) - fs-extra: - specifier: ^10.1.0 - version: 10.1.0 - semver: - specifier: ^4.3.6 - version: 4.3.6 - devDependencies: - '@types/fs-extra': - specifier: 9.0.13 - version: 9.0.13 - '@types/jest': - specifier: ^27 - version: 27.5.2 - '@types/node': - specifier: ^16 - version: 16.0.0 - '@typescript-eslint/eslint-plugin': - specifier: ^5 - version: 5.55.0(@typescript-eslint/parser@5.55.0)(eslint@8.36.0)(typescript@4.9.5) - '@typescript-eslint/parser': - specifier: ^5 - version: 5.55.0(eslint@8.36.0)(typescript@4.9.5) - aws-cdk-lib: - specifier: ^2.60.0 - version: 2.69.0(constructs@10.1.283) - cdk-nag: - specifier: ^2.21.65 - version: 2.23.4(aws-cdk-lib@2.69.0)(constructs@10.1.283) - constructs: - specifier: ^10.1.222 - version: 10.1.283 - eslint: - specifier: ^8 - version: 8.36.0 - eslint-config-prettier: - specifier: ^8.6.0 - version: 8.7.0(eslint@8.36.0) - eslint-import-resolver-node: - specifier: ^0.3.7 - version: 0.3.7 - eslint-import-resolver-typescript: - specifier: ^3.5.3 - version: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.36.0) - eslint-plugin-header: - specifier: ^3.1.1 - version: 3.1.1(eslint@8.36.0) - eslint-plugin-import: - specifier: ^2.27.5 - version: 2.27.5(@typescript-eslint/parser@5.55.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.36.0) - eslint-plugin-prettier: - specifier: ^4.2.1 - version: 4.2.1(eslint-config-prettier@8.7.0)(eslint@8.36.0)(prettier@2.8.4) - jest: - specifier: ^27 - version: 27.5.1(ts-node@10.9.1) - jest-junit: - specifier: ^15 - version: 15.0.0 - jsii: - specifier: 1.x - version: 1.78.1 - jsii-diff: - specifier: ^1.80.0 - version: 1.80.0 - jsii-docgen: - specifier: ^7.2.1 - version: 7.2.1 - jsii-pacmak: - specifier: ^1.80.0 - version: 1.80.0 - license-checker: - specifier: ^25.0.1 - version: 25.0.1 - prettier: - specifier: ^2.8.3 - version: 2.8.4 - projen: - specifier: ^0.71.27 - version: 0.71.27 - ts-jest: - specifier: ^27 - version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) - ts-node: - specifier: ^10.9.1 - version: 10.9.1(@types/node@16.0.0)(typescript@4.9.5) - typescript: - specifier: ^4.9.4 - version: 4.9.5 - packages/cdk-graph: dependencies: chalk: @@ -395,10 +292,10 @@ importers: version: 2.69.0 '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag '@aws-prototyping-sdk/pipeline': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.27) + version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.35) '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 @@ -493,8 +390,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -665,8 +562,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -734,8 +631,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -831,8 +728,8 @@ importers: specifier: ^2.27.5 version: 2.27.5(@typescript-eslint/parser@5.55.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.36.0) projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 typescript: specifier: ^4.0.3 version: 4.9.5 @@ -841,7 +738,7 @@ importers: dependencies: '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag devDependencies: '@aws-cdk/aws-cognito-identitypool-alpha': specifier: 2.60.0-alpha.0 @@ -913,8 +810,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -924,9 +821,6 @@ importers: packages/nx-monorepo: dependencies: - '@nrwl/devkit': - specifier: ^15.9.1 - version: 15.9.1(nx@15.9.1) '@pnpm/reviewing.dependencies-hierarchy': specifier: ^2.0.2 version: 2.0.2(@pnpm/logger@5.0.0) @@ -1004,8 +898,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -1017,7 +911,7 @@ importers: dependencies: '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag fs-extra: specifier: ^11.1.0 version: 11.1.0 @@ -1033,7 +927,7 @@ importers: devDependencies: '@aws-prototyping-sdk/nx-monorepo': specifier: ^0.x - version: 0.14.11(projen@0.71.27) + version: 0.14.11(projen@0.71.35) '@aws-sdk/client-s3': specifier: ^3.252.0 version: 3.294.0 @@ -1110,8 +1004,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -1216,7 +1110,7 @@ importers: dependencies: '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag devDependencies: '@types/jest': specifier: ^27 @@ -1285,63 +1179,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 - ts-jest: - specifier: ^27 - version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) - typescript: - specifier: ^4.9.4 - version: 4.9.5 - - packages/pipeline/samples/typescript: - dependencies: - aws-cdk-lib: - specifier: ^2.60.0 - version: 2.69.0(constructs@10.1.283) - aws-prototyping-sdk: - specifier: 0.0.0 - version: link:../../../aws-prototyping-sdk - constructs: - specifier: ^10.1.222 - version: 10.1.283 - devDependencies: - '@types/jest': - specifier: ^27 - version: 27.5.2 - '@types/node': - specifier: ^16 - version: 16.0.0 - '@typescript-eslint/eslint-plugin': - specifier: ^5 - version: 5.55.0(@typescript-eslint/parser@5.55.0)(eslint@8.36.0)(typescript@4.9.5) - '@typescript-eslint/parser': - specifier: ^5 - version: 5.55.0(eslint@8.36.0)(typescript@4.9.5) - eslint: - specifier: ^8 - version: 8.36.0 - eslint-import-resolver-node: - specifier: ^0.3.7 - version: 0.3.7 - eslint-import-resolver-typescript: - specifier: ^3.5.3 - version: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.36.0) - eslint-plugin-header: - specifier: ^3.1.1 - version: 3.1.1(eslint@8.36.0) - eslint-plugin-import: - specifier: ^2.27.5 - version: 2.27.5(@typescript-eslint/parser@5.55.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.36.0) - jest: - specifier: ^27 - version: 27.5.1(ts-node@10.9.1) - jest-junit: - specifier: ^15 - version: 15.0.0 - projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -1353,7 +1192,7 @@ importers: dependencies: '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag devDependencies: '@types/jest': specifier: ^27 @@ -1425,8 +1264,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -1438,7 +1277,7 @@ importers: dependencies: '@aws-prototyping-sdk/pdk-nag': specifier: ^0.x - version: 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + version: link:../pdk-nag fs-extra: specifier: ^11.1.0 version: 11.1.0 @@ -1454,7 +1293,7 @@ importers: devDependencies: '@aws-prototyping-sdk/nx-monorepo': specifier: ^0.x - version: 0.14.11(projen@0.71.27) + version: 0.14.11(projen@0.71.35) '@aws-sdk/client-s3': specifier: ^3.252.0 version: 3.294.0 @@ -1531,8 +1370,8 @@ importers: specifier: ^2.8.3 version: 2.8.4 projen: - specifier: ^0.71.27 - version: 0.71.27 + specifier: ^0.71.35 + version: 0.71.35 ts-jest: specifier: ^27 version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) @@ -1577,6 +1416,64 @@ importers: specifier: ^4.9.5 version: 4.9.5 + samples/pipeline/typescript: + dependencies: + '@aws-prototyping-sdk/pdk-nag': + specifier: 0.0.0 + version: link:../../../packages/pdk-nag + '@aws-prototyping-sdk/pipeline': + specifier: 0.0.0 + version: link:../../../packages/pipeline + aws-cdk-lib: + specifier: ^2.60.0 + version: 2.69.0(constructs@10.1.283) + constructs: + specifier: ^10.1.222 + version: 10.1.283 + devDependencies: + '@types/jest': + specifier: ^27 + version: 27.5.2 + '@types/node': + specifier: ^16 + version: 16.0.0 + '@typescript-eslint/eslint-plugin': + specifier: ^5 + version: 5.55.0(@typescript-eslint/parser@5.55.0)(eslint@8.36.0)(typescript@4.9.5) + '@typescript-eslint/parser': + specifier: ^5 + version: 5.55.0(eslint@8.36.0)(typescript@4.9.5) + eslint: + specifier: ^8 + version: 8.36.0 + eslint-import-resolver-node: + specifier: ^0.3.7 + version: 0.3.7 + eslint-import-resolver-typescript: + specifier: ^3.5.3 + version: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.36.0) + eslint-plugin-header: + specifier: ^3.1.1 + version: 3.1.1(eslint@8.36.0) + eslint-plugin-import: + specifier: ^2.27.5 + version: 2.27.5(@typescript-eslint/parser@5.55.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.36.0) + jest: + specifier: ^27 + version: 27.5.1(ts-node@10.9.1) + jest-junit: + specifier: ^15 + version: 15.0.0 + projen: + specifier: ^0.71.35 + version: 0.71.35 + ts-jest: + specifier: ^27 + version: 27.1.5(@babel/core@7.21.3)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5) + typescript: + specifier: ^4.9.4 + version: 4.9.5 + packages: /@adobe/css-tools@4.2.0: @@ -2105,29 +2002,30 @@ packages: tslib: 1.14.1 dev: true - /@aws-prototyping-sdk/nx-monorepo@0.14.11(projen@0.71.27): + /@aws-prototyping-sdk/nx-monorepo@0.14.11(projen@0.71.35): resolution: {integrity: sha512-T9vvZREe85dbC0gJOOk+ifeviynvCQNPwLhlFA+tlzG20WY/9/xZFIhDH/gPX5HE7Lrb6QOhMwMphN77gmm1iw==} hasBin: true peerDependencies: projen: ^0.67.3 dependencies: - projen: 0.71.27 + projen: 0.71.35 dev: true bundledDependencies: - '@nrwl/devkit' - /@aws-prototyping-sdk/pdk-nag@0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283): - resolution: {integrity: sha512-OZ5wUePKMrW1raW0ky3ZHYKasp5BFXO6HjqBeWpxexOQgig7vUONfZVTtW1VUjzV4vbH8GlO0EIfX+SEM1e0mA==} + /@aws-prototyping-sdk/pdk-nag@0.0.0(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283): + resolution: {integrity: sha512-4NMnG41mj1Y/z8K2B0rDS9zBlph4FynlytYtmijscQkCg/3rUGWLqMSTAG7JFy5HmaNh0eZwQyNstJ5FSy16NQ==} peerDependencies: - aws-cdk-lib: ^2.60.0 - cdk-nag: ^2.21.65 - constructs: ^10.1.222 + aws-cdk-lib: ^2.31.1 + cdk-nag: ^2.15.10 + constructs: ^10.1.43 dependencies: aws-cdk-lib: 2.69.0(constructs@10.1.283) cdk-nag: 2.23.4(aws-cdk-lib@2.69.0)(constructs@10.1.283) constructs: 10.1.283 + dev: true - /@aws-prototyping-sdk/pipeline@0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.27): + /@aws-prototyping-sdk/pipeline@0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283)(projen@0.71.35): resolution: {integrity: sha512-E+CcGWLj1AF1SBr3DIeZIUeAnaNfPklZoMDW0tfB52y2zVxTNurwKOE1+zT0m3u+rTgwI9WDNCX02dmLTDUC5Q==} peerDependencies: aws-cdk-lib: ^2.60.0 @@ -2135,11 +2033,11 @@ packages: constructs: ^10.1.222 projen: ^0.67.3 dependencies: - '@aws-prototyping-sdk/pdk-nag': 0.14.11(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) + '@aws-prototyping-sdk/pdk-nag': 0.0.0(aws-cdk-lib@2.69.0)(cdk-nag@2.23.4)(constructs@10.1.283) aws-cdk-lib: 2.69.0(constructs@10.1.283) cdk-nag: 2.23.4(aws-cdk-lib@2.69.0)(constructs@10.1.283) constructs: 10.1.283 - projen: 0.71.27 + projen: 0.71.35 dev: true /@aws-sdk/abort-controller@3.186.0: @@ -6834,6 +6732,9 @@ packages: engines: {node: '>=6.9.0'} dev: true + /@iarna/toml@2.2.5: + resolution: {integrity: sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==} + /@isaacs/string-locale-compare@1.1.0: resolution: {integrity: sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==} dev: true @@ -7187,7 +7088,7 @@ packages: engines: {node: '>= 14.6.0'} dependencies: chalk: 4.1.2 - semver: 7.3.8 + semver: 7.5.0 dev: true /@jsii/check-node@1.80.0: @@ -7195,7 +7096,7 @@ packages: engines: {node: '>= 14.6.0'} dependencies: chalk: 4.1.2 - semver: 7.3.8 + semver: 7.5.0 dev: true /@jsii/spec@1.80.0: @@ -7234,7 +7135,7 @@ packages: p-reduce: 2.1.0 pacote: 13.6.1 pify: 5.0.0 - semver: 7.3.8 + semver: 7.5.0 slash: 3.0.0 validate-npm-package-license: 3.0.4 validate-npm-package-name: 4.0.0 @@ -7432,7 +7333,7 @@ packages: read-package-json-fast: 2.0.3 readdir-scoped-modules: 1.1.0 rimraf: 3.0.2 - semver: 7.3.8 + semver: 7.5.0 ssri: 9.0.1 treeverse: 2.0.0 walk-up-path: 1.0.0 @@ -7446,14 +7347,14 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: '@gar/promisify': 1.1.3 - semver: 7.3.8 + semver: 7.5.0 dev: true /@npmcli/fs@3.1.0: resolution: {integrity: sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - semver: 7.3.8 + semver: 7.5.0 dev: true /@npmcli/git@3.0.2: @@ -7467,7 +7368,7 @@ packages: proc-log: 2.0.1 promise-inflight: 1.0.1 promise-retry: 2.0.1 - semver: 7.3.8 + semver: 7.5.0 which: 2.0.2 transitivePeerDependencies: - bluebird @@ -7484,7 +7385,7 @@ packages: proc-log: 3.0.0 promise-inflight: 1.0.1 promise-retry: 2.0.1 - semver: 7.3.8 + semver: 7.5.0 which: 3.0.0 transitivePeerDependencies: - bluebird @@ -7525,7 +7426,7 @@ packages: cacache: 16.1.3 json-parse-even-better-errors: 2.3.1 pacote: 13.6.1 - semver: 7.3.8 + semver: 7.5.0 transitivePeerDependencies: - bluebird - supports-color @@ -7611,6 +7512,7 @@ packages: - '@swc-node/register' - '@swc/core' - debug + dev: true /@nrwl/devkit@15.9.1(nx@15.9.1): resolution: {integrity: sha512-vEfmKoPnEbDmsvMto/ap4z2demcSJad3OyKPUBBpWJs4Hkxv/qg/XJUwoGZhKU/izVuO2FE1kMp9R5/8xV6WMQ==} @@ -7623,19 +7525,25 @@ packages: semver: 7.3.4 tmp: 0.2.1 tslib: 2.5.0 + dev: true - /@nrwl/nx-cloud@15.3.5: - resolution: {integrity: sha512-JMKLY0HhdzQ/6jEvfL/EecPPdsdBIM0SyFrWAjikSJAh5MqhpFJWnr6FfTc5P57PJZ+IUNLkJ21VMuoTrA4+4w==} - hasBin: true + /@nrwl/devkit@15.9.1(nx@16.0.0): + resolution: {integrity: sha512-vEfmKoPnEbDmsvMto/ap4z2demcSJad3OyKPUBBpWJs4Hkxv/qg/XJUwoGZhKU/izVuO2FE1kMp9R5/8xV6WMQ==} + peerDependencies: + nx: '>= 14.1 <= 16' dependencies: - axios: 0.21.4 - chalk: 4.1.0 - dotenv: 10.0.0 - fs-extra: 10.1.0 - node-machine-id: 1.1.12 - strip-json-comments: 3.1.1 - tar: 6.1.11 - yargs-parser: 21.1.1 + ejs: 3.1.9 + ignore: 5.2.4 + nx: 16.0.0 + semver: 7.3.4 + tmp: 0.2.1 + tslib: 2.5.0 + dev: true + + /@nrwl/nx-cloud@16.0.5: + resolution: {integrity: sha512-1p82ym8WE9ziejwgPslstn19iV/VkHfHfKr/5YOnfCHQS+NxUf92ogcYhHXtqWLblVZ9Zs4W4pkSXK4e04wCmQ==} + dependencies: + nx-cloud: 16.0.5 transitivePeerDependencies: - debug dev: true @@ -7646,6 +7554,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + dev: true optional: true /@nrwl/nx-darwin-x64@15.9.1: @@ -7654,6 +7563,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + dev: true optional: true /@nrwl/nx-linux-arm-gnueabihf@15.9.1: @@ -7662,6 +7572,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + dev: true optional: true /@nrwl/nx-linux-arm64-gnu@15.9.1: @@ -7670,6 +7581,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@nrwl/nx-linux-arm64-musl@15.9.1: @@ -7678,6 +7590,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + dev: true optional: true /@nrwl/nx-linux-x64-gnu@15.9.1: @@ -7686,6 +7599,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true optional: true /@nrwl/nx-linux-x64-musl@15.9.1: @@ -7694,62 +7608,129 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + dev: true + optional: true + + /@nrwl/nx-win32-arm64-msvc@15.9.1: + resolution: {integrity: sha512-ZU/QuUU1WPaIFdKqCWAm5TI+/zYAXbEyZKd/OhY67Gxaca98O4YXS6GmfF7WNHvQzsYoeuuLyRzZowSp22Rung==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@nrwl/nx-win32-x64-msvc@15.9.1: + resolution: {integrity: sha512-te43yJPni7VIIM5DpZnGuWwEjZNMERdBAhHeKWobwvSQ4ogdpmDbOhsdHqU3mFLaiKP1pzRo17R5tNJ5Gmw5tA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@nrwl/tao@15.9.1: + resolution: {integrity: sha512-gb21eJ3VrZdUpg4MQ4rmOfLy+omHiXCEvWWFGYvFSxXGVeNaLzlvQ/+OOK0B/d0KTCuXKCgvVKJ3jobd+4s02A==} + hasBin: true + dependencies: + nx: 15.9.1 + transitivePeerDependencies: + - '@swc-node/register' + - '@swc/core' + - debug + dev: true + + /@nrwl/tao@16.0.0: + resolution: {integrity: sha512-0A+e6jGmBBhpcaSlFr24uNvMRNZmlAWETj8K7gvYYjbWpVx3VP5hY+9R9vOxRwozWEHeEDFl1xue8ci0HWzORA==} + hasBin: true + dependencies: + nx: 16.0.0 + transitivePeerDependencies: + - '@swc-node/register' + - '@swc/core' + - debug + dev: true + + /@nx/nx-darwin-arm64@16.0.0: + resolution: {integrity: sha512-GtXS0NPENG+s5bsVdsaXTX1jKOw85jHSALhrXXiMXknjwnvyHUelxFDS4fHhIlcOSd56Y5sn1pdg/fi2WPoscw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-darwin-x64@16.0.0: + resolution: {integrity: sha512-iZv59vEoHekLahBrENYFtyUxuMwIQG24weluc00N2Edp7AlxVf7wRw6gd/xp3ATQbx/N92UPg6X761uBp2gm+Q==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-linux-arm-gnueabihf@16.0.0: + resolution: {integrity: sha512-o+ds8HogpkIc+Q8j5KEdiuEvGo6iHSpKSaFxKPIKHgD7xa6Kll966hKiFigeY2FDT2nGQlKZ0n1wNWQ4x2rijw==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-linux-arm64-gnu@16.0.0: + resolution: {integrity: sha512-ue2ravlNusu5xojC37JjgLaUyqm0swL5egVSHBARxOsT7piyk0ac56/j+ZrBckrjLbIplTGpwFGGS9vbKiEeoQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-linux-arm64-musl@16.0.0: + resolution: {integrity: sha512-dSqC3Tp8GfWqOH/jZBkdGtoDoi/A5+LA45nqXRAMawyFv3jODcBsPPuCT8FHk0Yb7X8+MNYx7gk7H14aRIjlQg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-linux-x64-gnu@16.0.0: + resolution: {integrity: sha512-xk35VXMp6LfopYFSHy4aEgn1xhFyxDl0xYVcg0nrp0ohppjkYIW2H/XVuuEdYZvRuTPkn3a6dQDoo0LLeY77Cg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@nx/nx-linux-x64-musl@16.0.0: + resolution: {integrity: sha512-yIdIlggK3WyDGoB7zS2UaiX2Q7ew0De62cNDudHgdg8dzHxa6IzKeFJjVEoNEt5Z+BG8ILaSn/lYxQs8YtV4FA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true optional: true - /@nrwl/nx-win32-arm64-msvc@15.9.1: - resolution: {integrity: sha512-ZU/QuUU1WPaIFdKqCWAm5TI+/zYAXbEyZKd/OhY67Gxaca98O4YXS6GmfF7WNHvQzsYoeuuLyRzZowSp22Rung==} + /@nx/nx-win32-arm64-msvc@16.0.0: + resolution: {integrity: sha512-YgnkVewQgA/RhXcGDbyhIi+WqAdIzjKGF1JPsA8q+6di3hRksvN+Ud4TVM9R8NFCrRclIxt04v+fqM24PmMIUQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] requiresBuild: true + dev: true optional: true - /@nrwl/nx-win32-x64-msvc@15.9.1: - resolution: {integrity: sha512-te43yJPni7VIIM5DpZnGuWwEjZNMERdBAhHeKWobwvSQ4ogdpmDbOhsdHqU3mFLaiKP1pzRo17R5tNJ5Gmw5tA==} + /@nx/nx-win32-x64-msvc@16.0.0: + resolution: {integrity: sha512-6UXuO3v5rD3ae5jyYZ0cvlLMJ1NzmdLIIQHio/sWno3KJ0+NR/gpkQBl6F4CdZmoXTXZ+ZsDGUNzQtXWkCdSLg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] requiresBuild: true - optional: true - - /@nrwl/tao@15.9.1: - resolution: {integrity: sha512-gb21eJ3VrZdUpg4MQ4rmOfLy+omHiXCEvWWFGYvFSxXGVeNaLzlvQ/+OOK0B/d0KTCuXKCgvVKJ3jobd+4s02A==} - hasBin: true - dependencies: - nx: 15.9.1 - transitivePeerDependencies: - - '@swc-node/register' - - '@swc/core' - - debug - - /@nrwl/workspace@15.9.1: - resolution: {integrity: sha512-3M1zRrwgaYIZ20fgIsok1nGUrn9DkjZXmh9QVtgHVsLz2vRwrv1wzLAz7kVJpVMUk7gtxcEKLqb8lss4X1zWYQ==} - dependencies: - '@nrwl/devkit': 15.9.1(nx@15.9.1) - '@parcel/watcher': 2.0.4 - chalk: 4.1.2 - chokidar: 3.5.3 - cli-cursor: 3.1.0 - cli-spinners: 2.6.1 - dotenv: 10.0.0 - figures: 3.2.0 - flat: 5.0.2 - glob: 7.1.4 - ignore: 5.2.4 - minimatch: 3.0.5 - npm-run-path: 4.0.1 - nx: 15.9.1 - open: 8.4.2 - rxjs: 6.6.7 - tmp: 0.2.1 - tslib: 2.5.0 - yargs: 17.7.1 - yargs-parser: 21.1.1 - transitivePeerDependencies: - - '@swc-node/register' - - '@swc/core' - - debug dev: true + optional: true /@octokit/auth-token@3.0.3: resolution: {integrity: sha512-/aFM2M4HVDBT/jjDBa84sJniv1t9Gm/rLkalaz9htOm+L+8JMj1k9w0CkUdcxNyNxZPlTxKPVko+m1VlM58ZVA==} @@ -7891,6 +7872,31 @@ packages: '@octokit/openapi-types': 16.0.0 dev: true + /@oozcitak/dom@1.15.8: + resolution: {integrity: sha512-MoOnLBNsF+ok0HjpAvxYxR4piUhRDCEWK0ot3upwOOHYudJd30j6M+LNcE8RKpwfnclAX9T66nXXzkytd29XSw==} + engines: {node: '>=8.0'} + dependencies: + '@oozcitak/infra': 1.0.8 + '@oozcitak/url': 1.0.4 + '@oozcitak/util': 8.3.8 + + /@oozcitak/infra@1.0.8: + resolution: {integrity: sha512-JRAUc9VR6IGHOL7OGF+yrvs0LO8SlqGnPAMqyzOuFZPSZSXI7Xf2O9+awQPSMXgIWGtgUf/dA6Hs6X6ySEaWTg==} + engines: {node: '>=6.0'} + dependencies: + '@oozcitak/util': 8.3.8 + + /@oozcitak/url@1.0.4: + resolution: {integrity: sha512-kDcD8y+y3FCSOvnBI6HJgl00viO/nGbQoCINmQ0h98OhnGITrWR3bOGfwYCthgcrV8AnTJz8MzslTQbC3SOAmw==} + engines: {node: '>=8.0'} + dependencies: + '@oozcitak/infra': 1.0.8 + '@oozcitak/util': 8.3.8 + + /@oozcitak/util@8.3.8: + resolution: {integrity: sha512-T8TbSnGsxo6TDBJx/Sgv/BlVJL3tshxZP7Aq5R1mSnM5OcHY2dQaxLMu2+E8u3gN0MLOzdjurqN4ZRVuzQycOQ==} + engines: {node: '>=8.0'} + /@parcel/watcher@2.0.4: resolution: {integrity: sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==} engines: {node: '>= 10.0.0'} @@ -7898,6 +7904,7 @@ packages: dependencies: node-addon-api: 3.2.1 node-gyp-build: 4.6.0 + dev: true /@pkgr/utils@2.3.1: resolution: {integrity: sha512-wfzX8kc1PMyUILA+1Z/EqoE4UCXGy0iRGMhPwdfae1+f0OXlLqCk+By+aMzgJBzR9AzS4CDizioG6Ss1gvAFJw==} @@ -7974,7 +7981,7 @@ packages: '@pnpm/crypto.base32-hash': 2.0.0 '@pnpm/types': 9.0.0 encode-registry: 3.0.0 - semver: 7.3.8 + semver: 7.5.0 dev: false /@pnpm/error@5.0.0: @@ -8011,7 +8018,7 @@ packages: js-yaml: /@zkochan/js-yaml@0.0.6 normalize-path: 3.0.0 ramda: /@pnpm/ramda@0.28.1 - semver: 7.3.8 + semver: 7.5.0 sort-keys: 4.2.0 strip-bom: 4.0.0 write-file-atomic: 5.0.0 @@ -8051,7 +8058,7 @@ packages: '@pnpm/lockfile-types': 5.0.0 comver-to-semver: 1.0.0 ramda: /@pnpm/ramda@0.28.1 - semver: 7.3.8 + semver: 7.5.0 dev: false /@pnpm/modules-yaml@12.0.0: @@ -9855,7 +9862,7 @@ packages: debug: 2.6.9 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.3.8 + semver: 7.5.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 transitivePeerDependencies: @@ -9876,7 +9883,7 @@ packages: debug: 2.6.9 globby: 11.1.0 is-glob: 4.0.3 - semver: 7.3.8 + semver: 7.5.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 transitivePeerDependencies: @@ -9896,7 +9903,7 @@ packages: '@typescript-eslint/typescript-estree': 5.55.0(typescript@4.9.5) eslint: 8.36.0 eslint-scope: 5.1.1 - semver: 7.3.8 + semver: 7.5.0 transitivePeerDependencies: - supports-color - typescript @@ -10076,6 +10083,7 @@ packages: /@yarnpkg/lockfile@1.1.0: resolution: {integrity: sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==} + dev: true /@yarnpkg/parsers@3.0.0-rc.40: resolution: {integrity: sha512-sKbi5XhHKXCjzb5m0ftGuQuODM2iUXEsrCSl8MkKexNWHepCmU3IPaGTPC5gHZy4sOvsb9JqTLaZEez+kDzG+Q==} @@ -10083,6 +10091,7 @@ packages: dependencies: js-yaml: 3.14.1 tslib: 2.5.0 + dev: true /@zkochan/js-yaml@0.0.6: resolution: {integrity: sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==} @@ -10312,6 +10321,7 @@ packages: /ansi-colors@4.1.3: resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==} engines: {node: '>=6'} + dev: true /ansi-escapes@4.3.2: resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==} @@ -10499,6 +10509,9 @@ packages: - supports-color dev: true + /array-timsort@1.0.3: + resolution: {integrity: sha512-/+3GRL7dDAGEfM6TseQk/U+mi18TU2Ms9I3UlLdUMhz2hbvGNTKdj9xniwXfUqgYhHxRx0+8UnKkvlNwVU+cWQ==} + /array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} engines: {node: '>=8'} @@ -10725,21 +10738,23 @@ packages: engines: {node: '>=4'} dev: false - /axios@0.21.4: - resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} + /axios@0.26.0: + resolution: {integrity: sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==} dependencies: follow-redirects: 1.15.2 transitivePeerDependencies: - debug - dev: true + dev: false - /axios@0.26.0: - resolution: {integrity: sha512-lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og==} + /axios@1.1.3: + resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==} dependencies: follow-redirects: 1.15.2 + form-data: 4.0.0 + proxy-from-env: 1.1.0 transitivePeerDependencies: - debug - dev: false + dev: true /axios@1.3.4: resolution: {integrity: sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==} @@ -10749,6 +10764,7 @@ packages: proxy-from-env: 1.1.0 transitivePeerDependencies: - debug + dev: true /axobject-query@3.1.1: resolution: {integrity: sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==} @@ -11040,6 +11056,7 @@ packages: /binary-extensions@2.2.0: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} + dev: false /binary@0.3.0: resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==} @@ -11277,7 +11294,7 @@ packages: /builtins@5.0.1: resolution: {integrity: sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==} dependencies: - semver: 7.3.8 + semver: 7.5.0 dev: true /byte-size@7.0.0: @@ -11609,6 +11626,7 @@ packages: readdirp: 3.6.0 optionalDependencies: fsevents: 2.3.2 + dev: false /chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} @@ -11678,6 +11696,7 @@ packages: /cli-spinners@2.6.1: resolution: {integrity: sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==} engines: {node: '>=6'} + dev: true /cli-spinners@2.7.0: resolution: {integrity: sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==} @@ -11926,6 +11945,16 @@ packages: engines: {node: ^12.20.0 || >=14} dev: false + /comment-json@4.2.2: + resolution: {integrity: sha512-H8T+kl3nZesZu41zO2oNXIJWojNeK3mHxCLrsBNu6feksBXsgb+PtYz5daP5P86A0F3sz3840KVYehr04enISQ==} + engines: {node: '>= 6'} + dependencies: + array-timsort: 1.0.3 + core-util-is: 1.0.3 + esprima: 4.0.1 + has-own-prop: 2.0.0 + repeat-string: 1.6.1 + /commitizen@4.3.0: resolution: {integrity: sha512-H0iNtClNEhT0fotHvGV3E9tDejDeS04sN1veIebsKYGMuGscFaswRoYJKmT3eW85eIJAs0F28bG2+a/9wCOfPw==} engines: {node: '>= 12'} @@ -12118,6 +12147,9 @@ packages: q: 1.5.1 dev: true + /conventional-changelog-config-spec@2.1.0: + resolution: {integrity: sha512-IpVePh16EbbB02V+UA+HQnnPIohgXvJRxHcS5+Uwk4AT5LjzCZJm5sp/yqs5C6KZJ1jMsV4paEV13BN1pvDuxQ==} + /conventional-changelog-conventionalcommits@5.0.0: resolution: {integrity: sha512-lCDbA+ZqVFQGUj7h9QBKoIpLhl8iihkO0nCTyRNzuXtcd7ubODpYB04IFy31JloiJgG0Uovu8ot8oxRzn7Nwtw==} engines: {node: '>=10'} @@ -12401,7 +12433,7 @@ packages: postcss-modules-scope: 3.0.0(postcss@8.4.21) postcss-modules-values: 4.0.0(postcss@8.4.21) postcss-value-parser: 4.2.0 - semver: 7.3.8 + semver: 7.5.0 webpack: 5.76.2 dev: false @@ -13096,7 +13128,7 @@ packages: dependencies: semver: 7.3.8 shelljs: 0.8.5 - typescript: 5.1.0-dev.20230426 + typescript: 5.1.0-dev.20230501 dev: true /duplexer2@0.0.2: @@ -13214,6 +13246,7 @@ packages: engines: {node: '>=8.6'} dependencies: ansi-colors: 4.1.3 + dev: true /entities@2.0.3: resolution: {integrity: sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==} @@ -14234,6 +14267,10 @@ packages: glob-parent: 5.1.2 merge2: 1.4.1 micromatch: 4.0.5 + dev: true + + /fast-json-patch@3.1.1: + resolution: {integrity: sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==} /fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} @@ -14305,6 +14342,7 @@ packages: engines: {node: '>=8'} dependencies: escape-string-regexp: 1.0.5 + dev: true /file-entry-cache@6.0.1: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} @@ -14464,6 +14502,7 @@ packages: /flat@5.0.2: resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==} hasBin: true + dev: true /flatted@3.2.7: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} @@ -14529,7 +14568,7 @@ packages: memfs: 3.4.13 minimatch: 3.1.2 schema-utils: 2.7.0 - semver: 7.3.8 + semver: 7.5.0 tapable: 1.1.3 typescript: 4.9.5 webpack: 5.76.2 @@ -14559,6 +14598,7 @@ packages: asynckit: 0.4.0 combined-stream: 1.0.8 mime-types: 2.1.35 + dev: true /forwarded@0.2.0: resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==} @@ -14998,6 +15038,7 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true /glob@7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} @@ -15018,7 +15059,6 @@ packages: inherits: 2.0.4 minimatch: 5.1.6 once: 1.4.0 - dev: true /glob@9.3.0: resolution: {integrity: sha512-EAZejC7JvnQINayvB/7BJbpZpNOJ8Lrw2OZNEvQxe0vaLn1SuwMcfV7/MNaX8L/T0wmptBFI4YMtDvSBxYDc7w==} @@ -15251,6 +15291,10 @@ packages: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} + /has-own-prop@2.0.0: + resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==} + engines: {node: '>=8'} + /has-property-descriptors@1.0.0: resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} dependencies: @@ -15729,7 +15773,6 @@ packages: /ini@2.0.0: resolution: {integrity: sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==} engines: {node: '>=10'} - dev: true /ini@3.0.1: resolution: {integrity: sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ==} @@ -15744,7 +15787,7 @@ packages: promzard: 0.3.0 read: 1.0.7 read-package-json: 5.0.1 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-license: 3.0.4 validate-npm-package-name: 4.0.0 dev: true @@ -15781,7 +15824,6 @@ packages: /interpret@1.4.0: resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==} engines: {node: '>= 0.10'} - dev: true /intersect@0.0.3: resolution: {integrity: sha512-Bp/mSG9dsq/eOMk2Q7DyjKxY62TTU2RvNvycjXHhi5TjrA72H+I3c5+1nAOAqtENcrQvCb5NDlsoPWJ4Bh01SA==} @@ -15873,6 +15915,7 @@ packages: engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 + dev: false /is-boolean-object@1.1.2: resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} @@ -16799,7 +16842,7 @@ packages: jest-util: 27.5.1 natural-compare: 1.4.0 pretty-format: 27.5.1 - semver: 7.3.8 + semver: 7.5.0 transitivePeerDependencies: - supports-color @@ -16977,6 +17020,13 @@ packages: /js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} + /js-yaml@3.14.0: + resolution: {integrity: sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==} + hasBin: true + dependencies: + argparse: 1.0.10 + esprima: 4.0.1 + /js-yaml@3.14.1: resolution: {integrity: sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==} hasBin: true @@ -17158,7 +17208,7 @@ packages: commonmark: 0.30.0 fast-glob: 3.2.12 jsii: 1.80.0 - semver: 7.3.8 + semver: 7.5.0 semver-intersect: 1.4.0 stream-json: 1.7.5 typescript: 3.9.10 @@ -17202,7 +17252,7 @@ packages: fast-deep-equal: 3.1.3 fs-extra: 10.1.0 log4js: 6.9.1 - semver: 7.3.8 + semver: 7.5.0 semver-intersect: 1.4.0 sort-json: 2.0.1 spdx-license-list: 6.6.0 @@ -17536,7 +17586,7 @@ packages: normalize-package-data: 4.0.1 npm-package-arg: 9.1.2 npm-registry-fetch: 13.3.0 - semver: 7.3.8 + semver: 7.5.0 ssri: 9.0.1 transitivePeerDependencies: - bluebird @@ -17590,6 +17640,7 @@ packages: /lines-and-columns@2.0.3: resolution: {integrity: sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + dev: true /listenercount@1.0.1: resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==} @@ -18647,6 +18698,7 @@ packages: resolution: {integrity: sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==} dependencies: brace-expansion: 1.1.11 + dev: true /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} @@ -18946,10 +18998,11 @@ packages: resolution: {integrity: sha512-7GGVawqyHF4pfd0YFybhv/eM9JwTtPqx0mAanQ146O3FlSh3pA24zf9IRQTOsfTSqXTNzPSP5iagAJ94jjuVog==} engines: {node: '>=10'} dependencies: - semver: 7.3.8 + semver: 7.5.0 /node-addon-api@3.2.1: resolution: {integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==} + dev: true /node-addon-api@5.1.0: resolution: {integrity: sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==} @@ -18980,6 +19033,7 @@ packages: /node-gyp-build@4.6.0: resolution: {integrity: sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==} hasBin: true + dev: true /node-gyp@6.1.0: resolution: {integrity: sha512-h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw==} @@ -19011,7 +19065,7 @@ packages: nopt: 6.0.0 npmlog: 6.0.2 rimraf: 3.0.2 - semver: 7.3.8 + semver: 7.5.0 tar: 6.1.13 which: 2.0.2 transitivePeerDependencies: @@ -19118,7 +19172,7 @@ packages: dependencies: hosted-git-info: 4.1.0 is-core-module: 2.11.0 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-license: 3.0.4 dev: true @@ -19128,7 +19182,7 @@ packages: dependencies: hosted-git-info: 5.2.1 is-core-module: 2.11.0 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-license: 3.0.4 dev: true @@ -19138,7 +19192,7 @@ packages: dependencies: hosted-git-info: 6.1.1 is-core-module: 2.11.0 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-license: 3.0.4 /normalize-path@3.0.0: @@ -19215,14 +19269,14 @@ packages: resolution: {integrity: sha512-65lUsMI8ztHCxFz5ckCEC44DRvEGdZX5usQFriauxHEwt7upv1FKaQEmAtU0YnOAdwuNWCmk64xYiQABNrEyLA==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: - semver: 7.3.8 + semver: 7.5.0 dev: true /npm-install-checks@6.0.0: resolution: {integrity: sha512-SBU9oFglRVZnfElwAtF14NivyulDqF1VKqqwNsFW9HDcbHMAPHpRSsVFgKuwFGq/hVvWZExz62Th0kvxn/XE7Q==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dependencies: - semver: 7.3.8 + semver: 7.5.0 dev: true /npm-license@0.3.3: @@ -19259,7 +19313,7 @@ packages: dependencies: hosted-git-info: 6.1.1 proc-log: 3.0.0 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-name: 5.0.0 dev: true @@ -19268,7 +19322,7 @@ packages: engines: {node: '>=10'} dependencies: hosted-git-info: 3.0.8 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-name: 3.0.0 dev: true @@ -19278,7 +19332,7 @@ packages: dependencies: hosted-git-info: 5.2.1 proc-log: 2.0.1 - semver: 7.3.8 + semver: 7.5.0 validate-npm-package-name: 4.0.0 dev: true @@ -19315,7 +19369,7 @@ packages: npm-install-checks: 5.0.0 npm-normalize-package-bin: 2.0.0 npm-package-arg: 9.1.2 - semver: 7.3.8 + semver: 7.5.0 dev: true /npm-pick-manifest@8.0.1: @@ -19325,7 +19379,7 @@ packages: npm-install-checks: 6.0.0 npm-normalize-package-bin: 3.0.0 npm-package-arg: 10.1.0 - semver: 7.3.8 + semver: 7.5.0 dev: true /npm-registry-fetch@13.3.0: @@ -19456,6 +19510,24 @@ packages: /nwsapi@2.2.2: resolution: {integrity: sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==} + /nx-cloud@16.0.5: + resolution: {integrity: sha512-13P7r0aKikjBtmdZrNorwXzVPeVIV4MLEwqGY+DEG6doLBtI5KqEQk/d5B5l2dCF2BEi/LXEmLYCmf9gwbOJ+Q==} + hasBin: true + dependencies: + '@nrwl/nx-cloud': 16.0.5 + axios: 1.1.3 + chalk: 4.1.2 + dotenv: 10.0.0 + fs-extra: 11.1.0 + node-machine-id: 1.1.12 + open: 8.4.2 + strip-json-comments: 3.1.1 + tar: 6.1.11 + yargs-parser: 21.1.1 + transitivePeerDependencies: + - debug + dev: true + /nx@15.9.1: resolution: {integrity: sha512-4PXqQ45JPUBTYqVkVFmUg+mGj+qYkn89Cf+T1n+V1EC8p0pdavqPNaMaTxJTJDOP0TyF+yZ780Kujbarzae8bg==} hasBin: true @@ -19516,6 +19588,68 @@ packages: '@nrwl/nx-win32-x64-msvc': 15.9.1 transitivePeerDependencies: - debug + dev: true + + /nx@16.0.0: + resolution: {integrity: sha512-ZqqXDqJL3gW1wqwuDXPDeCZZWWSQAi2TrhpK9X1oyCml2TixzMhFBXVF+WZebIw2TCE83T3kK0lHMo72UZTmNw==} + hasBin: true + requiresBuild: true + peerDependencies: + '@swc-node/register': ^1.4.2 + '@swc/core': ^1.2.173 + peerDependenciesMeta: + '@swc-node/register': + optional: true + '@swc/core': + optional: true + dependencies: + '@nrwl/tao': 16.0.0 + '@parcel/watcher': 2.0.4 + '@yarnpkg/lockfile': 1.1.0 + '@yarnpkg/parsers': 3.0.0-rc.40 + '@zkochan/js-yaml': 0.0.6 + axios: 1.3.4 + chalk: 4.1.2 + cli-cursor: 3.1.0 + cli-spinners: 2.6.1 + cliui: 7.0.4 + dotenv: 10.0.0 + enquirer: 2.3.6 + fast-glob: 3.2.7 + figures: 3.2.0 + flat: 5.0.2 + fs-extra: 11.1.0 + glob: 7.1.4 + ignore: 5.2.4 + js-yaml: 4.1.0 + jsonc-parser: 3.2.0 + lines-and-columns: 2.0.3 + minimatch: 3.0.5 + npm-run-path: 4.0.1 + open: 8.4.2 + semver: 7.3.4 + string-width: 4.2.3 + strong-log-transformer: 2.1.0 + tar-stream: 2.2.0 + tmp: 0.2.1 + tsconfig-paths: 4.1.2 + tslib: 2.5.0 + v8-compile-cache: 2.3.0 + yargs: 17.7.1 + yargs-parser: 21.1.1 + optionalDependencies: + '@nx/nx-darwin-arm64': 16.0.0 + '@nx/nx-darwin-x64': 16.0.0 + '@nx/nx-linux-arm-gnueabihf': 16.0.0 + '@nx/nx-linux-arm64-gnu': 16.0.0 + '@nx/nx-linux-arm64-musl': 16.0.0 + '@nx/nx-linux-x64-gnu': 16.0.0 + '@nx/nx-linux-x64-musl': 16.0.0 + '@nx/nx-win32-arm64-msvc': 16.0.0 + '@nx/nx-win32-x64-msvc': 16.0.0 + transitivePeerDependencies: + - debug + dev: true /oauth-sign@0.9.0: resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==} @@ -19897,7 +20031,7 @@ packages: got: 11.8.6 registry-auth-token: 5.0.2 registry-url: 6.0.1 - semver: 7.3.8 + semver: 7.5.0 dev: true /package-license@0.1.2: @@ -20565,7 +20699,7 @@ packages: cosmiconfig: 7.0.0 klona: 2.0.6 postcss: 8.4.21 - semver: 7.3.8 + semver: 7.5.0 webpack: 5.76.2 dev: false @@ -21178,6 +21312,54 @@ packages: resolution: {integrity: sha512-NJRj6B1ClpN2C1ObboInJ9zLPvrmFp0AGycGIWqTphCzlQMSHFmygVjdJglayJKb0qva4hP8CINFAW9M/5AxQQ==} engines: {node: '>= 14.0.0'} hasBin: true + dependencies: + '@iarna/toml': 2.2.5 + case: 1.6.3 + chalk: 4.1.2 + comment-json: 4.2.2 + conventional-changelog-config-spec: 2.1.0 + fast-json-patch: 3.1.1 + glob: 8.1.0 + ini: 2.0.0 + semver: 7.5.0 + shx: 0.3.4 + xmlbuilder2: 2.4.1 + yaml: 2.2.2 + yargs: 16.2.0 + dev: true + bundledDependencies: + - '@iarna/toml' + - case + - chalk + - comment-json + - conventional-changelog-config-spec + - fast-json-patch + - glob + - ini + - semver + - shx + - xmlbuilder2 + - yaml + - yargs + + /projen@0.71.35: + resolution: {integrity: sha512-VDs6EUVHgUw2InmygZ7vJ8SJ/gEICwsx7Fk0mzUMcsp5qBjj/t4PX02yqzNwomUyIj+5WXvu+zxd7k0L9iXnlg==} + engines: {node: '>= 14.0.0'} + hasBin: true + dependencies: + '@iarna/toml': 2.2.5 + case: 1.6.3 + chalk: 4.1.2 + comment-json: 4.2.2 + conventional-changelog-config-spec: 2.1.0 + fast-json-patch: 3.1.1 + glob: 8.1.0 + ini: 2.0.0 + semver: 7.5.0 + shx: 0.3.4 + xmlbuilder2: 2.4.1 + yaml: 2.2.2 + yargs: 16.2.0 bundledDependencies: - '@iarna/toml' - case @@ -21275,6 +21457,7 @@ packages: /proxy-from-env@1.1.0: resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==} + dev: true /psl@1.9.0: resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==} @@ -22048,6 +22231,7 @@ packages: engines: {node: '>=8.10.0'} dependencies: picomatch: 2.3.1 + dev: false /readline@1.3.0: resolution: {integrity: sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==} @@ -22073,7 +22257,6 @@ packages: engines: {node: '>= 0.10'} dependencies: resolve: 1.22.1 - dev: true /recursive-readdir@2.2.3: resolution: {integrity: sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==} @@ -22201,7 +22384,6 @@ packages: /repeat-string@1.6.1: resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==} engines: {node: '>=0.10'} - dev: false /request@2.88.2: resolution: {integrity: sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==} @@ -22463,13 +22645,6 @@ packages: resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==} dev: false - /rxjs@6.6.7: - resolution: {integrity: sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==} - engines: {npm: '>=2.0.0'} - dependencies: - tslib: 1.14.1 - dev: true - /rxjs@7.8.0: resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==} dependencies: @@ -22605,7 +22780,7 @@ packages: resolution: {integrity: sha512-0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA==} engines: {node: '>=12'} dependencies: - semver: 7.3.8 + semver: 7.5.0 dev: true /semver-intersect@1.4.0: @@ -22641,6 +22816,7 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 + dev: true /semver@7.3.8: resolution: {integrity: sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==} @@ -22649,6 +22825,13 @@ packages: dependencies: lru-cache: 6.0.0 + /semver@7.5.0: + resolution: {integrity: sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} @@ -22801,12 +22984,19 @@ packages: glob: 7.2.3 interpret: 1.4.0 rechoir: 0.6.2 - dev: true /shorthash2@1.0.3: resolution: {integrity: sha512-oB8s64JsyJ2xhHJlnTwGg++Y3BTF6XnXeXMC7OygD8vtNcCRDiMxEGONvUOeZbxfwEXENmRlqPDouMR/OtGDsw==} dev: false + /shx@0.3.4: + resolution: {integrity: sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==} + engines: {node: '>=6'} + hasBin: true + dependencies: + minimist: 1.2.8 + shelljs: 0.8.5 + /side-channel@1.0.4: resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==} dependencies: @@ -23539,6 +23729,7 @@ packages: duplexer: 0.1.2 minimist: 1.2.8 through: 2.3.8 + dev: true /style-dictionary@3.7.1: resolution: {integrity: sha512-yYU9Z/J8Znj9T9oJVjo8VOYamrOxv0UbBKPjhSt+PharxrhyQCM4RWb71fgEfv2pK9KO8G83/0ChDNQZ1mn0wQ==} @@ -23957,6 +24148,7 @@ packages: /through@2.3.8: resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==} + dev: true /thunky@1.1.0: resolution: {integrity: sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==} @@ -23988,6 +24180,7 @@ packages: engines: {node: '>=8.17.0'} dependencies: rimraf: 3.0.2 + dev: true /tmpl@1.0.5: resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==} @@ -24212,6 +24405,7 @@ packages: json5: 2.2.3 minimist: 1.2.8 strip-bom: 3.0.0 + dev: true /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} @@ -24363,8 +24557,8 @@ packages: engines: {node: '>=4.2.0'} hasBin: true - /typescript@5.1.0-dev.20230426: - resolution: {integrity: sha512-zQ4BsUQeM5CFScIVsyY0XOMCn/VYav7z5CT6nlOSqI/CJ3DVn86JWE/DwkK44c39RyKCmtwB9hz+BWcb7bem/g==} + /typescript@5.1.0-dev.20230501: + resolution: {integrity: sha512-do/P7zywbVm6xrjV7Sa7jqgqBfME/FhvtECzxfLpAxyqYY5SFPPWb5NTposRUVKw/0hLOxAoCbvYzNHa22VOMg==} engines: {node: '>=14.17'} hasBin: true dev: true @@ -24600,7 +24794,7 @@ packages: is-yarn-global: 0.4.1 latest-version: 7.0.0 pupa: 3.1.0 - semver: 7.3.8 + semver: 7.5.0 semver-diff: 4.0.0 xdg-basedir: 5.1.0 dev: true @@ -24766,6 +24960,7 @@ packages: /v8-compile-cache@2.3.0: resolution: {integrity: sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==} + dev: true /v8-to-istanbul@8.1.1: resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==} @@ -25503,6 +25698,16 @@ packages: resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==} dev: true + /xmlbuilder2@2.4.1: + resolution: {integrity: sha512-vliUplZsk5vJnhxXN/mRcij/AE24NObTUm/Zo4vkLusgayO6s3Et5zLEA14XZnY1c3hX5o1ToR0m0BJOPy0UvQ==} + engines: {node: '>=10.0'} + dependencies: + '@oozcitak/dom': 1.15.8 + '@oozcitak/infra': 1.0.8 + '@oozcitak/util': 8.3.8 + '@types/node': 16.0.0 + js-yaml: 3.14.0 + /xmlbuilder@15.1.1: resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==} engines: {node: '>=8.0'} @@ -25551,6 +25756,10 @@ packages: engines: {node: '>= 14'} dev: true + /yaml@2.2.2: + resolution: {integrity: sha512-CBKFWExMn46Foo4cldiChEzn7S7SRV+wqiluAb6xmueD/fGyRHIhX8m14vVGgeFWjN540nKCNVj6P21eQjgTuA==} + engines: {node: '>= 14'} + /yargs-parser@18.1.3: resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==} engines: {node: '>=6'} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 968280ed6..6379496a7 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,14 +1,8 @@ # ~~ Generated by projen. To modify, edit .projenrc.ts and run "npx projen". packages: - - public/docs - packages/pdk-nag - packages/nx-monorepo - - packages/pipeline - - packages/pipeline/samples/typescript - - packages/pipeline/samples/python - - packages/pipeline/samples/java - - packages/aws-prototyping-sdk - packages/static-website - packages/identity - packages/open-api-gateway @@ -18,3 +12,8 @@ packages: - packages/aws-arch - packages/cdk-graph - packages/cdk-graph-plugin-diagram + - packages/pipeline + - samples/pipeline/typescript + - samples/pipeline/python + - samples/pipeline/java + - public/docs diff --git a/private/projects/nx-monorepo-project.ts b/private/projects/nx-monorepo-project.ts index 679da47af..65a5fec9e 100644 --- a/private/projects/nx-monorepo-project.ts +++ b/private/projects/nx-monorepo-project.ts @@ -20,7 +20,6 @@ export class NXMonorepoProject extends PDKProject { devDeps: ["projen", "nx", "@types/fs-extra", "@types/semver"], peerDeps: ["projen"], bundledDeps: [ - "@nrwl/devkit", "fs-extra", "semver", "@pnpm/reviewing.dependencies-hierarchy", diff --git a/private/projects/pdk-monorepo-project.ts b/private/projects/pdk-monorepo-project.ts index 48a1d55b4..72eab29fc 100644 --- a/private/projects/pdk-monorepo-project.ts +++ b/private/projects/pdk-monorepo-project.ts @@ -90,7 +90,7 @@ export class PDKMonorepoProject extends NxMonorepoProject { monorepoUpgradeDepsOptions: { syncpackConfig: { ...DEFAULT_CONFIG, workspace: false }, }, - deps: ["fast-xml-parser", "projen", "@pnpm/types"], + deps: ["fast-xml-parser", "projen", "@pnpm/types@^9.0.0"], nxConfig: { // This is OK to be stored given its read only and the repository is public nxCloudReadOnlyAccessToken: diff --git a/private/projects/pipeline-project.ts b/private/projects/pipeline-project.ts index 4bfb6ba7e..6d6722b48 100644 --- a/private/projects/pipeline-project.ts +++ b/private/projects/pipeline-project.ts @@ -33,11 +33,18 @@ export class PipelineProject extends PDKProject { stability: Stability.STABLE, }); + this.addPackageIgnore("!samples"); + this.addGitIgnore("samples"); + this._samples.push( new PipelineTypescriptSampleProject(parent), new PipelinePythonSampleProject(parent), new PipelineJavaSampleProject(parent) ); + + this.preCompileTask.exec( + 'rm -rf samples && rsync -a ../../samples . --include="*/" --include="pipeline/typescript/src/**" --include="pipeline/typescript/test/**" --include="pipeline/python/infra/*.py" --include="pipeline/python/tests/*.py" --include="pipeline/java/src/**" --exclude="*" --prune-empty-dirs' + ); } public get samples(): Project[] { @@ -54,7 +61,7 @@ export class PipelineTypescriptSampleProject extends TypeScriptProject { parent, packageManager: NodePackageManager.PNPM, projenCommand: buildExecutableCommand(NodePackageManager.PNPM, "projen"), - outdir: "packages/pipeline/samples/typescript", + outdir: "samples/pipeline/typescript", defaultReleaseBranch: "mainline", npmignoreEnabled: false, name: "pipeline-sample-ts", @@ -63,7 +70,12 @@ export class PipelineTypescriptSampleProject extends TypeScriptProject { jestOptions: { jestVersion: JEST_VERSION, }, - deps: ["aws-cdk-lib", "constructs", "aws-prototyping-sdk@0.0.0"], + deps: [ + "aws-cdk-lib", + "constructs", + "@aws-prototyping-sdk/pipeline@0.0.0", + "@aws-prototyping-sdk/pdk-nag@0.0.0", + ], }); this.package.addField("private", true); @@ -80,7 +92,7 @@ export class PipelinePythonSampleProject extends PythonProject { constructor(parent: Project) { super({ parent, - outdir: "packages/pipeline/samples/python", + outdir: "samples/pipeline/python", authorEmail: "", authorName: "", moduleName: "infra", @@ -92,7 +104,8 @@ export class PipelinePythonSampleProject extends PythonProject { "aws-cdk-lib", "constructs", "pyhumps", - "../../../aws-prototyping-sdk/dist/python/aws_prototyping_sdk-0.0.0-py3-none-any.whl", + "../../../packages/pipeline/dist/python/aws_prototyping_sdk.pipeline-0.0.0-py3-none-any.whl", + "../../../packages/pdk-nag/dist/python/aws_prototyping_sdk.pdk_nag-0.0.0-py3-none-any.whl", ], }); @@ -118,7 +131,7 @@ export class PipelineJavaSampleProject extends JavaProject { constructor(parent: Project) { super({ parent, - outdir: "packages/pipeline/samples/java", + outdir: "samples/pipeline/java", artifactId: "pipeline-sample-java", groupId: "pipeline.sample", name: "pipeline-sample-java", @@ -142,13 +155,21 @@ export class PipelineJavaSampleProject extends JavaProject { pom.project.dependencies.dependency = [ ...pom.project.dependencies.dependency, + { + groupId: "software.aws.awsprototypingsdk.pipeline", + artifactId: "pipeline", + version: "0.0.0", + scope: "system", + systemPath: + "${basedir}/../../../packages/pipeline/dist/java/software/aws/awsprototypingsdk/pipeline/0.0.0/pipeline-0.0.0.jar", + }, { groupId: "software.aws.awsprototypingsdk", - artifactId: "aws-prototyping-sdk", + artifactId: "pdk-nag", version: "0.0.0", scope: "system", systemPath: - "${basedir}/../../../aws-prototyping-sdk/dist/java/software/aws/awsprototypingsdk/aws-prototyping-sdk/0.0.0/aws-prototyping-sdk-0.0.0.jar", + "${basedir}/../../../packages/pdk-nag/dist/java/software/aws/awsprototypingsdk/pdk-nag/0.0.0/pdk-nag-0.0.0.jar", }, ]; diff --git a/public/docs/package.json b/public/docs/package.json index bcf333593..cb9e3710c 100644 --- a/public/docs/package.json +++ b/public/docs/package.json @@ -60,8 +60,7 @@ "@aws-prototyping-sdk/pdk-nag", "@aws-prototyping-sdk/pipeline", "@aws-prototyping-sdk/static-website", - "@aws-prototyping-sdk/type-safe-api", - "aws-prototyping-sdk" + "@aws-prototyping-sdk/type-safe-api" ] }, "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." diff --git a/packages/pipeline/samples/java/.gitattributes b/samples/pipeline/java/.gitattributes similarity index 100% rename from packages/pipeline/samples/java/.gitattributes rename to samples/pipeline/java/.gitattributes diff --git a/packages/pipeline/samples/java/.gitignore b/samples/pipeline/java/.gitignore similarity index 100% rename from packages/pipeline/samples/java/.gitignore rename to samples/pipeline/java/.gitignore diff --git a/packages/pipeline/samples/java/.projen/deps.json b/samples/pipeline/java/.projen/deps.json similarity index 100% rename from packages/pipeline/samples/java/.projen/deps.json rename to samples/pipeline/java/.projen/deps.json diff --git a/packages/pipeline/samples/java/.projen/files.json b/samples/pipeline/java/.projen/files.json similarity index 100% rename from packages/pipeline/samples/java/.projen/files.json rename to samples/pipeline/java/.projen/files.json diff --git a/packages/pipeline/samples/java/.projen/tasks.json b/samples/pipeline/java/.projen/tasks.json similarity index 100% rename from packages/pipeline/samples/java/.projen/tasks.json rename to samples/pipeline/java/.projen/tasks.json diff --git a/packages/pipeline/samples/java/README.md b/samples/pipeline/java/README.md similarity index 100% rename from packages/pipeline/samples/java/README.md rename to samples/pipeline/java/README.md diff --git a/packages/pipeline/samples/java/pom.xml b/samples/pipeline/java/pom.xml similarity index 87% rename from packages/pipeline/samples/java/pom.xml rename to samples/pipeline/java/pom.xml index ca145bfa0..118baf502 100644 --- a/packages/pipeline/samples/java/pom.xml +++ b/samples/pipeline/java/pom.xml @@ -108,12 +108,19 @@ 5.7.0 test + + software.aws.awsprototypingsdk.pipeline + pipeline + 0.0.0 + system + ${basedir}/../../../packages/pipeline/dist/java/software/aws/awsprototypingsdk/pipeline/0.0.0/pipeline-0.0.0.jar + software.aws.awsprototypingsdk - aws-prototyping-sdk + pdk-nag 0.0.0 system - ${basedir}/../../../aws-prototyping-sdk/dist/java/software/aws/awsprototypingsdk/aws-prototyping-sdk/0.0.0/aws-prototyping-sdk-0.0.0.jar + ${basedir}/../../../packages/pdk-nag/dist/java/software/aws/awsprototypingsdk/pdk-nag/0.0.0/pdk-nag-0.0.0.jar diff --git a/packages/pipeline/samples/java/project.json b/samples/pipeline/java/project.json similarity index 73% rename from packages/pipeline/samples/java/project.json rename to samples/pipeline/java/project.json index c27cb5f1c..d2fed7a25 100644 --- a/packages/pipeline/samples/java/project.json +++ b/samples/pipeline/java/project.json @@ -1,57 +1,57 @@ { "name": "pipeline-sample-java", - "root": "packages/pipeline/samples/java", + "root": "samples/pipeline/java", "implicitDependencies": [ - "aws-prototyping-sdk" + "@aws-prototyping-sdk/pipeline" ], "targets": { "build": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen build", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "package": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen package", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "test": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen test", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "post-compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen post-compile", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen compile", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "pre-compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen pre-compile", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } }, "default": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen default", - "cwd": "packages/pipeline/samples/java" + "cwd": "samples/pipeline/java" } } }, diff --git a/packages/pipeline/samples/java/src/main/java/software/aws/ApplicationStack.java b/samples/pipeline/java/src/main/java/software/aws/ApplicationStack.java similarity index 100% rename from packages/pipeline/samples/java/src/main/java/software/aws/ApplicationStack.java rename to samples/pipeline/java/src/main/java/software/aws/ApplicationStack.java diff --git a/packages/pipeline/samples/java/src/main/java/software/aws/ApplicationStage.java b/samples/pipeline/java/src/main/java/software/aws/ApplicationStage.java similarity index 100% rename from packages/pipeline/samples/java/src/main/java/software/aws/ApplicationStage.java rename to samples/pipeline/java/src/main/java/software/aws/ApplicationStage.java diff --git a/packages/pipeline/samples/java/src/main/java/software/aws/Pipeline.java b/samples/pipeline/java/src/main/java/software/aws/Pipeline.java similarity index 100% rename from packages/pipeline/samples/java/src/main/java/software/aws/Pipeline.java rename to samples/pipeline/java/src/main/java/software/aws/Pipeline.java diff --git a/packages/pipeline/samples/java/src/main/java/software/aws/PipelineStack.java b/samples/pipeline/java/src/main/java/software/aws/PipelineStack.java similarity index 100% rename from packages/pipeline/samples/java/src/main/java/software/aws/PipelineStack.java rename to samples/pipeline/java/src/main/java/software/aws/PipelineStack.java diff --git a/packages/pipeline/samples/java/src/test/java/software/aws/PipelineTest.java b/samples/pipeline/java/src/test/java/software/aws/PipelineTest.java similarity index 100% rename from packages/pipeline/samples/java/src/test/java/software/aws/PipelineTest.java rename to samples/pipeline/java/src/test/java/software/aws/PipelineTest.java diff --git a/packages/pipeline/samples/python/.gitattributes b/samples/pipeline/python/.gitattributes similarity index 100% rename from packages/pipeline/samples/python/.gitattributes rename to samples/pipeline/python/.gitattributes diff --git a/packages/pipeline/samples/python/.gitignore b/samples/pipeline/python/.gitignore similarity index 100% rename from packages/pipeline/samples/python/.gitignore rename to samples/pipeline/python/.gitignore diff --git a/packages/pipeline/samples/python/.projen/deps.json b/samples/pipeline/python/.projen/deps.json similarity index 66% rename from packages/pipeline/samples/python/.projen/deps.json rename to samples/pipeline/python/.projen/deps.json index 082119e6d..44b07637f 100644 --- a/packages/pipeline/samples/python/.projen/deps.json +++ b/samples/pipeline/python/.projen/deps.json @@ -5,7 +5,11 @@ "type": "devenv" }, { - "name": "../../../aws-prototyping-sdk/dist/python/aws_prototyping_sdk-0.0.0-py3-none-any.whl", + "name": "../../../packages/pdk-nag/dist/python/aws_prototyping_sdk.pdk_nag-0.0.0-py3-none-any.whl", + "type": "runtime" + }, + { + "name": "../../../packages/pipeline/dist/python/aws_prototyping_sdk.pipeline-0.0.0-py3-none-any.whl", "type": "runtime" }, { diff --git a/packages/pipeline/samples/python/.projen/files.json b/samples/pipeline/python/.projen/files.json similarity index 100% rename from packages/pipeline/samples/python/.projen/files.json rename to samples/pipeline/python/.projen/files.json diff --git a/packages/pipeline/samples/python/.projen/tasks.json b/samples/pipeline/python/.projen/tasks.json similarity index 100% rename from packages/pipeline/samples/python/.projen/tasks.json rename to samples/pipeline/python/.projen/tasks.json diff --git a/packages/pipeline/samples/python/README.md b/samples/pipeline/python/README.md similarity index 100% rename from packages/pipeline/samples/python/README.md rename to samples/pipeline/python/README.md diff --git a/packages/pipeline/samples/python/infra/application_stack.py b/samples/pipeline/python/infra/application_stack.py similarity index 100% rename from packages/pipeline/samples/python/infra/application_stack.py rename to samples/pipeline/python/infra/application_stack.py diff --git a/packages/pipeline/samples/python/infra/application_stage.py b/samples/pipeline/python/infra/application_stage.py similarity index 100% rename from packages/pipeline/samples/python/infra/application_stage.py rename to samples/pipeline/python/infra/application_stage.py diff --git a/packages/pipeline/samples/python/infra/pipeline.py b/samples/pipeline/python/infra/pipeline.py similarity index 100% rename from packages/pipeline/samples/python/infra/pipeline.py rename to samples/pipeline/python/infra/pipeline.py diff --git a/packages/pipeline/samples/python/infra/pipeline_stack.py b/samples/pipeline/python/infra/pipeline_stack.py similarity index 100% rename from packages/pipeline/samples/python/infra/pipeline_stack.py rename to samples/pipeline/python/infra/pipeline_stack.py diff --git a/packages/pipeline/samples/python/project.json b/samples/pipeline/python/project.json similarity index 72% rename from packages/pipeline/samples/python/project.json rename to samples/pipeline/python/project.json index b509967b0..4253cd072 100644 --- a/packages/pipeline/samples/python/project.json +++ b/samples/pipeline/python/project.json @@ -1,64 +1,64 @@ { "name": "pipeline-sample-py", - "root": "packages/pipeline/samples/python", + "root": "samples/pipeline/python", "implicitDependencies": [ - "aws-prototyping-sdk" + "@aws-prototyping-sdk/pipeline" ], "targets": { "install": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen install", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "build": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen build", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "package": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen package", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "test": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen test", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "post-compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen post-compile", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen compile", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "pre-compile": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen pre-compile", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } }, "default": { "executor": "nx:run-commands", "options": { "command": "pnpm dlx projen default", - "cwd": "packages/pipeline/samples/python" + "cwd": "samples/pipeline/python" } } }, diff --git a/packages/pipeline/samples/python/requirements-dev.txt b/samples/pipeline/python/requirements-dev.txt similarity index 100% rename from packages/pipeline/samples/python/requirements-dev.txt rename to samples/pipeline/python/requirements-dev.txt diff --git a/samples/pipeline/python/requirements.txt b/samples/pipeline/python/requirements.txt new file mode 100644 index 000000000..3374db63a --- /dev/null +++ b/samples/pipeline/python/requirements.txt @@ -0,0 +1,6 @@ +# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen". +../../../packages/pdk-nag/dist/python/aws_prototyping_sdk.pdk_nag-0.0.0-py3-none-any.whl +../../../packages/pipeline/dist/python/aws_prototyping_sdk.pipeline-0.0.0-py3-none-any.whl +aws-cdk-lib +constructs +pyhumps diff --git a/packages/pipeline/samples/python/tests/__init__.py b/samples/pipeline/python/tests/__init__.py similarity index 100% rename from packages/pipeline/samples/python/tests/__init__.py rename to samples/pipeline/python/tests/__init__.py diff --git a/packages/pipeline/samples/python/tests/test_pipeline.py b/samples/pipeline/python/tests/test_pipeline.py similarity index 100% rename from packages/pipeline/samples/python/tests/test_pipeline.py rename to samples/pipeline/python/tests/test_pipeline.py diff --git a/packages/pipeline/samples/typescript/.eslintrc.json b/samples/pipeline/typescript/.eslintrc.json similarity index 100% rename from packages/pipeline/samples/typescript/.eslintrc.json rename to samples/pipeline/typescript/.eslintrc.json diff --git a/packages/pipeline/samples/typescript/.gitattributes b/samples/pipeline/typescript/.gitattributes similarity index 100% rename from packages/pipeline/samples/typescript/.gitattributes rename to samples/pipeline/typescript/.gitattributes diff --git a/packages/pipeline/samples/typescript/.gitignore b/samples/pipeline/typescript/.gitignore similarity index 100% rename from packages/pipeline/samples/typescript/.gitignore rename to samples/pipeline/typescript/.gitignore diff --git a/packages/aws-prototyping-sdk/.npmrc b/samples/pipeline/typescript/.npmrc similarity index 100% rename from packages/aws-prototyping-sdk/.npmrc rename to samples/pipeline/typescript/.npmrc diff --git a/packages/pipeline/samples/typescript/.projen/deps.json b/samples/pipeline/typescript/.projen/deps.json similarity index 94% rename from packages/pipeline/samples/typescript/.projen/deps.json rename to samples/pipeline/typescript/.projen/deps.json index 21a486705..31f16224c 100644 --- a/packages/pipeline/samples/typescript/.projen/deps.json +++ b/samples/pipeline/typescript/.projen/deps.json @@ -125,14 +125,19 @@ "type": "override" }, { - "name": "aws-cdk-lib", + "name": "@aws-prototyping-sdk/pdk-nag", + "version": "0.0.0", "type": "runtime" }, { - "name": "aws-prototyping-sdk", + "name": "@aws-prototyping-sdk/pipeline", "version": "0.0.0", "type": "runtime" }, + { + "name": "aws-cdk-lib", + "type": "runtime" + }, { "name": "constructs", "type": "runtime" diff --git a/packages/pipeline/samples/typescript/.projen/files.json b/samples/pipeline/typescript/.projen/files.json similarity index 100% rename from packages/pipeline/samples/typescript/.projen/files.json rename to samples/pipeline/typescript/.projen/files.json diff --git a/packages/pipeline/samples/typescript/.projen/tasks.json b/samples/pipeline/typescript/.projen/tasks.json similarity index 100% rename from packages/pipeline/samples/typescript/.projen/tasks.json rename to samples/pipeline/typescript/.projen/tasks.json diff --git a/packages/aws-prototyping-sdk/LICENSE b/samples/pipeline/typescript/LICENSE similarity index 100% rename from packages/aws-prototyping-sdk/LICENSE rename to samples/pipeline/typescript/LICENSE diff --git a/packages/pipeline/samples/typescript/README.md b/samples/pipeline/typescript/README.md similarity index 100% rename from packages/pipeline/samples/typescript/README.md rename to samples/pipeline/typescript/README.md diff --git a/packages/pipeline/samples/typescript/package.json b/samples/pipeline/typescript/package.json similarity index 94% rename from packages/pipeline/samples/typescript/package.json rename to samples/pipeline/typescript/package.json index 42023aa7c..211f6291c 100644 --- a/packages/pipeline/samples/typescript/package.json +++ b/samples/pipeline/typescript/package.json @@ -25,13 +25,14 @@ "eslint-plugin-import": "^2.27.5", "jest": "^27", "jest-junit": "^15", - "projen": "^0.71.27", + "projen": "^0.71.35", "ts-jest": "^27", "typescript": "^4.9.4" }, "dependencies": { + "@aws-prototyping-sdk/pdk-nag": "0.0.0", + "@aws-prototyping-sdk/pipeline": "0.0.0", "aws-cdk-lib": "^2.60.0", - "aws-prototyping-sdk": "0.0.0", "constructs": "^10.1.222" }, "pnpm": { @@ -97,7 +98,7 @@ "private": true, "nx": { "implicitDependencies": [ - "aws-prototyping-sdk" + "@aws-prototyping-sdk/pipeline" ] }, "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." diff --git a/packages/pipeline/samples/typescript/src/application-stack.ts b/samples/pipeline/typescript/src/application-stack.ts similarity index 100% rename from packages/pipeline/samples/typescript/src/application-stack.ts rename to samples/pipeline/typescript/src/application-stack.ts diff --git a/packages/pipeline/samples/typescript/src/application-stage.ts b/samples/pipeline/typescript/src/application-stage.ts similarity index 100% rename from packages/pipeline/samples/typescript/src/application-stage.ts rename to samples/pipeline/typescript/src/application-stage.ts diff --git a/packages/pipeline/samples/typescript/src/pipeline-stack.ts b/samples/pipeline/typescript/src/pipeline-stack.ts similarity index 92% rename from packages/pipeline/samples/typescript/src/pipeline-stack.ts rename to samples/pipeline/typescript/src/pipeline-stack.ts index 0630a6ad0..767a57702 100644 --- a/packages/pipeline/samples/typescript/src/pipeline-stack.ts +++ b/samples/pipeline/typescript/src/pipeline-stack.ts @@ -1,7 +1,7 @@ /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ +import { PDKPipeline } from '@aws-prototyping-sdk/pipeline'; import { Stack, StackProps } from 'aws-cdk-lib'; -import { PDKPipeline } from 'aws-prototyping-sdk/pipeline'; import { Construct } from 'constructs'; export class PipelineStack extends Stack { diff --git a/packages/pipeline/samples/typescript/src/pipeline.ts b/samples/pipeline/typescript/src/pipeline.ts similarity index 93% rename from packages/pipeline/samples/typescript/src/pipeline.ts rename to samples/pipeline/typescript/src/pipeline.ts index 2faaf76d6..5794b1296 100644 --- a/packages/pipeline/samples/typescript/src/pipeline.ts +++ b/samples/pipeline/typescript/src/pipeline.ts @@ -1,6 +1,6 @@ /*! Copyright [Amazon.com](http://amazon.com/), Inc. or its affiliates. All Rights Reserved. SPDX-License-Identifier: Apache-2.0 */ -import { PDKNag } from 'aws-prototyping-sdk/pdk-nag'; +import { PDKNag } from '@aws-prototyping-sdk/pdk-nag'; import { ApplicationStage } from './application-stage'; import { PipelineStack } from './pipeline-stack'; diff --git a/packages/pipeline/samples/typescript/test/__snapshots__/pipeline.test.ts.snap b/samples/pipeline/typescript/test/__snapshots__/pipeline.test.ts.snap similarity index 100% rename from packages/pipeline/samples/typescript/test/__snapshots__/pipeline.test.ts.snap rename to samples/pipeline/typescript/test/__snapshots__/pipeline.test.ts.snap diff --git a/packages/pipeline/samples/typescript/test/pipeline.test.ts b/samples/pipeline/typescript/test/pipeline.test.ts similarity index 100% rename from packages/pipeline/samples/typescript/test/pipeline.test.ts rename to samples/pipeline/typescript/test/pipeline.test.ts diff --git a/packages/pipeline/samples/typescript/tsconfig.dev.json b/samples/pipeline/typescript/tsconfig.dev.json similarity index 100% rename from packages/pipeline/samples/typescript/tsconfig.dev.json rename to samples/pipeline/typescript/tsconfig.dev.json diff --git a/packages/pipeline/samples/typescript/tsconfig.json b/samples/pipeline/typescript/tsconfig.json similarity index 100% rename from packages/pipeline/samples/typescript/tsconfig.json rename to samples/pipeline/typescript/tsconfig.json