Merge pull request #113 from xenit-eu/yarn-berry

Switch to modern yarn
xenit-eu · Oct 17, 2024 · a7cda6e · a7cda6e
2 parents 3eda5ad + 9689882
commit a7cda6e
Show file tree

Hide file tree

Showing 13 changed files with 9,111 additions and 6,699 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,9 @@ jobs:
           node-version: 18
           registry-url: 'https://registry.npmjs.org'
           scope: '@contentgrid'
-      - run: yarn install --frozen-lockfile
+      - run: |
+          corepack enable
+          yarn install --frozen-lockfile
       - name: Build
         run: yarn build
       - name: Test

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 coverage/
 build/
+.yarn/
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+nodeLinker: node-modules
diff --git a/config/tsconfig.json b/config/tsconfig.json
@@ -11,7 +11,7 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "ES6",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "target": "ES2019",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
     // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */

diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
     "build": "lerna exec yarn prepare",
     "test": "lerna exec yarn test"
   },
-  "dependencies": {},
   "devDependencies": {
     "@babel/core": "^7.22.9",
     "@babel/plugin-transform-runtime": "^7.22.9",
@@ -27,5 +26,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.1.6"
   },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  "packageManager": "yarn@4.5.0"
 }
diff --git a/packages/fetch-hook-authentication/package.json b/packages/fetch-hook-authentication/package.json
@@ -40,6 +40,5 @@
     "type": "git",
     "url": "git+https://github.com/xenit-eu/contentgrid-ts.git",
     "directory": "packages/fetch-hook-authentication"
-  },
-  "devDependencies": {}
+  }
 }
diff --git a/packages/fetch-hooks/package.json b/packages/fetch-hooks/package.json
@@ -2,7 +2,11 @@
   "name": "@contentgrid/fetch-hooks",
   "version": "0.0.1-alpha.0",
   "description": "Insert hooks before/after fetch()",
-  "keywords": ["fetch", "typescript", "hooks"],
+  "keywords": [
+    "fetch",
+    "typescript",
+    "hooks"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",

diff --git a/packages/hal-forms/package.json b/packages/hal-forms/package.json
@@ -2,7 +2,14 @@
   "name": "@contentgrid/hal-forms",
   "version": "0.0.1-alpha.0",
   "description": "HAL-FORMS models",
-  "keywords": ["HAL-FORMS", "HAL", "json", "rest", "hypermedia", "HATEOAS"],
+  "keywords": [
+    "HAL-FORMS",
+    "HAL",
+    "json",
+    "rest",
+    "hypermedia",
+    "HATEOAS"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",
@@ -40,9 +47,9 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@contentgrid/typed-fetch": "^0.0.1-alpha.0",
-    "@contentgrid/hal": "^0.0.1-alpha.0",
     "@babel/runtime": "^7.22.10",
+    "@contentgrid/hal": "^0.0.1-alpha.0",
+    "@contentgrid/typed-fetch": "^0.0.1-alpha.0",
     "tslib": "^2.6.1"
   },
   "scripts": {

diff --git a/packages/hal/package.json b/packages/hal/package.json
@@ -2,7 +2,13 @@
   "name": "@contentgrid/hal",
   "version": "0.0.1-alpha.0",
   "description": "Hypertext Application Language resource models",
-  "keywords": ["HAL", "json", "rest", "hypermedia", "HATEOAS"],
+  "keywords": [
+    "HAL",
+    "json",
+    "rest",
+    "hypermedia",
+    "HATEOAS"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",

diff --git a/packages/problem-details/package.json b/packages/problem-details/package.json
@@ -2,7 +2,12 @@
   "name": "@contentgrid/problem-details",
   "version": "0.0.1-alpha.0",
   "description": "RFC9547 Problem Details types and helpers",
-  "keywords": ["RFC7807", "RFC9547", "problem", "problem-details"],
+  "keywords": [
+    "RFC7807",
+    "RFC9547",
+    "problem",
+    "problem-details"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",

diff --git a/packages/typed-fetch/package.json b/packages/typed-fetch/package.json
@@ -2,7 +2,10 @@
   "name": "@contentgrid/typed-fetch",
   "version": "0.0.1-alpha.0",
   "description": "Add typing information to fetch() requests and responses",
-  "keywords": ["fetch", "typescript"],
+  "keywords": [
+    "fetch",
+    "typescript"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",

diff --git a/packages/uri-template/package.json b/packages/uri-template/package.json
@@ -2,7 +2,11 @@
   "name": "@contentgrid/uri-template",
   "version": "0.0.1-alpha.0",
   "description": "RFC6570 URI template parser and expander",
-  "keywords": ["RFC6570", "uri-template", "uri"],
+  "keywords": [
+    "RFC6570",
+    "uri-template",
+    "uri"
+  ],
   "main": "./build/index.js",
   "module": "./build/index.mjs",
   "types": "./build/index.d.ts",