Skip to content

Commit

Permalink
Updates packages and create-app templates with dependency bumps and f…
Browse files Browse the repository at this point in the history
…ixes linting/typescript issues
  • Loading branch information
dtoakley committed Jan 6, 2022
1 parent 944cdc0 commit 8fd171e
Show file tree
Hide file tree
Showing 58 changed files with 6,355 additions and 7,590 deletions.
15 changes: 15 additions & 0 deletions .changeset/grumpy-rockets-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
'@cloud-carbon-footprint/api': patch
'@cloud-carbon-footprint/app': patch
'@cloud-carbon-footprint/aws': patch
'@cloud-carbon-footprint/azure': patch
'@cloud-carbon-footprint/cli': patch
'@cloud-carbon-footprint/client': patch
'@cloud-carbon-footprint/common': patch
'@cloud-carbon-footprint/core': patch
'@cloud-carbon-footprint/create-app': patch
'@cloud-carbon-footprint/gcp': patch
'@cloud-carbon-footprint/integration-tests': patch
---

Updates a number of packages and fixes linting, typescript and dependency issues
4 changes: 3 additions & 1 deletion .talismanrc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ fileignoreconfig:
- filename: packages/aws/src/lib/CostAndUsageTypes.ts
checksum: c4c46cb8727ec9c567cbeaa0af0ede1b51607db610112927fbb6d68f8aade34b
- filename: packages/azure/package.json
checksum: 792277472de01c37a251fe6d1b2caca123c2aaeeb86fdc3a6d462cc3e02c0bf0
checksum: 5059b9e6c08f6482b208ff4a5c3189873868a82cabdd4a089d7efe64eafd004a
- filename: packages/azure/src/__tests__/ConsumptionManagement.test.ts
checksum: d3ddccc632c3dc8b7f860b52191e60c2aca51206af10a4e6258e6c5c3d2a32e4
- filename: packages/azure/src/lib/ConsumptionManagement.ts
Expand All @@ -137,6 +137,8 @@ fileignoreconfig:
checksum: 21f2f2bf245bcb51802e3ff81c1d1c6e988b0a9bcf9e23069fe2c5b49f2db17e
- filename: packages/client/src/common/FilterBar/FilterBar.tsx
checksum: 0005b5abc9cba50b821c955aa1cc28e9860d4c8748f52c3bf6927eef620500fc
- filename: packages/client/src/common/FilterBar/utils/DropdownConstants.test.ts
checksum: b9f3b222216d0937d53a026581820e5a8b4d6a9dd76c2a312e46ef5f1a84540a
- filename: packages/client/src/common/FilterBar/utils/DropdownConstants.ts
checksum: 03deb9260bd7bd7106da1eb4d70130284530ac15381ce52a0554f2f48de9d484
- filename: packages/client/src/common/FilterBar/utils/FiltersUtil.ts
Expand Down
11 changes: 7 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@
"lerna": "^4.0.0",
"rimraf": "^3.0.2",
"sonar-scanner": "^3.1.0",
"ts-node": "^10.2.1",
"typescript": "^4.5.3"
"ts-node": "^10.4.0",
"typescript": "^4.5.4"
},
"resolutions": {
"@types/react": "^17.0.6",
"@types/express-serve-static-core": "^4.17.21"
"@types/react": "^17.0.38",
"@types/express-serve-static-core": "^4.17.21",
"@grpc/grpc-js": "^1.4.6",
"@types/eslint": "^8.2.1",
"google-auth-library": "^7.11.0"
},
"workspaces": {
"packages": [
Expand Down
30 changes: 15 additions & 15 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,29 +45,29 @@
"create-docker-secrets": "./create_docker_secrets.sh"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/jest-when": "^2.7.2",
"@types/node": "^16.0.1",
"@types/jest": "^27.4.0",
"@types/jest-when": "^2.7.4",
"@types/node": "^17.0.8",
"@types/source-map-support": "^0.5.3",
"@types/supertest": "^2.0.11",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"eslint": "^7.26.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-unused-imports": "^1.1.1",
"jest": "26.6.0",
"jest-when": "^3.3.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^27.4.7",
"jest-when": "^3.5.0",
"lint-staged": "^11.0.1",
"onchange": "^7.1.0",
"prettier": "^2.3.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.19",
"supertest": "^6.1.3",
"ts-jest": "^26.5.6",
"ts-node": "^10.2.1",
"ts-node-dev": "^1.1.6",
"typescript": "^4.5.3"
"ts-jest": "^27.1.2",
"ts-node": "^10.4.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4"
},
"dependencies": {
"@cloud-carbon-footprint/app": "^0.4.0",
Expand Down
1 change: 1 addition & 0 deletions packages/api/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"rootDir": "./src",
"baseUrl": ".",
"outDir": "./dist",
"skipLibCheck": true
},
"include": ["./src"],
}
30 changes: 15 additions & 15 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,28 @@
"@cloud-carbon-footprint/azure": "^0.6.0",
"@cloud-carbon-footprint/common": "^1.3.0",
"@cloud-carbon-footprint/gcp": "^0.6.0",
"@google-cloud/monitoring": "^2.3.1",
"@google-cloud/storage": "^5.8.5",
"@google-cloud/monitoring": "^2.3.5",
"@google-cloud/storage": "^5.16.1",
"moment": "^2.29.1",
"ramda": "^0.27.1"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/node": "^16.0.1",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"eslint": "^7.26.0",
"@types/jest": "^27.4.0",
"@types/node": "^17.0.8",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-unused-imports": "^1.1.1",
"jest": "^26.6.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^27.4.7",
"lint-staged": "^11.0.1",
"prettier": "^2.3.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"ts-jest": "^26.5.6",
"ts-node": "^10.2.1",
"ts-node-dev": "^1.1.6",
"typescript": "^4.5.3"
"ts-jest": "^27.1.2",
"ts-node": "^10.4.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
3 changes: 2 additions & 1 deletion packages/app/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"compilerOptions": {
"rootDir": "./src",
"baseUrl": ".",
"outDir": "./dist"
"outDir": "./dist",
"skipLibCheck": true
},
"include": ["./src"]
}
34 changes: 17 additions & 17 deletions packages/aws/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,34 @@
"dependencies": {
"@cloud-carbon-footprint/common": "^1.3.0",
"@cloud-carbon-footprint/core": "^0.13.0",
"@google-cloud/iam-credentials": "^1.0.3",
"@google-cloud/iam-credentials": "^1.1.1",
"aws-sdk": "^2.927.0",
"aws-sdk-mock": "^5.1.0",
"moment": "^2.29.1",
"ramda": "^0.27.1"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/jest-when": "^2.7.2",
"@types/node": "^16.0.1",
"@types/jest": "^27.4.0",
"@types/jest-when": "^2.7.4",
"@types/node": "^17.0.8",
"@types/source-map-support": "^0.5.3",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"eslint": "^7.20.0",
"eslint-config-prettier": "^8.0.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-unused-imports": "^1.1.0",
"jest": "26.6.0",
"jest-when": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^27.4.7",
"jest-when": "^3.5.0",
"lint-staged": "^11.0.1",
"onchange": "^7.1.0",
"prettier": "^2.2.1",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.19",
"ts-jest": "^26.5.1",
"ts-node": "^10.2.1",
"ts-node-dev": "^1.1.1",
"typescript": "^4.5.3"
"ts-jest": "^27.1.2",
"ts-node": "^10.4.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
34 changes: 17 additions & 17 deletions packages/azure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,31 +47,31 @@
"@azure/ms-rest-nodeauth": "^3.0.7",
"@cloud-carbon-footprint/common": "^1.3.0",
"@cloud-carbon-footprint/core": "^0.13.0",
"@google-cloud/secret-manager": "^3.7.1",
"@google-cloud/secret-manager": "^3.10.1",
"moment": "^2.29.1"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/jest-when": "^2.7.2",
"@types/node": "^16.0.1",
"@types/jest": "^27.4.0",
"@types/jest-when": "^2.7.4",
"@types/node": "^17.0.8",
"@types/source-map-support": "^0.5.3",
"@typescript-eslint/eslint-plugin": "^4.15.1",
"@typescript-eslint/parser": "^4.15.1",
"eslint": "^7.20.0",
"eslint-config-prettier": "^8.0.0",
"eslint-plugin-prettier": "^3.3.1",
"eslint-plugin-unused-imports": "^1.1.0",
"jest": "26.6.0",
"jest-when": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^27.4.7",
"jest-when": "^3.5.0",
"lint-staged": "^11.0.1",
"onchange": "^7.1.0",
"prettier": "^2.2.1",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.19",
"ts-jest": "^26.5.1",
"ts-node": "^10.2.1",
"ts-node-dev": "^1.1.1",
"typescript": "^4.5.3"
"ts-jest": "^27.1.2",
"ts-node": "^10.4.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
coverageThreshold: {
global: {
statements: 99,
branches: 90,
branches: 89,
functions: 100,
lines: 99,
},
Expand Down
30 changes: 15 additions & 15 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,28 @@
"create-lookup-table": "ts-node src/CreateLookupTable/index.ts"
},
"devDependencies": {
"@types/jest": "^27.0.1",
"@types/jest-when": "^2.7.2",
"@types/node": "^16.0.1",
"@types/jest": "^27.4.0",
"@types/jest-when": "^2.7.4",
"@types/node": "^17.0.8",
"@types/source-map-support": "^0.5.3",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"aws-sdk-mock": "^5.1.0",
"eslint": "^7.26.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-unused-imports": "^1.1.1",
"jest": "26.6.0",
"jest-when": "^3.3.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"jest": "^27.4.7",
"jest-when": "^3.5.0",
"lint-staged": "^11.0.1",
"onchange": "^7.1.0",
"prettier": "^2.3.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.19",
"ts-jest": "^26.5.6",
"ts-node": "^10.2.1",
"ts-node-dev": "^1.1.6",
"typescript": "^4.5.3"
"ts-jest": "^27.1.2",
"ts-node": "^10.4.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.5.4"
},
"dependencies": {
"@cloud-carbon-footprint/app": "0.4.0",
Expand Down
35 changes: 17 additions & 18 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@material-ui/lab": "^4.0.0-alpha.57",
"apexcharts": "^3.26.3",
"axios": "^0.24.0",
"dotenv": "^10.0.0",
"express": "^4.17.1",
"helmet": "^4.6.0",
"moment": "^2.29.1",
Expand All @@ -37,10 +36,10 @@
"react-dom": "^17.0.2",
"react-is": "^17.0.2",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3",
"react-scripts": "^5.0.0",
"react-test-renderer": "^17.0.2",
"styled-components": "^5.3.0",
"typescript": "^4.5.3"
"typescript": "^4.5.4"
},
"proxy": "http://localhost:4000",
"scripts": {
Expand Down Expand Up @@ -76,34 +75,34 @@
]
},
"devDependencies": {
"@testing-library/dom": "^8.0.0",
"@testing-library/jest-dom": "^5.12.0",
"@testing-library/react": "^12.0.0",
"@testing-library/react-hooks": "^7.0.0",
"@testing-library/user-event": "^13.1.9",
"@types/jest": "^27.0.1",
"@testing-library/dom": "^8.11.1",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/react-hooks": "^7.0.2",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.4.0",
"@types/mockdate": "^3.0.0",
"@types/node": "^16.0.1",
"@types/node": "^17.0.8",
"@types/ramda": "^0.27.40",
"@types/react": "^17.0.6",
"@types/react": "^17.0.38",
"@types/react-dates": "^21.8.2",
"@types/react-dom": "^17.0.5",
"@types/react-router": "^5.1.14",
"@types/react-router-dom": "^5.1.7",
"@types/styled-components": "^5.1.9",
"@typescript-eslint/eslint-plugin": "^4.24.0",
"@typescript-eslint/parser": "^4.24.0",
"@typescript-eslint/eslint-plugin": "^5.9.0",
"@typescript-eslint/parser": "^5.9.0",
"concurrently": "^6.3.0",
"eslint": "^7.26.0",
"eslint": "^8.6.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"eslint-plugin-unused-imports": "^1.1.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-unused-imports": "^2.0.0",
"immer": "^9.0.2",
"jest": "26.6.0",
"jest": "^27.4.7",
"json-server": "^0.17.0",
"lint-staged": "^11.0.1",
"mockdate": "^3.0.5",
"prettier": "^2.3.0"
"prettier": "^2.5.1"
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": [
Expand Down
3 changes: 0 additions & 3 deletions packages/client/src/Config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
* © 2021 Thoughtworks, Inc.
*/

import dotenv from 'dotenv'
dotenv.config()

export interface ClientConfig {
CURRENT_PROVIDERS: {
key: string
Expand Down

0 comments on commit 8fd171e

Please sign in to comment.