(chore) update to Yarn v3 (#503)

openmrs · Aug 13, 2022 · dac3ba6 · dac3ba6
1 parent c3d4b2e
commit dac3ba6
Show file tree

Hide file tree

Showing 13 changed files with 20,429 additions and 14,263 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/.yarn/releases/yarn-3.2.2.cjs b/.yarn/releases/yarn-3.2.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.2.2.cjs
diff --git a/package.json b/package.json
@@ -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",
@@ -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"
 }
diff --git a/packages/apps/esm-devtools-app/package.json b/packages/apps/esm-devtools-app/package.json
@@ -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"

diff --git a/packages/apps/esm-implementer-tools-app/package.json b/packages/apps/esm-implementer-tools-app/package.json
@@ -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",

diff --git a/packages/apps/esm-implementer-tools-app/src/configuration/configuration.test.tsx b/packages/apps/esm-implementer-tools-app/src/configuration/configuration.test.tsx
@@ -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": {

diff --git a/packages/apps/esm-login-app/package.json b/packages/apps/esm-login-app/package.json
@@ -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",

diff --git a/packages/apps/esm-offline-tools-app/package.json b/packages/apps/esm-offline-tools-app/package.json
@@ -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",

diff --git a/packages/apps/esm-primary-navigation-app/package.json b/packages/apps/esm-primary-navigation-app/package.json
@@ -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",

diff --git a/packages/tooling/openmrs/package.json b/packages/tooling/openmrs/package.json
@@ -3,9 +3,7 @@
   "version": "4.0.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"

diff --git a/packages/tooling/webpack-config/package.json b/packages/tooling/webpack-config/package.json
@@ -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"
   }
 }