From 535e96180dba672cb4ff8abfe6c0df69d70f6b6a Mon Sep 17 00:00:00 2001 From: Matthew Bonig Date: Sat, 17 Apr 2021 12:52:14 -0600 Subject: [PATCH] moving to peer/dev deps on the cdk --- .projen/deps.json | 92 ++++++++++++++++++++++---------------------- .projenrc.js | 3 +- .versionrc.json | 3 +- package.json | 20 +++++----- tsconfig.eslint.json | 3 +- tsconfig.jest.json | 3 +- yarn.lock | 8 ++-- 7 files changed, 68 insertions(+), 64 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index ec6b963..74afcb0 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -5,6 +5,51 @@ "version": "1.98.0", "type": "build" }, + { + "name": "@aws-cdk/aws-autoscaling", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-ec2", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-events-targets", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-events", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-iam", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-lambda-nodejs", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-lambda", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/aws-rds", + "version": "1.98.0", + "type": "build" + }, + { + "name": "@aws-cdk/core", + "version": "1.98.0", + "type": "build" + }, { "name": "@types/jest", "type": "build" @@ -73,7 +118,7 @@ }, { "name": "projen", - "version": "^0.17.33", + "version": "^0.17.44", "type": "build" }, { @@ -147,51 +192,6 @@ "version": "^3.2.27", "type": "peer" }, - { - "name": "@aws-cdk/aws-autoscaling", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-ec2", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-events-targets", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-events", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-iam", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-lambda-nodejs", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-lambda", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/aws-rds", - "version": "1.98.0", - "type": "runtime" - }, - { - "name": "@aws-cdk/core", - "version": "1.98.0", - "type": "runtime" - }, { "name": "cdk-iam-floyd", "type": "runtime" diff --git a/.projenrc.js b/.projenrc.js index 88dc143..35ec1e5 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -3,13 +3,14 @@ const { AwsCdkConstructLibrary } = require('projen'); const dependencies = [ 'cdk-iam-floyd', ]; -const cdkVersion = process.env.CDK_VERSION || '1.93.0'; +const cdkVersion = '1.98.0'; const project = new AwsCdkConstructLibrary({ name: '@matthewbonig/nightynight', description: 'A CDK construct that will automatically stop a running EC2 instance at a given time.', authorAddress: 'matthew.bonig@gmail.com', authorName: 'Matthew Bonig', cdkVersion: cdkVersion, + cdkDependenciesAsDeps: false, repository: 'https://github.com/mbonig/nightynight', defaultReleaseBranch: 'master', deps: dependencies, diff --git a/.versionrc.json b/.versionrc.json index 41c43f8..45e1d60 100644 --- a/.versionrc.json +++ b/.versionrc.json @@ -14,5 +14,6 @@ "commitAll": true, "scripts": { "postbump": "npx projen && git add ." - } + }, + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } diff --git a/package.json b/package.json index 3331152..e78f4ce 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,15 @@ }, "devDependencies": { "@aws-cdk/assert": "1.98.0", + "@aws-cdk/aws-autoscaling": "1.98.0", + "@aws-cdk/aws-ec2": "1.98.0", + "@aws-cdk/aws-events": "1.98.0", + "@aws-cdk/aws-events-targets": "1.98.0", + "@aws-cdk/aws-iam": "1.98.0", + "@aws-cdk/aws-lambda": "1.98.0", + "@aws-cdk/aws-lambda-nodejs": "1.98.0", + "@aws-cdk/aws-rds": "1.98.0", + "@aws-cdk/core": "1.98.0", "@types/jest": "^26.0.7", "@types/node": "^10.17.0", "@typescript-eslint/eslint-plugin": "^4.3.0", @@ -47,7 +56,7 @@ "jsii-docgen": "^1.3.2", "jsii-pacmak": "^1.11.0", "json-schema": "^0.2.5", - "projen": "^0.17.33", + "projen": "^0.17.44", "standard-version": "^9", "ts-jest": "^26.1.0", "typescript": "^3.9.5", @@ -67,15 +76,6 @@ "constructs": "^3.2.27" }, "dependencies": { - "@aws-cdk/aws-autoscaling": "1.98.0", - "@aws-cdk/aws-ec2": "1.98.0", - "@aws-cdk/aws-events": "1.98.0", - "@aws-cdk/aws-events-targets": "1.98.0", - "@aws-cdk/aws-iam": "1.98.0", - "@aws-cdk/aws-lambda": "1.98.0", - "@aws-cdk/aws-lambda-nodejs": "1.98.0", - "@aws-cdk/aws-rds": "1.98.0", - "@aws-cdk/core": "1.98.0", "cdk-iam-floyd": "^0.113.0" }, "bundledDependencies": [], diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json index a22596a..06833d1 100644 --- a/tsconfig.eslint.json +++ b/tsconfig.eslint.json @@ -30,5 +30,6 @@ ], "exclude": [ "node_modules" - ] + ], + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } diff --git a/tsconfig.jest.json b/tsconfig.jest.json index a22596a..06833d1 100644 --- a/tsconfig.jest.json +++ b/tsconfig.jest.json @@ -30,5 +30,6 @@ ], "exclude": [ "node_modules" - ] + ], + "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"npx projen\"." } diff --git a/yarn.lock b/yarn.lock index c9e775d..a6b7a21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5422,10 +5422,10 @@ progress@^2.0.0: resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== -projen@^0.17.33: - version "0.17.33" - resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.33.tgz#4229dd758f9a60adf2d254d66758c9c29bc5afbd" - integrity sha512-s1EZyVTjECow0/qNl6tY/Zf8TfiwkurUPWT4y0/URCxfsml0HE66b+mc1rcHVyKMMUMm/Y9sQZFnUv1xs2rqrw== +projen@^0.17.44: + version "0.17.44" + resolved "https://registry.yarnpkg.com/projen/-/projen-0.17.44.tgz#b1917ac8a5116d4a59dbfbf3b787a82530dc02b4" + integrity sha512-8nFtkzRF4rPzZXVcSEbNxbz7H4fVfqe9dKN7tCx1bVeIbNbCosNAhpXOUfDyeqZs8pHMN9wfxLf7uAPHdU7kRw== dependencies: "@iarna/toml" "^2.2.5" chalk "^4.1.0"