Fix dependencies

ArmaanT · Dec 24, 2020 · bbebfb7 · bbebfb7
1 parent 762a5b8
commit bbebfb7
Show file tree

Hide file tree

Showing 8 changed files with 920 additions and 853 deletions.
diff --git a/packages/cdkactions-cli/.gitignore b/packages/cdkactions-cli/.gitignore
@@ -35,17 +35,20 @@ jspm_packages/
 .yarn-integrity
 # parcel-bundler cache (https://parceljs.org/)
 .cache
+# jest-junit artifacts
+/test-reports/
+junit.xml
+/coverage
 /lib
 /dist
-/coverage
 !/package.json
 !/.npmignore
 !/LICENSE
 !/.projenrc.js
 !version.json
 !/.versionrc.json
+!/test
 !/tsconfig.json
 !/src
 !/tsconfig.jest.json
-!/test
 !/.eslintrc.json
diff --git a/packages/cdkactions-cli/.npmignore b/packages/cdkactions-cli/.npmignore
@@ -1,6 +1,8 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
 /.projenrc.js
 /.versionrc.json
+/coverage
+/test
 /tsconfig.json
 /src
 dist
@@ -10,8 +12,6 @@ dist
 /.idea
 /.projenrc.js
 /tsconfig.jest.json
-/coverage
-/test
 /.eslintrc.json
 !/lib
 !/lib/**/*.js

diff --git a/packages/cdkactions-cli/package.json b/packages/cdkactions-cli/package.json
@@ -15,33 +15,34 @@
     "no-changes": "(git log --oneline -1 | grep -q \"chore(release):\") && echo \"No changes to release.\"",
     "bump": "yarn run --silent no-changes || standard-version",
     "release": "yarn run --silent no-changes || (yarn run bump && git push --follow-tags origin master)",
+    "test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
+    "test:watch": "jest --watch",
+    "test:update": "jest --updateSnapshot",
     "projen:upgrade": "yarn upgrade -L projen && CI=\"\" yarn projen",
     "compile": "tsc",
     "watch": "tsc -w",
     "build": "yarn compile",
     "package": "rm -fr dist && mkdir -p dist/js && yarn pack && mv *.tgz dist/js/",
-    "test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
-    "test:watch": "jest --watch",
-    "test:update": "jest --updateSnapshot",
-    "eslint": "eslint --ext .ts --fix src test"
+    "eslint": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test"
   },
   "author": {
     "name": "Armaan Tobaccowalla",
     "organization": false
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.6",
+    "@types/fs-extra": "^8.1.0",
     "@types/jest": "^26.0.7",
-    "@types/node": "^12.0.0",
+    "@types/node": "^10.17.0",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "eslint": "^7.16.0",
     "eslint-import-resolver-node": "^0.3.4",
     "eslint-import-resolver-typescript": "^2.3.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^26.4.2",
+    "jest-junit": "^12",
     "json-schema": "^0.2.5",
-    "projen": "^0.3.141",
+    "projen": "^0.3.178",
     "standard-version": "^9.0.0",
     "ts-jest": "^26.1.0",
     "typescript": "^3.9.5"
@@ -50,7 +51,7 @@
   "dependencies": {
     "cdkactions": "^0.0.0",
     "constructs": "^5.0.0",
-    "fs-extra": "^9.0.1",
+    "fs-extra": "^8.1.0",
     "sscaff": "^1.2.0",
     "yaml": "^1.10.0",
     "yargs": "^16.2.0"
@@ -63,7 +64,7 @@
     "github"
   ],
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 10.17.0"
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -87,6 +88,16 @@
       "command": "yarn run release",
       "category": 2
     },
+    "test": {
+      "desc": "Run tests",
+      "command": "yarn run test",
+      "category": 1
+    },
+    "test:watch": {
+      "desc": "Run jest in watch mode",
+      "command": "yarn run test:watch",
+      "category": 1
+    },
     "projen:upgrade": {
       "desc": "upgrades projen to the latest version",
       "command": "yarn run projen:upgrade",
@@ -112,42 +123,42 @@
       "command": "yarn run package",
       "category": 2
     },
-    "test": {
-      "desc": "Run tests",
-      "command": "yarn run test",
-      "category": 1
-    },
-    "test:watch": {
-      "desc": "Run jest in watch mode",
-      "command": "yarn run test:watch",
-      "category": 1
-    },
     "eslint": {
       "desc": "Runs eslint against the codebase",
       "command": "yarn run eslint",
       "category": 1
     }
   },
   "version": "0.0.0",
-  "types": "lib/index.d.ts",
   "jest": {
     "clearMocks": true,
     "collectCoverage": true,
+    "coverageDirectory": "coverage",
     "coveragePathIgnorePatterns": [
       "/node_modules/"
     ],
     "testPathIgnorePatterns": [
       "/node_modules/"
     ],
-    "preset": "ts-jest",
     "testMatch": [
       "**/__tests__/**/*.ts?(x)",
       "**/?(*.)+(spec|test).ts?(x)"
     ],
+    "reporters": [
+      "default",
+      [
+        "jest-junit",
+        {
+          "outputDirectory": "test-reports"
+        }
+      ]
+    ],
+    "preset": "ts-jest",
     "globals": {
       "ts-jest": {
         "tsconfig": "tsconfig.jest.json"
       }
     }
-  }
+  },
+  "types": "lib/index.d.ts"
 }
diff --git a/packages/cdkactions/.gitignore b/packages/cdkactions/.gitignore
@@ -35,9 +35,12 @@ jspm_packages/
 .yarn-integrity
 # parcel-bundler cache (https://parceljs.org/)
 .cache
+# jest-junit artifacts
+/test-reports/
+junit.xml
+/coverage
 /lib
 /dist
-/coverage
 .jsii
 tsconfig.json
 !/package.json
@@ -46,8 +49,8 @@ tsconfig.json
 !/.projenrc.js
 !version.json
 !/.versionrc.json
+!/test
 !/src
 !/tsconfig.jest.json
-!/test
 !/.eslintrc.json
 !/API.md
diff --git a/packages/cdkactions/.npmignore b/packages/cdkactions/.npmignore
@@ -1,6 +1,8 @@
 # ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
 /.projenrc.js
 /.versionrc.json
+/coverage
+/test
 /src
 dist
 /tsconfig.json
@@ -9,8 +11,6 @@ dist
 /.idea
 /.projenrc.js
 /tsconfig.jest.json
-/coverage
-/test
 /.eslintrc.json
 !/lib
 !/lib/**/*.js

diff --git a/packages/cdkactions/package.json b/packages/cdkactions/package.json
@@ -13,15 +13,15 @@
     "no-changes": "(git log --oneline -1 | grep -q \"chore(release):\") && echo \"No changes to release.\"",
     "bump": "yarn run --silent no-changes || standard-version",
     "release": "yarn run --silent no-changes || (yarn run bump && git push --follow-tags origin master)",
+    "test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
+    "test:watch": "jest --watch",
+    "test:update": "jest --updateSnapshot",
     "projen:upgrade": "yarn upgrade -L projen && CI=\"\" yarn projen",
     "compile": "jsii --silence-warnings=reserved-word --no-fix-peer-dependencies && jsii-docgen",
     "watch": "jsii -w --silence-warnings=reserved-word --no-fix-peer-dependencies",
     "build": "yarn compile",
     "package": "jsii-pacmak",
-    "test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
-    "test:watch": "jest --watch",
-    "test:update": "jest --updateSnapshot",
-    "eslint": "eslint --ext .ts --fix src test",
+    "eslint": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test",
     "compat": "npx 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)",
     "docgen": "jsii-docgen"
   },
@@ -33,7 +33,7 @@
   "devDependencies": {
     "@types/jest": "^26.0.7",
     "@types/js-yaml": "^3.12.5",
-    "@types/node": "^12.0.0",
+    "@types/node": "^10.17.0",
     "@typescript-eslint/eslint-plugin": "^4.3.0",
     "@typescript-eslint/parser": "^4.3.0",
     "constructs": "^5.0.0",
@@ -42,12 +42,13 @@
     "eslint-import-resolver-typescript": "^2.3.0",
     "eslint-plugin-import": "^2.22.1",
     "jest": "^26.4.2",
+    "jest-junit": "^12",
     "jsii": "^1.11.0",
     "jsii-diff": "^1.11.0",
     "jsii-docgen": "^1.3.2",
     "jsii-pacmak": "^1.11.0",
     "json-schema": "^0.2.5",
-    "projen": "^0.3.141",
+    "projen": "^0.3.178",
     "standard-version": "^9.0.0",
     "ts-jest": "^26.1.0",
     "typescript": "^3.9.5"
@@ -70,7 +71,7 @@
     "github"
   ],
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 10.17.0"
   },
   "main": "lib/index.js",
   "license": "Apache-2.0",
@@ -94,6 +95,16 @@
       "command": "yarn run release",
       "category": 2
     },
+    "test": {
+      "desc": "Run tests",
+      "command": "yarn run test",
+      "category": 1
+    },
+    "test:watch": {
+      "desc": "Run jest in watch mode",
+      "command": "yarn run test:watch",
+      "category": 1
+    },
     "projen:upgrade": {
       "desc": "upgrades projen to the latest version",
       "command": "yarn run projen:upgrade",
@@ -119,16 +130,6 @@
       "command": "yarn run package",
       "category": 2
     },
-    "test": {
-      "desc": "Run tests",
-      "command": "yarn run test",
-      "category": 1
-    },
-    "test:watch": {
-      "desc": "Run jest in watch mode",
-      "command": "yarn run test:watch",
-      "category": 1
-    },
     "eslint": {
       "desc": "Runs eslint against the codebase",
       "command": "yarn run eslint",
@@ -146,27 +147,37 @@
     }
   },
   "version": "0.0.0",
-  "types": "lib/index.d.ts",
   "jest": {
     "clearMocks": true,
     "collectCoverage": true,
+    "coverageDirectory": "coverage",
     "coveragePathIgnorePatterns": [
       "/node_modules/"
     ],
     "testPathIgnorePatterns": [
       "/node_modules/"
     ],
-    "preset": "ts-jest",
     "testMatch": [
       "**/__tests__/**/*.ts?(x)",
       "**/?(*.)+(spec|test).ts?(x)"
     ],
+    "reporters": [
+      "default",
+      [
+        "jest-junit",
+        {
+          "outputDirectory": "test-reports"
+        }
+      ]
+    ],
+    "preset": "ts-jest",
     "globals": {
       "ts-jest": {
         "tsconfig": "tsconfig.jest.json"
       }
     }
   },
+  "types": "lib/index.d.ts",
   "stability": "stable",
   "jsii": {
     "outdir": "dist",

diff --git a/packages/projen-common.js b/packages/projen-common.js
@@ -1,5 +1,5 @@
 exports.options = {
-    minNodeVersion: '12.0.0',
+    minNodeVersion: '10.17.0',
     repository: "https://github.com/ArmaanT/cdkactions.git",
     authorName: "Armaan Tobaccowalla",
     authorAddress: "[email protected]",