Bump deps (#10)

* Bump deps * Update CI * Update changelog
ArmaanT · Jan 20, 2021 · 087a78d · 087a78d
1 parent e32ae89
commit 087a78d
Show file tree

Hide file tree

Showing 31 changed files with 1,434 additions and 723 deletions.
diff --git a/.github/cdk/main.ts b/.github/cdk/main.ts
@@ -1,6 +1,5 @@
-import * as dedent from 'dedent-js';
 import { Construct } from "constructs";
-import { App, Stack, Workflow, Job } from "cdkactions";
+import { App, Stack, Workflow, Job, CheckoutJob } from "cdkactions";
 
 export class JSIIReleaseStack extends Stack {
   constructor(scope: Construct, name: string) {
@@ -12,21 +11,23 @@ export class JSIIReleaseStack extends Stack {
       on: ["pullRequest", "push"]
     });
 
-    new Job(build, 'build', {
+    new CheckoutJob(build, 'build', {
       runsOn: 'ubuntu-latest',
       container: {
         image: 'jsii/superchain'
       },
       steps: [
-        { uses: 'actions/checkout@v2' },
         {
           name: 'Install dependencies',
-          run: 'yarn install'
+          run: 'yarn install --frozen-lockfile'
+        },
+        {
+          name: 'Set version',
+          run: 'tools/align-version.sh'
         },
         {
           name: 'Compile',
-          run: dedent`tools/align-version.sh
-          yarn build`
+          run: 'yarn build'
         },
         {
           name: 'Unit Tests',
@@ -54,23 +55,25 @@ export class JSIIReleaseStack extends Stack {
       on: { push: { branches: ['master'] } }
     });
 
-    new Job(release, 'build_artifact', {
+    new CheckoutJob(release, 'build_artifact', {
       name: 'Build and upload artifact',
       if: "github.repository == 'ArmaanT/cdkactions'",
       runsOn: 'ubuntu-latest',
       container: {
         image: 'jsii/superchain'
       },
       steps: [
-        { uses: 'actions/checkout@v2' },
         {
           name: 'Install dependencies',
-          run: 'yarn install'
+          run: 'yarn install --frozen-lockfile'
+        },
+        {
+          name: 'Set version',
+          run: 'tools/align-version.sh'
         },
         {
           name: 'Compile',
-          run: dedent`tools/align-version.sh
-          yarn build`
+          run: 'yarn build'
         },
         {
           name: 'Unit Tests',

diff --git a/.github/cdk/package.json b/.github/cdk/package.json
@@ -13,7 +13,7 @@
     "upgrade-cdk": "yarn upgrade cdkactions@latest cdkactions-cli@latest"
   },
   "dependencies": {
-    "cdkactions": "^0.0.12",
+    "cdkactions": "^0.2.2",
     "constructs": "^3.2.9"
   },
   "devDependencies": {

diff --git a/.github/cdk/yarn.lock b/.github/cdk/yarn.lock
@@ -26,6 +26,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 at-least-node@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
@@ -43,14 +48,22 @@ cdkactions-cli@^0.0.12:
     yaml "^1.10.0"
     yargs "^16.1.0"
 
-[email protected], cdkactions@^0.0.12:
+[email protected]:
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/cdkactions/-/cdkactions-0.0.12.tgz#cfa8c9b6727bb397ca424b988b650a225d58a220"
   integrity sha512-V5WMTFAO3UUzJlYawm1SVXr/EGo/57MI8SZT9snf91zlU0Rb8K+zF3Ac4IBjghasLAsftWBd5V/GTx7+LfNEQw==
   dependencies:
     dedent-js "^1.0.1"
     js-yaml "^3.14.0"
 
+cdkactions@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/cdkactions/-/cdkactions-0.2.2.tgz#ef3e134e296385fe6b9503fd54b6336ccf554263"
+  integrity sha512-Ah8WWiGGslbDTtUBBUVk03V9oz88lweeKucogNM3VfGzXvfBtXef7K7eENRI1DZB/rCti7/jXwJhzwFz/n+QgQ==
+  dependencies:
+    js-yaml "^4.0.0"
+    ts-dedent "^2.0.0"
+
 cliui@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.3.tgz#ef180f26c8d9bff3927ee52428bfec2090427981"
@@ -130,6 +143,13 @@ js-yaml@^3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
+  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
+  dependencies:
+    argparse "^2.0.1"
+
 jsonfile@^6.0.1:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
@@ -170,6 +190,11 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+ts-dedent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.0.0.tgz#47c5eb23d9096f3237cc413bc82d387d36dbe690"
+  integrity sha512-DfxKjSFQfw9+uf7N9Cy8Ebx9fv5fquK4hZ6SD3Rzr+1jKP6AVA6H8+B5457ZpUs0JKsGpGqIevbpZ9DMQJDp1A==
+
 typescript@^4.0.5:
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"

diff --git a/.github/workflows/cdkactions_build.yaml b/.github/workflows/cdkactions_build.yaml
@@ -12,16 +12,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
+      - name: Set version
+        run: tools/align-version.sh
       - name: Compile
-        run: |-
-          tools/align-version.sh
-          yarn build
+        run: yarn build
       - name: Unit Tests
         run: yarn test
       - name: Code Coverage
         run: yarn codecov
       - name: Create Bundle
         run: yarn package
       - name: Integration Tests
-        run: 'echo TODO: add these'
+        run: "echo TODO: add these"
diff --git a/.github/workflows/cdkactions_release.yaml b/.github/workflows/cdkactions_release.yaml
@@ -15,19 +15,19 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
+      - name: Set version
+        run: tools/align-version.sh
       - name: Compile
-        run: |-
-          tools/align-version.sh
-          yarn build
+        run: yarn build
       - name: Unit Tests
         run: yarn test
       - name: Code Coverage
         run: yarn codecov
       - name: Create Bundle
         run: yarn package
       - name: Integration Tests
-        run: 'echo TODO: add these'
+        run: "echo TODO: add these"
       - name: Upload artifact
         uses: actions/upload-artifact@v1
         with:

diff --git a/.github/workflows/cdkactions_validate.yaml b/.github/workflows/cdkactions_validate.yaml
@@ -18,7 +18,7 @@ jobs:
           git --no-pager diff ../workflows
           git diff-index --quiet HEAD -- ../workflows
       - name: Push updated manifests
-        if: 'false'
+        if: "false"
         run: |-
           cd .github/workflows
           git config user.name github-actions

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.3 (2021-01-20)
+
+* Small modification to repo CI
+* Update dependencies
+
 ## 0.2.2 (2021-01-11)
 
 * Fix the type of `with` to allow number and boolean values

diff --git a/packages/cdkactions-cli/.eslintrc.json b/packages/cdkactions-cli/.eslintrc.json
@@ -12,7 +12,7 @@
   "parserOptions": {
     "ecmaVersion": 2018,
     "sourceType": "module",
-    "project": "./tsconfig.jest.json"
+    "project": "./tsconfig.eslint.json"
   },
   "extends": [
     "plugin:import/typescript"
@@ -27,12 +27,13 @@
     "import/resolver": {
       "node": {},
       "typescript": {
-        "directory": "./tsconfig.json"
+        "project": "./tsconfig.eslint.json"
       }
     }
   },
   "ignorePatterns": [
     "*.js",
+    "!.projenrc.js",
     "*.d.ts",
     "node_modules/",
     "*.generated.ts",
@@ -123,8 +124,8 @@
       "error",
       {
         "devDependencies": [
-          "**/build-tools/**",
-          "**/test/**"
+          "**/test/**",
+          "**/build-tools/**"
         ],
         "optionalDependencies": false,
         "peerDependencies": true
@@ -214,5 +215,16 @@
         ]
       }
     ]
-  }
-}
+  },
+  "overrides": [
+    {
+      "files": [
+        ".projenrc.js"
+      ],
+      "rules": {
+        "@typescript-eslint/no-require-imports": "off",
+        "import/no-extraneous-dependencies": "off"
+      }
+    }
+  ]
+}
diff --git a/packages/cdkactions-cli/.gitignore b/packages/cdkactions-cli/.gitignore
@@ -1,54 +1,43 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
-# Logs
-logs
+*.lcov
 *.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-# Runtime data
-pids
 *.pid
-*.seed
 *.pid.lock
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-# Coverage directory used by tools like istanbul
-coverage
-*.lcov
-# nyc test coverage
-.nyc_output
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-# Dependency directories
-node_modules/
-jspm_packages/
-# TypeScript cache
+*.seed
+*.tgz
 *.tsbuildinfo
-# Optional eslint cache
+.cache
 .eslintcache
-# Output of 'npm pack'
-*.tgz
-# Yarn Integrity file
+.nyc_output
 .yarn-integrity
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-# jest-junit artifacts
-/test-reports/
-junit.xml
 /coverage
-/lib
 /dist
-!/package.json
+/lib
+/test-reports/
+build/Release
+coverage
+jspm_packages/
+junit.xml
+lerna-debug.log*
+lib-cov
+logs
+node_modules/
+npm-debug.log*
+pids
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+yarn-debug.log*
+yarn-error.log*
+!/.eslintrc.json
 !/.npmignore
-!/LICENSE
+!/.projen/deps.json
+!/.projen/tasks.json
 !/.projenrc.js
-!version.json
 !/.versionrc.json
-!/test
-!/tsconfig.json
+!/LICENSE
+!/package.json
 !/src
+!/test
+!/tsconfig.eslint.json
 !/tsconfig.jest.json
-!/.eslintrc.json
+!/tsconfig.json
+!version.json
diff --git a/packages/cdkactions-cli/.npmignore b/packages/cdkactions-cli/.npmignore
@@ -1,18 +1,20 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
+/.eslintrc.json
+/.github
+/.idea
+/.projen
 /.projenrc.js
 /.versionrc.json
+/.vscode
 /coverage
+/src
 /test
+/test-reports/
+/tsconfig.eslint.json
+/tsconfig.jest.json
 /tsconfig.json
-/src
 dist
-/tsconfig.json
-/.github
-/.vscode
-/.idea
-/.projenrc.js
-/tsconfig.jest.json
-/.eslintrc.json
+junit.xml
 !/lib
+!/lib/**/*.d.ts
 !/lib/**/*.js
-!/lib/**/*.d.ts