Skip to content

Commit bbebfb7

Browse files
ArmaanTArmaanT
committed
Fix dependencies
1 parent 762a5b8 commit bbebfb7

8 files changed

Lines changed: 920 additions & 853 deletions

File tree

‎packages/cdkactions-cli/.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,20 @@ jspm_packages/
3535
.yarn-integrity
3636
# parcel-bundler cache (https://parceljs.org/)
3737
.cache
38+
# jest-junit artifacts
39+
/test-reports/
40+
junit.xml
41+
/coverage
3842
/lib
3943
/dist
40-
/coverage
4144
!/package.json
4245
!/.npmignore
4346
!/LICENSE
4447
!/.projenrc.js
4548
!version.json
4649
!/.versionrc.json
50+
!/test
4751
!/tsconfig.json
4852
!/src
4953
!/tsconfig.jest.json
50-
!/test
5154
!/.eslintrc.json

‎packages/cdkactions-cli/.npmignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
22
/.projenrc.js
33
/.versionrc.json
4+
/coverage
5+
/test
46
/tsconfig.json
57
/src
68
dist
@@ -10,8 +12,6 @@ dist
1012
/.idea
1113
/.projenrc.js
1214
/tsconfig.jest.json
13-
/coverage
14-
/test
1515
/.eslintrc.json
1616
!/lib
1717
!/lib/**/*.js

‎packages/cdkactions-cli/package.json‎

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,34 @@
1515
"no-changes": "(git log --oneline -1 | grep -q \"chore(release):\") && echo \"No changes to release.\"",
1616
"bump": "yarn run --silent no-changes || standard-version",
1717
"release": "yarn run --silent no-changes || (yarn run bump && git push --follow-tags origin master)",
18+
"test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
19+
"test:watch": "jest --watch",
20+
"test:update": "jest --updateSnapshot",
1821
"projen:upgrade": "yarn upgrade -L projen && CI=\"\" yarn projen",
1922
"compile": "tsc",
2023
"watch": "tsc -w",
2124
"build": "yarn compile",
2225
"package": "rm -fr dist && mkdir -p dist/js && yarn pack && mv *.tgz dist/js/",
23-
"test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
24-
"test:watch": "jest --watch",
25-
"test:update": "jest --updateSnapshot",
26-
"eslint": "eslint --ext .ts --fix src test"
26+
"eslint": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test"
2727
},
2828
"author": {
2929
"name": "Armaan Tobaccowalla",
3030
"organization": false
3131
},
3232
"devDependencies": {
33-
"@types/fs-extra": "^9.0.6",
33+
"@types/fs-extra": "^8.1.0",
3434
"@types/jest": "^26.0.7",
35-
"@types/node": "^12.0.0",
35+
"@types/node": "^10.17.0",
3636
"@typescript-eslint/eslint-plugin": "^4.3.0",
3737
"@typescript-eslint/parser": "^4.3.0",
3838
"eslint": "^7.16.0",
3939
"eslint-import-resolver-node": "^0.3.4",
4040
"eslint-import-resolver-typescript": "^2.3.0",
4141
"eslint-plugin-import": "^2.22.1",
4242
"jest": "^26.4.2",
43+
"jest-junit": "^12",
4344
"json-schema": "^0.2.5",
44-
"projen": "^0.3.141",
45+
"projen": "^0.3.178",
4546
"standard-version": "^9.0.0",
4647
"ts-jest": "^26.1.0",
4748
"typescript": "^3.9.5"
@@ -50,7 +51,7 @@
5051
"dependencies": {
5152
"cdkactions": "^0.0.0",
5253
"constructs": "^5.0.0",
53-
"fs-extra": "^9.0.1",
54+
"fs-extra": "^8.1.0",
5455
"sscaff": "^1.2.0",
5556
"yaml": "^1.10.0",
5657
"yargs": "^16.2.0"
@@ -63,7 +64,7 @@
6364
"github"
6465
],
6566
"engines": {
66-
"node": ">= 12.0.0"
67+
"node": ">= 10.17.0"
6768
},
6869
"main": "lib/index.js",
6970
"license": "Apache-2.0",
@@ -87,6 +88,16 @@
8788
"command": "yarn run release",
8889
"category": 2
8990
},
91+
"test": {
92+
"desc": "Run tests",
93+
"command": "yarn run test",
94+
"category": 1
95+
},
96+
"test:watch": {
97+
"desc": "Run jest in watch mode",
98+
"command": "yarn run test:watch",
99+
"category": 1
100+
},
90101
"projen:upgrade": {
91102
"desc": "upgrades projen to the latest version",
92103
"command": "yarn run projen:upgrade",
@@ -112,42 +123,42 @@
112123
"command": "yarn run package",
113124
"category": 2
114125
},
115-
"test": {
116-
"desc": "Run tests",
117-
"command": "yarn run test",
118-
"category": 1
119-
},
120-
"test:watch": {
121-
"desc": "Run jest in watch mode",
122-
"command": "yarn run test:watch",
123-
"category": 1
124-
},
125126
"eslint": {
126127
"desc": "Runs eslint against the codebase",
127128
"command": "yarn run eslint",
128129
"category": 1
129130
}
130131
},
131132
"version": "0.0.0",
132-
"types": "lib/index.d.ts",
133133
"jest": {
134134
"clearMocks": true,
135135
"collectCoverage": true,
136+
"coverageDirectory": "coverage",
136137
"coveragePathIgnorePatterns": [
137138
"/node_modules/"
138139
],
139140
"testPathIgnorePatterns": [
140141
"/node_modules/"
141142
],
142-
"preset": "ts-jest",
143143
"testMatch": [
144144
"**/__tests__/**/*.ts?(x)",
145145
"**/?(*.)+(spec|test).ts?(x)"
146146
],
147+
"reporters": [
148+
"default",
149+
[
150+
"jest-junit",
151+
{
152+
"outputDirectory": "test-reports"
153+
}
154+
]
155+
],
156+
"preset": "ts-jest",
147157
"globals": {
148158
"ts-jest": {
149159
"tsconfig": "tsconfig.jest.json"
150160
}
151161
}
152-
}
162+
},
163+
"types": "lib/index.d.ts"
153164
}

‎packages/cdkactions/.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,12 @@ jspm_packages/
3535
.yarn-integrity
3636
# parcel-bundler cache (https://parceljs.org/)
3737
.cache
38+
# jest-junit artifacts
39+
/test-reports/
40+
junit.xml
41+
/coverage
3842
/lib
3943
/dist
40-
/coverage
4144
.jsii
4245
tsconfig.json
4346
!/package.json
@@ -46,8 +49,8 @@ tsconfig.json
4649
!/.projenrc.js
4750
!version.json
4851
!/.versionrc.json
52+
!/test
4953
!/src
5054
!/tsconfig.jest.json
51-
!/test
5255
!/.eslintrc.json
5356
!/API.md

‎packages/cdkactions/.npmignore‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# ~~ Generated by projen. To modify, edit .projenrc.js and run "npx projen".
22
/.projenrc.js
33
/.versionrc.json
4+
/coverage
5+
/test
46
/src
57
dist
68
/tsconfig.json
@@ -9,8 +11,6 @@ dist
911
/.idea
1012
/.projenrc.js
1113
/tsconfig.jest.json
12-
/coverage
13-
/test
1414
/.eslintrc.json
1515
!/lib
1616
!/lib/**/*.js

‎packages/cdkactions/package.json‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"no-changes": "(git log --oneline -1 | grep -q \"chore(release):\") && echo \"No changes to release.\"",
1414
"bump": "yarn run --silent no-changes || standard-version",
1515
"release": "yarn run --silent no-changes || (yarn run bump && git push --follow-tags origin master)",
16+
"test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
17+
"test:watch": "jest --watch",
18+
"test:update": "jest --updateSnapshot",
1619
"projen:upgrade": "yarn upgrade -L projen && CI=\"\" yarn projen",
1720
"compile": "jsii --silence-warnings=reserved-word --no-fix-peer-dependencies && jsii-docgen",
1821
"watch": "jsii -w --silence-warnings=reserved-word --no-fix-peer-dependencies",
1922
"build": "yarn compile",
2023
"package": "jsii-pacmak",
21-
"test": "rm -fr lib/ && jest --passWithNoTests && yarn run eslint && yarn compile",
22-
"test:watch": "jest --watch",
23-
"test:update": "jest --updateSnapshot",
24-
"eslint": "eslint --ext .ts --fix src test",
24+
"eslint": "eslint --ext .ts,.tsx --fix --no-error-on-unmatched-pattern src test",
2525
"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)",
2626
"docgen": "jsii-docgen"
2727
},
@@ -33,7 +33,7 @@
3333
"devDependencies": {
3434
"@types/jest": "^26.0.7",
3535
"@types/js-yaml": "^3.12.5",
36-
"@types/node": "^12.0.0",
36+
"@types/node": "^10.17.0",
3737
"@typescript-eslint/eslint-plugin": "^4.3.0",
3838
"@typescript-eslint/parser": "^4.3.0",
3939
"constructs": "^5.0.0",
@@ -42,12 +42,13 @@
4242
"eslint-import-resolver-typescript": "^2.3.0",
4343
"eslint-plugin-import": "^2.22.1",
4444
"jest": "^26.4.2",
45+
"jest-junit": "^12",
4546
"jsii": "^1.11.0",
4647
"jsii-diff": "^1.11.0",
4748
"jsii-docgen": "^1.3.2",
4849
"jsii-pacmak": "^1.11.0",
4950
"json-schema": "^0.2.5",
50-
"projen": "^0.3.141",
51+
"projen": "^0.3.178",
5152
"standard-version": "^9.0.0",
5253
"ts-jest": "^26.1.0",
5354
"typescript": "^3.9.5"
@@ -70,7 +71,7 @@
7071
"github"
7172
],
7273
"engines": {
73-
"node": ">= 12.0.0"
74+
"node": ">= 10.17.0"
7475
},
7576
"main": "lib/index.js",
7677
"license": "Apache-2.0",
@@ -94,6 +95,16 @@
9495
"command": "yarn run release",
9596
"category": 2
9697
},
98+
"test": {
99+
"desc": "Run tests",
100+
"command": "yarn run test",
101+
"category": 1
102+
},
103+
"test:watch": {
104+
"desc": "Run jest in watch mode",
105+
"command": "yarn run test:watch",
106+
"category": 1
107+
},
97108
"projen:upgrade": {
98109
"desc": "upgrades projen to the latest version",
99110
"command": "yarn run projen:upgrade",
@@ -119,16 +130,6 @@
119130
"command": "yarn run package",
120131
"category": 2
121132
},
122-
"test": {
123-
"desc": "Run tests",
124-
"command": "yarn run test",
125-
"category": 1
126-
},
127-
"test:watch": {
128-
"desc": "Run jest in watch mode",
129-
"command": "yarn run test:watch",
130-
"category": 1
131-
},
132133
"eslint": {
133134
"desc": "Runs eslint against the codebase",
134135
"command": "yarn run eslint",
@@ -146,27 +147,37 @@
146147
}
147148
},
148149
"version": "0.0.0",
149-
"types": "lib/index.d.ts",
150150
"jest": {
151151
"clearMocks": true,
152152
"collectCoverage": true,
153+
"coverageDirectory": "coverage",
153154
"coveragePathIgnorePatterns": [
154155
"/node_modules/"
155156
],
156157
"testPathIgnorePatterns": [
157158
"/node_modules/"
158159
],
159-
"preset": "ts-jest",
160160
"testMatch": [
161161
"**/__tests__/**/*.ts?(x)",
162162
"**/?(*.)+(spec|test).ts?(x)"
163163
],
164+
"reporters": [
165+
"default",
166+
[
167+
"jest-junit",
168+
{
169+
"outputDirectory": "test-reports"
170+
}
171+
]
172+
],
173+
"preset": "ts-jest",
164174
"globals": {
165175
"ts-jest": {
166176
"tsconfig": "tsconfig.jest.json"
167177
}
168178
}
169179
},
180+
"types": "lib/index.d.ts",
170181
"stability": "stable",
171182
"jsii": {
172183
"outdir": "dist",

‎packages/projen-common.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports.options = {
2-
minNodeVersion: '12.0.0',
2+
minNodeVersion: '10.17.0',
33
repository: "https://github.com/ArmaanT/cdkactions.git",
44
authorName: "Armaan Tobaccowalla",
55
authorAddress: "armaan@tobaccowalla.com",

0 commit comments

Comments
 (0)