Fix canvas stub breaking jsdom 20 in app-desktop tests

jsdom 20 checks require.resolve() before an unguarded require(), so the stub must not resolve at all.

.gitignore

@@ -66,6 +66,7 @@ docs/**/*.mustache
 .yarn/*
 !.yarn/patches
 !.yarn/joplin-empty-package
+!.yarn/joplin-missing-package
 !.yarn/plugins
 !.yarn/releases
 !.yarn/sdks

.yarn/joplin-missing-package/package.json

@@ -0,0 +1,10 @@
+{
+	"name": "@joplin/missing",
+	"version": "0.0.0",
+	"description": "Has no entry point, so that require() and require.resolve() both fail as if the package was not installed. Used to exclude optional dependencies such as canvas.",
+	"private": true,
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/laurent22/joplin.git"
+	}
+}

.yarnrc.yml

@@ -19,8 +19,6 @@ logFilters:
   - code: YN0013
     level: discard
 
-nmHoistingLimits: workspaces
-
 nodeLinker: node-modules
 
 npmMinimalAgeGate: 1w

Dockerfile.server

@@ -78,6 +78,7 @@ ENV PM2_HOME=/opt/pm2
 
 USER $user
 
+COPY --chown=$user:$user --from=builder /build/node_modules /home/$user/node_modules
 COPY --chown=$user:$user --from=builder /build/packages /home/$user/packages
 COPY --chown=$user:$user --from=builder /usr/bin/tini /usr/local/bin/tini
 

package.json

@@ -126,7 +126,7 @@
     "pdfjs-dist@2.16.105": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@*": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
     "pdfjs-dist@3.11.174": "patch:pdfjs-dist@npm%3A3.11.174#./.yarn/patches/pdfjs-dist-npm-3.11.174-67f2fee6d6.patch",
-    "canvas@npm:^2.11.2": "link:./.yarn/joplin-empty-package/",
+    "canvas@npm:^2.11.2": "link:./.yarn/joplin-missing-package/",
     "@huggingface/transformers/sharp": "link:./.yarn/joplin-empty-package/",
     "node-gyp@npm:^9.0.0": "12.4.0",
     "node-gyp@npm:11.2.0": "12.4.0",

packages/app-desktop/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@joplin/app-desktop",
   "version": "3.7.22",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "description": "Joplin for Desktop",
   "main": "main.bundle.js",
   "private": true,

packages/app-mobile/metro.config.js

@@ -51,7 +51,8 @@ const remappedPackages = {
 		: path.resolve(__dirname, 'config', 'config.default.js'),
 };
 
-const watchedFolders = [];
+// Dependencies of the local packages are hoisted to the root node_modules
+const watchedFolders = [path.resolve(__dirname, '../../node_modules')];
 for (const [, v] of Object.entries(localPackages)) {
 	watchedFolders.push(v);
 }

packages/app-mobile/package.json

@@ -3,6 +3,9 @@
   "description": "Joplin for Mobile",
   "license": "AGPL-3.0-or-later",
   "version": "3.7.0",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "private": true,
   "scripts": {
     "start": "BROWSERSLIST_IGNORE_OLD_DATA=true react-native start --reset-cache",

packages/default-plugins/buildDefaultPlugins.ts

@@ -2,7 +2,7 @@
 /* eslint-disable no-console */
 
 import { copy, exists, remove, readdir, mkdtemp } from 'fs-extra';
-import { join, resolve, basename } from 'path';
+import { join, resolve, basename, dirname } from 'path';
 import { tmpdir } from 'os';
 import { chdir, cwd } from 'process';
 import { execCommand } from '@joplin/utils';
@@ -34,7 +34,7 @@ const buildDefaultPlugins = async (options: Options) => {
 			}
 
 			logStatus('Copying plugin', pluginId, 'JPL file to', outputPath);
-			await copy(join(__dirname, 'node_modules', repositoryData.package, 'publish', `${pluginId}.jpl`), outputPath);
+			await copy(join(dirname(require.resolve(`${repositoryData.package}/package.json`)), 'publish', `${pluginId}.jpl`), outputPath);
 			logStatus('Copied.');
 		}
 	}

packages/doc-builder/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@joplin/doc-builder",
   "version": "0.0.0",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

packages/fork-htmlparser2/tsconfig.json

@@ -23,9 +23,7 @@
         // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
         "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */,
         "resolveJsonModule": true,
-        "typeRoots": [
-            "./node_modules/@types",
-        ],
+        "types": ["node", "jest"],
     },
     "include": ["src"],
     "exclude": [

packages/renderer/Tools/buildAssets.js

@@ -9,6 +9,7 @@ function dirname(path) {
 
 const rootDir = dirname(__dirname);
 const assetsDir = `${rootDir}/assets`;
+const packageDir = name => dirname(require.resolve(`${name}/package.json`));
 
 async function copyFile(source, dest) {
 	const fullDest = `${assetsDir}/${dest}`;
@@ -20,35 +21,35 @@ async function copyFile(source, dest) {
 async function main() {
 	await fs.remove(assetsDir);
 
-	await copyFile(`${rootDir}/node_modules/katex/dist/katex.min.css`, 'katex/katex.css');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Regular.woff2`, 'katex/fonts/KaTeX_Main-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Bold.woff2`, 'katex/fonts/KaTeX_Main-Bold.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-BoldItalic.woff2`, 'katex/fonts/KaTeX_Main-BoldItalic.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Main-Italic.woff2`, 'katex/fonts/KaTeX_Main-Italic.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Math-Italic.woff2`, 'katex/fonts/KaTeX_Math-Italic.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Math-BoldItalic.woff2`, 'katex/fonts/KaTeX_Math-BoldItalic.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size1-Regular.woff2`, 'katex/fonts/KaTeX_Size1-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size2-Regular.woff2`, 'katex/fonts/KaTeX_Size2-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size3-Regular.woff2`, 'katex/fonts/KaTeX_Size3-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Size4-Regular.woff2`, 'katex/fonts/KaTeX_Size4-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_AMS-Regular.woff2`, 'katex/fonts/KaTeX_AMS-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Caligraphic-Bold.woff2`, 'katex/fonts/KaTeX_Caligraphic-Bold.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Caligraphic-Regular.woff2`, 'katex/fonts/KaTeX_Caligraphic-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Fraktur-Bold.woff2`, 'katex/fonts/KaTeX_Fraktur-Bold.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Fraktur-Regular.woff2`, 'katex/fonts/KaTeX_Fraktur-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Bold.woff2`, 'katex/fonts/KaTeX_SansSerif-Bold.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Italic.woff2`, 'katex/fonts/KaTeX_SansSerif-Italic.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_SansSerif-Regular.woff2`, 'katex/fonts/KaTeX_SansSerif-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Script-Regular.woff2`, 'katex/fonts/KaTeX_Script-Regular.woff2');
-	await copyFile(`${rootDir}/node_modules/katex/dist/fonts/KaTeX_Typewriter-Regular.woff2`, 'katex/fonts/KaTeX_Typewriter-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/katex.min.css`, 'katex/katex.css');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Main-Regular.woff2`, 'katex/fonts/KaTeX_Main-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Main-Bold.woff2`, 'katex/fonts/KaTeX_Main-Bold.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Main-BoldItalic.woff2`, 'katex/fonts/KaTeX_Main-BoldItalic.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Main-Italic.woff2`, 'katex/fonts/KaTeX_Main-Italic.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Math-Italic.woff2`, 'katex/fonts/KaTeX_Math-Italic.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Math-BoldItalic.woff2`, 'katex/fonts/KaTeX_Math-BoldItalic.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Size1-Regular.woff2`, 'katex/fonts/KaTeX_Size1-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Size2-Regular.woff2`, 'katex/fonts/KaTeX_Size2-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Size3-Regular.woff2`, 'katex/fonts/KaTeX_Size3-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Size4-Regular.woff2`, 'katex/fonts/KaTeX_Size4-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_AMS-Regular.woff2`, 'katex/fonts/KaTeX_AMS-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Caligraphic-Bold.woff2`, 'katex/fonts/KaTeX_Caligraphic-Bold.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Caligraphic-Regular.woff2`, 'katex/fonts/KaTeX_Caligraphic-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Fraktur-Bold.woff2`, 'katex/fonts/KaTeX_Fraktur-Bold.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Fraktur-Regular.woff2`, 'katex/fonts/KaTeX_Fraktur-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_SansSerif-Bold.woff2`, 'katex/fonts/KaTeX_SansSerif-Bold.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_SansSerif-Italic.woff2`, 'katex/fonts/KaTeX_SansSerif-Italic.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_SansSerif-Regular.woff2`, 'katex/fonts/KaTeX_SansSerif-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Script-Regular.woff2`, 'katex/fonts/KaTeX_Script-Regular.woff2');
+	await copyFile(`${packageDir('katex')}/dist/fonts/KaTeX_Typewriter-Regular.woff2`, 'katex/fonts/KaTeX_Typewriter-Regular.woff2');
 
-	await copyFile(`${rootDir}/node_modules/highlight.js/styles/atom-one-light.css`, 'highlight.js/atom-one-light.css');
-	await copyFile(`${rootDir}/node_modules/highlight.js/styles/atom-one-dark-reasonable.css`, 'highlight.js/atom-one-dark-reasonable.css');
+	await copyFile(`${packageDir('highlight.js')}/styles/atom-one-light.css`, 'highlight.js/atom-one-light.css');
+	await copyFile(`${packageDir('highlight.js')}/styles/atom-one-dark-reasonable.css`, 'highlight.js/atom-one-dark-reasonable.css');
 
-	await copyFile(`${rootDir}/node_modules/mermaid/dist/mermaid.min.js`, 'mermaid/mermaid.min.js');
+	await copyFile(`${packageDir('mermaid')}/dist/mermaid.min.js`, 'mermaid/mermaid.min.js');
 	await copyFile(`${rootDir}/MdToHtml/rules/mermaid_render.js`, 'mermaid/mermaid_render.js');
 
-	await copyFile(`${rootDir}/node_modules/abcjs/dist/abcjs-basic-min.js`, 'abc/abcjs-basic-min.js');
+	await copyFile(`${packageDir('abcjs')}/dist/abcjs-basic-min.js`, 'abc/abcjs-basic-min.js');
 	await copyFile(`${rootDir}/MdToHtml/rules/abc_render.js`, 'abc/abc_render.js');
 }
 

packages/server/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@joplin/server",
   "version": "3.7.5",
+  "installConfig": {
+    "hoistingLimits": "workspaces"
+  },
   "private": true,
   "scripts": {
     "start-dev": "yarn build && JOPLIN_IS_TESTING=1 nodemon --config nodemon.json --ext ts,js,mustache,css,tsx dist/index.js --env dev",

packages/transcribe/src/services/queue/SqliteQueue.ts

@@ -11,7 +11,7 @@ export default class SqliteQueue implements BaseQueue {
 
 	private sqlite: Knex<Knex.Table>;
 	private name: string;
-	private maintenanceIntervalRef: NodeJS.Timer | undefined;
+	private maintenanceIntervalRef: ReturnType<typeof setInterval> | undefined;
 	private isMaintenanceRunning = false;
 	private options: QueueConfiguration;
 

yarn.lock

@@ -23707,9 +23707,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"canvas@link:./.yarn/joplin-empty-package/::locator=root%40workspace%3A.":
+"canvas@link:./.yarn/joplin-missing-package/::locator=root%40workspace%3A.":
   version: 0.0.0-use.local
-  resolution: "canvas@link:./.yarn/joplin-empty-package/::locator=root%40workspace%3A."
+  resolution: "canvas@link:./.yarn/joplin-missing-package/::locator=root%40workspace%3A."
   languageName: node
   linkType: soft