Skip to content

Commit

Permalink
(chore) Dependency and tooling updates (#48)
Browse files Browse the repository at this point in the history
* (chore) Dependency and tooling updates

* Bump GH actions node version
  • Loading branch information
denniskigen authored Mar 4, 2024
1 parent c20b377 commit bb7e0d0
Show file tree
Hide file tree
Showing 15 changed files with 9,814 additions and 10,455 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- name: Cache dependencies
id: cache
Expand All @@ -35,7 +35,7 @@ jobs:

- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: yarn install --immutable

- name: Setup a local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v2
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"
registry-url: "https://registry.npmjs.org"

- name: Cache dependencies
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"
registry-url: "https://registry.npmjs.org"

- name: Cache dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 15
- name: Checkout repo

steps:
uses: actions/checkout@v3

Expand All @@ -23,15 +23,15 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Cache dependencies
id: cache
uses: actions/cache@v3
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,5 @@ e2e/storageState.json
!.yarn/releases
!.yarn/sdks
!.yarn/versions

.turbo
541 changes: 0 additions & 541 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

874 changes: 0 additions & 874 deletions .yarn/releases/yarn-3.6.3.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.1.0.cjs

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
nodeLinker: node-modules
compressionLevel: mixed

enableGlobalCache: false

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.3.cjs
yarnPath: .yarn/releases/yarn-4.1.0.cjs
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
lines: 80,
},
},
setupFilesAfterEnv: [path.resolve(__dirname, 'tools', 'setupTests.ts')],
setupFilesAfterEnv: [path.resolve(__dirname, 'tools', 'setup-tests.ts')],
testEnvironment: 'jsdom',
testEnvironmentOptions: {
url: 'http://localhost/',
Expand Down
78 changes: 39 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,57 +15,57 @@
"postinstall": "husky install",
"test-e2e": "playwright test",
"coverage": "yarn test --coverage",
"extract-translations": "lerna run extract-translations"
"extract-translations": "turbo extract-translations"
},
"devDependencies": {
"@openmrs/esm-framework": "next",
"@playwright/test": "^1.37.1",
"@swc/cli": "^0.1.62",
"@swc/core": "^1.3.83",
"@swc/jest": "^0.2.29",
"@testing-library/dom": "^8.20.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.4.3",
"@playwright/test": "^1.42.1",
"@swc/cli": "^0.1.65",
"@swc/core": "^1.4.2",
"@swc/jest": "^0.2.36",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/jest": "^25.2.3",
"@types/jsdom": "20.0.1",
"@types/lodash-es": "^4.17.9",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/webpack-env": "^1.18.1",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.33.0",
"concurrently": "^6.5.1",
"@types/lodash-es": "^4.17.12",
"@types/react": "^18.2.61",
"@types/react-dom": "^18.2.19",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.1.0",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"css-loader": "^6.8.1",
"dayjs": "^1.11.9",
"dotenv": "^16.3.1",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.10.0",
"css-loader": "^6.10.0",
"dayjs": "^1.11.10",
"dotenv": "^16.4.5",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-ts-react-important-stuff": "^3.0.0",
"eslint-plugin-prettier": "^3.4.1",
"husky": "^8.0.3",
"i18next": "^19.9.2",
"i18next-parser": "^3.11.0",
"eslint-plugin-prettier": "^5.1.3",
"husky": "^9.0.11",
"i18next": "^23.10.0",
"i18next-parser": "^8.13.0",
"identity-obj-proxy": "^3.0.0",
"jest": "^28.1.3",
"jest-cli": "^28.1.3",
"jest-environment-jsdom": "^28.1.3",
"lerna": "^4.0.0",
"jest": "^29.7.0",
"jest-cli": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"lerna": "^8.1.2",
"openmrs": "next",
"prettier": "^2.8.8",
"pretty-quick": "^2.0.2",
"prettier": "^3.2.5",
"pretty-quick": "^4.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^11.18.6",
"react-router-dom": "^6.15.0",
"react-i18next": "^14.0.5",
"react-router-dom": "^6.22.2",
"rxjs": "^6.6.7",
"sass": "^1.66.1",
"swc-loader": "^0.2.3",
"turbo": "^1.10.13",
"sass": "^1.71.1",
"swc-loader": "^0.2.6",
"turbo": "^1.12.4",
"typescript": "^4.9.5",
"webpack": "^5.88.2",
"webpack-cli": "^4.10.0"
"webpack": "^5.90.3",
"webpack-cli": "^5.1.4"
},
"packageManager": "yarn@3.6.3"
"packageManager": "yarn@4.1.0"
}
2 changes: 1 addition & 1 deletion packages/esm-admin-openconceptlab-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"dependencies": {
"@carbon/react": "^1.37.0",
"lodash-es": "^4.17.21",
"swr": "^2.2.2"
"swr": "^2.2.5"
},
"peerDependencies": {
"@openmrs/esm-framework": "5.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-system-admin-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"dependencies": {
"@carbon/react": "^1.37.0",
"lodash-es": "^4.17.21",
"swr": "^2.2.2"
"swr": "^2.2.5"
},
"peerDependencies": {
"@openmrs/esm-framework": "5.x",
Expand Down
2 changes: 1 addition & 1 deletion tools/i18next-parser.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
lineEnding: 'lf',
// Control the line ending. See options at https://github.com/ryanve/eol

locales: ['en', 'ar'],
locales: ['en'],
// An array of the locales in your applications

namespaceSeparator: ':',
Expand Down
2 changes: 1 addition & 1 deletion tools/setupTests.ts → tools/setup-tests.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '@testing-library/jest-dom/extend-expect';
import '@testing-library/jest-dom';

declare global {
interface Window {
Expand Down
7 changes: 3 additions & 4 deletions turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
"pipeline": {
"build": {
"dependsOn": ["^build"],
"outputs": ["dist/**"]
"outputs": ["dist/**"]
},
"test": {},
"lint": {},
"typescript": {},
"extract-translations": {},
"dev": {
"cache": false
"extract-translations": {
"outputs": ["./translations/*"]
}
}
}
Loading

0 comments on commit bb7e0d0

Please sign in to comment.