[pull] main from TryGhost:main

apps/shade/package.json

@@ -113,7 +113,7 @@
     "color": "5.0.3",
     "country-flag-icons": "catalog:",
     "lucide-react": "catalog:",
-    "moment-timezone": "^0.5.48",
+    "moment-timezone": "0.5.48",
     "react": "catalog:",
     "react-day-picker": "9.14.0",
     "react-dom": "catalog:",

ghost/core/core/server/web/shared/utils.js → ghost/core/core/server/web/shared/utils.ts

@@ -1,8 +1,6 @@
-const url = require('url');
+import * as url from 'node:url';
 
-const _private = {};
-
-_private.removeDoubleCharacters = (character, string) => {
+function removeDoubleCharacters(character: string, string: string) {
   const stringArray = string.split('');
 
   return stringArray.reduce((newString, currentCharacter, index) => {
@@ -12,17 +10,17 @@ _private.removeDoubleCharacters = (character, string) => {
 
     return `${newString}${currentCharacter}`;
   }, '');
-};
+}
 
-module.exports.removeOpenRedirectFromUrl = function removeOpenRedirectFromUrl(urlString) {
+export function removeOpenRedirectFromUrl(urlString: string): string {
   const parsedUrl = url.parse(urlString);
 
   return (
     // http://
     (parsedUrl.protocol ? parsedUrl.protocol + '//' : '') +
     (parsedUrl.auth || '') +
     (parsedUrl.host || '') +
-    _private.removeDoubleCharacters('/', parsedUrl.path) +
+    removeDoubleCharacters('/', parsedUrl.path ?? '') +
     (parsedUrl.hash || '')
   );
-};
+}

ghost/core/test/utils/admin-utils.js → ghost/core/test/utils/admin-utils.ts

@@ -1,5 +1,5 @@
-const fs = require('fs-extra');
-const path = require('path');
+import * as fs from 'fs-extra';
+import * as path from 'node:path';
 
 const adminFiles = [
   'built/admin/index.html',
@@ -9,14 +9,14 @@ const adminFiles = [
   'built/admin/assets/vendor.css',
 ];
 
-module.exports.stubAdminFiles = () => {
+export const stubAdminFiles = (): void => {
   adminFiles.forEach((file) => {
     const filePath = path.resolve(__dirname, '../../core/', file);
     fs.ensureFileSync(filePath);
   });
 };
 
-module.exports.stubAuthFrameFiles = (publicPath) => {
+export const stubAuthFrameFiles = (publicPath: string): void => {
   const filePath = path.resolve(publicPath, 'admin-auth/index.html');
   fs.ensureFileSync(filePath);
 };

ghost/core/test/utils/redirects.js → ghost/core/test/utils/redirects.ts

@@ -1,10 +1,13 @@
-const fs = require('fs-extra');
-const path = require('path');
+import * as fs from 'fs-extra';
+import * as path from 'node:path';
 
 /**
  * Set up the redirects file with the extension you want.
  */
-module.exports.setupFile = async (contentFolderForTests, ext) => {
+export const setupFile = async (
+  contentFolderForTests: string,
+  ext: null | string,
+): Promise<void> => {
   const yamlPath = path.join(contentFolderForTests, 'data', 'redirects.yaml');
   const jsonPath = path.join(contentFolderForTests, 'data', 'redirects.json');