Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(chore) update to Yarn v3 #503

Merged
merged 4 commits into from
Aug 13, 2022
Merged

(chore) update to Yarn v3 #503

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c47b676
(chore) update to Yarn v3
ibacher Aug 13, 2022
2ad5781
Restore importmap.json
ibacher Aug 13, 2022
f37f9c7
Merge remote-tracking branch 'origin/main' into yarn-3
ibacher Aug 13, 2022
513e5da
Update yarn.lock
ibacher Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,12 @@ dist
package-lock.json

.turbo

# ignores for Yarn v3 w/o PNP
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.2.cjs
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.2.cjs
8 changes: 5 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"release": "lerna version --no-git-tag-version",
"build": "turbo run build",
"build:apps": "turbo run build --filter='@openmrs/*-app'",
"setup": "lerna bootstrap && turbo run build && lerna clean --yes && lerna bootstrap",
"setup": "yarn install && turbo run build && lerna clean --yes && yarn install --immutable",
"verify": "turbo run lint && turbo run test && turbo run typescript",
"prettier": "prettier \"packages/**/src/**/*\" --write",
"prepare": "husky install",
Expand Down Expand Up @@ -63,10 +63,12 @@
"typedoc-plugin-file-tags": "^1.0.0",
"typedoc-plugin-markdown": "^3.11.12",
"typedoc-plugin-no-inherit": "^1.3.1",
"typescript": "~4.6.4"
"typescript": "~4.6.4",
"webpack": "^5.74.0"
},
"resolutions": {
"minipass": "3.3.5",
"parse5": "^6"
}
},
"packageManager": "yarn@3.2.2"
}
2 changes: 1 addition & 1 deletion packages/apps/esm-devtools-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"access": "public"
},
"peerDependencies": {
"@openmrs/esm-framework": ">=4.0-pre",
"@openmrs/esm-framework": "*",
"react": "18.x",
"react-dom": "18.x",
"rxjs": "6.x"
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/esm-implementer-tools-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"lodash-es": "^4.17.21"
},
"peerDependencies": {
"@openmrs/esm-framework": ">=4.0-pre",
"@openmrs/esm-framework": "*",
"react": "18.x",
"react-dom": "18.x",
"react-i18next": "11.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/esm-implementer-tools-app/src/configuration/configuration.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jest.mock("./interactive-editor/value-editors/concept-search.resource", () => ({
}));
jest.mock("lodash-es/debounce", () => jest.fn((fn) => fn));

global.URL.createObjectURL = jest.fn();
window.URL.createObjectURL = jest.fn();

const mockImplToolsConfig = {
"@openmrs/mario": {
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/esm-login-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"lodash-es": "^4.17.21"
},
"peerDependencies": {
"@openmrs/esm-framework": ">=4.0-pre",
"@openmrs/esm-framework": "*",
"react": "18.x",
"react-dom": "18.x",
"react-i18next": "11.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/esm-offline-tools-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"swr": "^1.0.1"
},
"peerDependencies": {
"@openmrs/esm-framework": ">=4.0-pre",
"@openmrs/esm-framework": "*",
"react": "18.x",
"react-dom": "18.x",
"react-i18next": "11.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/esm-primary-navigation-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"lodash-es": "^4.17.21"
},
"peerDependencies": {
"@openmrs/esm-framework": ">=4.0-pre",
"@openmrs/esm-framework": "*",
"react": "18.x",
"react-dom": "18.x",
"react-i18next": "11.x",
Expand Down
4 changes: 1 addition & 3 deletions packages/tooling/openmrs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"version": "3.4.0",
"license": "MPL-2.0",
"main": "dist/index.js",
"bin": {
"openmrs": "./dist/cli.js"
},
"bin": "./dist/cli.js",
"types": "src/index.ts",
"engines": {
"node": ">= 12.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/tooling/webpack-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
"style-loader": "^3.3.1",
"swc-loader": "^0.1.15",
"systemjs-webpack-interop": "^2.3.7",
"webpack": "^5.74.0",
"webpack-bundle-analyzer": "^4.5.0",
"webpack-stats-plugin": "^1.0.3"
},
"peerDependencies": {
"webpack": "5.x"
},
"devDependencies": {
"typescript": "~4.5.2",
"webpack": "^5.64.0"
"typescript": "~4.5.2"
}
}
Loading