Merge from vscode merge-base (#22780)

* Revert "Revert "Merge from vscode merge-base (#22769)" (#22779)"

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci

extensions/ipynb/.gitignore

@@ -2,3 +2,4 @@ out
 dist
 node_modules
 *.vsix
+notebook-out

extensions/ipynb/.vscodeignore

@@ -6,4 +6,4 @@ extension.webpack.config.js
 extension-browser.webpack.config.js
 yarn.lock
 .gitignore
-
+esbuild.js

extensions/ipynb/esbuild.js

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+//@ts-check
+
+const path = require('path');
+const fse = require('fs-extra');
+const esbuild = require('esbuild');
+
+const args = process.argv.slice(2);
+
+const isWatch = args.indexOf('--watch') >= 0;
+
+let outputRoot = __dirname;
+const outputRootIndex = args.indexOf('--outputRoot');
+if (outputRootIndex >= 0) {
+	outputRoot = args[outputRootIndex + 1];
+}
+
+const srcDir = path.join(__dirname, 'src');
+const outDir = path.join(outputRoot, 'notebook-out');
+
+async function build() {
+	await esbuild.build({
+		entryPoints: [
+			path.join(srcDir, 'cellAttachmentRenderer.ts'),
+		],
+		bundle: true,
+		minify: false,
+		sourcemap: false,
+		format: 'esm',
+		outdir: outDir,
+		platform: 'browser',
+		target: ['es2020'],
+	});
+}
+
+
+build().catch(() => process.exit(1));
+
+if (isWatch) {
+	const watcher = require('@parcel/watcher');
+	watcher.subscribe(srcDir, () => {
+		return build();
+	});
+}

extensions/ipynb/package.json

@@ -52,6 +52,16 @@
 				"priority": "default"
 			}
 		],
+    "notebookRenderer": [
+      {
+        "id": "vscode.markdown-it-cell-attachment-renderer",
+        "displayName": "Markdown it ipynb Cell Attachment renderer",
+        "entrypoint": {
+          "extends": "vscode.markdown-it-renderer",
+          "path": "./notebook-out/cellAttachmentRenderer.js"
+        }
+      }
+    ],
 		"menus": {
 			"file/newFile": [
 				{
@@ -71,8 +81,9 @@
 		}
 	},
 	"scripts": {
-		"compile": "npx gulp compile-extension:ipynb",
-		"watch": "npx gulp watch-extension:ipynb"
+		"compile": "npx gulp compile-extension:ipynb && npm run build-notebook",
+		"watch": "npx gulp watch-extension:ipynb",
+		"build-notebook": "node ./esbuild"
 	},
 	"dependencies": {
 		"@enonic/fnv-plus": "^1.3.0",
@@ -81,6 +92,7 @@
 	},
 	"devDependencies": {
 		"@jupyterlab/nbformat": "^3.2.9",
+		"@types/markdown-it": "12.2.3",
 		"@types/uuid": "^8.3.1"
 	},
 	"repository": {

extensions/ipynb/src/cellAttachmentRenderer.ts

@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import type * as MarkdownIt from 'markdown-it';
+import type * as MarkdownItToken from 'markdown-it/lib/token';
+import type { RendererContext } from 'vscode-notebook-renderer';
+
+interface MarkdownItRenderer {
+	extendMarkdownIt(fn: (md: MarkdownIt) => void): void;
+}
+
+export async function activate(ctx: RendererContext<void>) {
+	const markdownItRenderer = (await ctx.getRenderer('vscode.markdown-it-renderer')) as MarkdownItRenderer | any;
+	if (!markdownItRenderer) {
+		throw new Error(`Could not load 'vscode.markdown-it-renderer'`);
+	}
+
+	markdownItRenderer.extendMarkdownIt((md: MarkdownIt) => {
+		const original = md.renderer.rules.image;
+		md.renderer.rules.image = (tokens: MarkdownItToken[], idx: number, options, env, self) => {
+			const token = tokens[idx];
+			const src = token.attrGet('src');
+			const attachments: Record<string, Record<string, string>> = env.outputItem.metadata?.custom?.attachments; // this stores attachment entries for every image in the cell
+			if (attachments && src) {
+				const imageAttachment = attachments[src.replace('attachment:', '')];
+				if (imageAttachment) {
+					// objEntries will always be length 1, with objEntries[0] holding [0]=mime,[1]=b64
+					// if length = 0, something is wrong with the attachment, mime/b64 weren't copied over
+					const objEntries = Object.entries(imageAttachment);
+					if (objEntries.length) {
+						const [attachmentKey, attachmentVal] = objEntries[0];
+						const b64Markdown = 'data:' + attachmentKey + ';base64,' + attachmentVal;
+						token.attrSet('src', b64Markdown);
+					}
+				}
+			}
+
+			if (original) {
+				return original(tokens, idx, options, env, self);
+			} else {
+				return self.renderToken(tokens, idx, options);
+			}
+		};
+	});
+}

extensions/ipynb/yarn.lock

@@ -8,21 +8,39 @@
   integrity sha512-BCN9uNWH8AmiP7BXBJqEinUY9KXalmRzo+L0cB/mQsmFfzODxwQrbvxCHXUNH2iP+qKkWYtB4vyy8N62PViMFw==
 
 "@jupyterlab/nbformat@^3.2.9":
-  version "3.2.9"
-  resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.2.9.tgz#e7d854719612133498af4280d9a8caa0873205b0"
-  integrity sha512-WSf9OQo8yfFjyodbXRdFoaNwMkaAL5jFZiD6V2f8HqI380ipansWrrV7R9CGzPfgKHpUGZMO1tYKmUwzMhvZ4w==
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/@jupyterlab/nbformat/-/nbformat-3.4.3.tgz#cbab1bf507677b7f0f309d8353fc83fe5a973c82"
+  integrity sha512-i/yADrwhhAJJCUOTa+fEBMyJO7fvX9Y73I0B7V6dQhGcrmrEKLC3wk4yOo63+jRntd5+dupbiOtz3w1ncIXwIA==
   dependencies:
-    "@lumino/coreutils" "^1.5.3"
+    "@lumino/coreutils" "^1.11.0"
 
-"@lumino/coreutils@^1.5.3":
+"@lumino/coreutils@^1.11.0":
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/@lumino/coreutils/-/coreutils-1.12.0.tgz#fbdef760f736eaf2bd396a5c6fc3a68a4b449b15"
   integrity sha512-DSglh4ylmLi820CNx9soJmDJCpUgymckdWeGWuN0Ash5g60oQvrQDfosVxEhzmNvtvXv45WZEqSBzDP6E5SEmQ==
 
+"@types/linkify-it@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
+  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
+
+"@types/markdown-it@12.2.3":
+  version "12.2.3"
+  resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
+  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==
+  dependencies:
+    "@types/linkify-it" "*"
+    "@types/mdurl" "*"
+
+"@types/mdurl@*":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9"
+  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==
+
 "@types/uuid@^8.3.1":
-  version "8.3.1"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f"
-  integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==
+  version "8.3.4"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
+  integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
 
 detect-indent@^6.0.0:
   version "6.1.0"