Yarn 4 upgrade fixes

.github/workflows/ci.yml

@@ -177,7 +177,7 @@ jobs:
           cache: yarn
 
       - name: Install dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+        run: yarn install --immutable --check-cache
 
       - name: Build packages
         if: steps.cache_built_packages.outputs.cache-hit != 'true'

.gitignore

@@ -176,6 +176,15 @@ tsconfig.tsbuildinfo
 .venv
 .diff_tmp
 
+# Yarn upgrade
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # Docker Yarn Cache
 .yarncache
 .yarncachecopy

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.5.3.cjs

apps/admin-x-activitypub/package.json

@@ -14,7 +14,6 @@
   ],
   "main": "./dist/admin-x-activitypub.umd.cjs",
   "module": "./dist/admin-x-activitypub.js",
-  "private": false,
   "scripts": {
     "dev": "vite build --watch",
     "dev:start": "vite",
@@ -35,7 +34,9 @@
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "jest": "29.7.0",
-    "ts-jest": "29.1.5"
+    "ts-jest": "29.1.5",
+    "vite": "4.5.3",
+    "vitest": "0.34.3"
   },
   "nx": {
     "targets": {

apps/admin-x-demo/package.json

@@ -31,7 +31,8 @@
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "react-dom": "18.3.1",
+    "vite": "4.5.3"
   },
   "nx": {
     "targets": {

apps/admin-x-design-system/package.json

@@ -10,9 +10,9 @@
   "sideEffects": false,
   "scripts": {
     "build": "tsc -p tsconfig.declaration.json && vite build",
-    "prepare": "yarn build",
+    "postinstall": "yarn build",
     "test": "yarn test:unit",
-    "test:unit": "yarn test:types && yarn nx build && vitest run",
+    "test:unit": "yarn test:types && yarn dlx nx build && vitest run",
     "test:types": "tsc --noEmit",
     "lint:code": "eslint --ext .js,.ts,.cjs,.tsx src/ --cache",
     "lint": "yarn lint:code && yarn lint:test",
@@ -58,7 +58,8 @@
     "typescript": "5.4.5",
     "validator": "13.12.0",
     "vite": "4.5.3",
-    "vite-plugin-svgr": "3.3.0"
+    "vite-plugin-svgr": "3.3.0",
+    "vitest": "0.34.3"
   },
   "dependencies": {
     "@dnd-kit/core": "6.1.0",

apps/admin-x-framework/package.json

@@ -55,7 +55,7 @@
   "sideEffects": false,
   "scripts": {
     "build": "tsc -p tsconfig.declaration.json && vite build",
-    "prepare": "yarn build",
+    "postinstall": "yarn build",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
     "test:unit": "vitest run --coverage",

apps/admin-x-settings/package.json

@@ -27,7 +27,7 @@
     "build": "tsc && vite build",
     "lint": "yarn run lint:js",
     "lint:js": "eslint --ext .js,.ts,.cjs,.tsx --cache src test",
-    "test:unit": "yarn nx build && vitest run",
+    "test:unit": "yarn dlx nx build && vitest run",
     "test:acceptance": "NODE_OPTIONS='--experimental-specifier-resolution=node --no-warnings' VITE_TEST=true playwright test",
     "test:acceptance:slowmo": "TIMEOUT=100000 PLAYWRIGHT_SLOWMO=100 yarn test:acceptance --headed",
     "test:acceptance:full": "ALL_BROWSERS=1 yarn test:acceptance",

apps/portal/src/utils/fixtures-generator.js

@@ -143,8 +143,8 @@ export function getMemberData({
 }
 
 export function getNewsletterData({
-    id = `${objectId()}`,
-    uuid = `${objectId()}`,
+    id = `id_${objectId()}`,
+    uuid = `uuid_${objectId()}`,
     name = 'Newsletter',
     description = 'Newsletter description',
     slug = 'newsletter',

ghost/activitypub/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "tsc",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura mocha -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",

ghost/admin/.template-lintrc.js

@@ -7,6 +7,7 @@ module.exports = {
         'no-inline-styles': false,
         'no-duplicate-landmark-elements': false,
         'no-pointer-down-event-binding': false,
-        'no-triple-curlies': false
+        'no-triple-curlies': false,
+        'no-redundant-role': false
     }
 };

ghost/admin/package.json

@@ -109,10 +109,10 @@
     "ember-load": "0.0.17",
     "ember-load-initializers": "2.1.2",
     "ember-mocha": "0.16.2",
-    "ember-modifier": "4.1.0",
+    "ember-modifier": "4.2.0",
     "ember-moment": "10.0.0",
     "ember-one-way-select": "4.0.1",
-    "ember-power-datepicker": "cibernox/ember-power-datepicker",
+    "ember-power-datepicker": "cibernox/ember-power-datepicker#da580474a2c449b715444934ddb626b7c07f46a7",
     "ember-power-select": "6.0.1",
     "ember-resolver": "8.1.0",
     "ember-simple-auth": "5.0.0",
@@ -164,7 +164,7 @@
   },
   "resolutions": {
     "ember-basic-dropdown": "6.0.2",
-    "ember-in-viewport": "4.1.0",
+    "ember-in-viewport": "4.2.0",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45"
   },
@@ -215,4 +215,4 @@
       }
     }
   }
-}
+}

ghost/announcement-bar-settings/package.json

@@ -21,6 +21,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/bookshelf-repository/package.json

@@ -20,10 +20,10 @@
     "build"
   ],
   "devDependencies": {
+    "@tryghost/nql": "0.12.7",
     "c8": "7.14.0",
     "mocha": "10.2.0",
-    "sinon": "15.2.0",
-    "@tryghost/nql": "0.12.7"
+    "sinon": "15.2.0"
   },
   "dependencies": {
     "@tryghost/mongo-utils": "0.6.2",

ghost/custom-fonts/package.json

@@ -21,7 +21,7 @@
     "build:cjs": "tsc -p tsconfig.json --outDir ./build/cjs --module CommonJS",
     "build:esm": "tsc -p tsconfig.esm.json --outDir ./build/esm --module ES2020",
     "build:ts": "yarn build",
-    "prepare": "yarn build",
+    "postinstall": "yarn build",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura mocha -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:ts && yarn test:unit",
     "test:ts": "tsc --noEmit",
@@ -38,6 +38,5 @@
     "sinon": "19.0.2",
     "ts-node": "10.9.2",
     "typescript": "5.6.2"
-  },
-  "dependencies": {}
+  }
 }

ghost/donations/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "yarn build:ts",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
@@ -27,6 +27,5 @@
     "sinon": "15.2.0",
     "ts-node": "10.9.2",
     "typescript": "5.4.5"
-  },
-  "dependencies": {}
+  }
 }

ghost/dynamic-routing-events/package.json

@@ -21,6 +21,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/email-addresses/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "yarn build:ts",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",

ghost/email-analytics-provider-mailgun/package.json

@@ -18,7 +18,9 @@
     "lib"
   ],
   "devDependencies": {
+    "c8": "8.0.1",
     "mocha": "10.2.0",
+    "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {

ghost/email-analytics-service/package.json

@@ -18,6 +18,7 @@
     "lib"
   ],
   "devDependencies": {
+    "c8": "8.0.1",
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"

ghost/email-events/package.json

@@ -22,6 +22,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/email-suppression-list/package.json

@@ -22,6 +22,5 @@
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/extract-api-key/package.json

@@ -17,6 +17,12 @@
     "index.js",
     "lib"
   ],
+  "devDependencies": {
+    "c8": "8.0.1",
+    "mocha": "10.2.0",
+    "should": "13.2.3",
+    "sinon": "15.2.0"
+  },
   "dependencies": {
     "jsonwebtoken": "8.5.1"
   }

ghost/identity-token-service/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "tsc",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura mocha -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",

ghost/importer-handler-content-files/package.json

@@ -21,6 +21,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/importer-revue/package.json

@@ -18,6 +18,9 @@
     "lib"
   ],
   "devDependencies": {
+    "c8": "8.0.1",
+    "mocha": "10.2.0",
+    "should": "13.2.3",
     "sinon": "15.2.0"
   },
   "dependencies": {

ghost/link-redirects/package.json

@@ -25,7 +25,7 @@
     "sinon": "15.2.0"
   },
   "dependencies": {
-    "bson-objectid": "2.0.4",
-    "@tryghost/domain-events": "0.0.0"
+    "@tryghost/domain-events": "0.0.0",
+    "bson-objectid": "2.0.4"
   }
 }

ghost/mentions-email-report/package.json

@@ -21,6 +21,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/nql-filter-expansions/package.json

@@ -23,6 +23,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/post-events/package.json

@@ -24,6 +24,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/post-revisions/package.json

@@ -23,6 +23,5 @@
     "c8": "8.0.1",
     "mocha": "10.2.0",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }

ghost/prometheus-metrics/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "yarn build:ts",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --90 --reporter text --reporter cobertura mocha -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",

ghost/recommendations/package.json

@@ -10,7 +10,7 @@
     "dev": "tsc --watch --preserveWatchOutput --sourceMap",
     "build": "yarn build:ts",
     "build:ts": "tsc",
-    "prepare": "tsc",
+    "postinstall": "tsc",
     "test:unit": "NODE_ENV=testing c8 --src src --all --check-coverage --100 --reporter text --reporter cobertura -- mocha --reporter dot -r ts-node/register './test/**/*.test.ts'",
     "test": "yarn test:types && yarn test:unit",
     "test:types": "tsc --noEmit",
@@ -30,10 +30,10 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@tryghost/tpl": "0.1.32",
+    "@tryghost/bookshelf-repository": "0.0.0",
     "@tryghost/errors": "1.3.5",
     "@tryghost/in-memory-repository": "0.0.0",
-    "@tryghost/bookshelf-repository": "0.0.0",
-    "@tryghost/logging": "2.4.18"
+    "@tryghost/logging": "2.4.18",
+    "@tryghost/tpl": "0.1.32"
   }
 }

ghost/referrers/package.json

@@ -20,6 +20,5 @@
     "mocha": "10.2.0",
     "should": "13.2.3",
     "sinon": "15.2.0"
-  },
-  "dependencies": {}
+  }
 }