Merge branch 'main' into patch-3

Author: atsansone

.github/workflows/codeql-analysis.yml

@@ -33,7 +33,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571
+        uses: github/codeql-action/init@05963f47d870e2cb19a537396c1f668a348c7d8f
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -44,7 +44,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571
+        uses: github/codeql-action/autobuild@05963f47d870e2cb19a537396c1f668a348c7d8f
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -58,4 +58,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571
+        uses: github/codeql-action/analyze@05963f47d870e2cb19a537396c1f668a348c7d8f

.github/workflows/scorecards-analysis.yml

@@ -49,6 +49,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571
+        uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f
         with:
           sarif_file: results.sarif

eleventy.config.js

@@ -91,6 +91,7 @@ export default function (eleventyConfig) {
 
   eleventyConfig.addPassthroughCopy('src/content/assets/dash');
   eleventyConfig.addPassthroughCopy('src/content/assets/js');
+  eleventyConfig.addPassthroughCopy({'site-shared/packages/inject_dartpad/lib/inject_dartpad.js': 'assets/js/inject_dartpad.js'});
   eleventyConfig.addPassthroughCopy('src/content/assets/img', { expand: true });
   eleventyConfig.addPassthroughCopy('src/content/f', {
     expand: true,

package.json

@@ -23,19 +23,19 @@
   },
   "devDependencies": {
     "@11ty/eleventy": "3.0.0-alpha.5",
-    "firebase-tools": "^13.4.0",
+    "firebase-tools": "^13.5.2",
     "hast-util-from-html": "^2.0.1",
     "hast-util-select": "^6.0.2",
     "hast-util-to-text": "^4.0.0",
     "html-minifier-terser": "^7.2.0",
     "js-yaml": "^4.1.0",
-    "markdown-it": "^14.0.0",
+    "markdown-it": "^14.1.0",
     "markdown-it-anchor": "^8.6.7",
     "markdown-it-attrs": "^4.1.6",
     "markdown-it-container": "^4.0.0",
     "markdown-it-deflist": "^3.0.0",
     "markdown-it-table": "^4.1.1",
-    "sass": "^1.71.1",
-    "shiki": "^1.1.7"
+    "sass": "^1.72.0",
+    "shiki": "^1.2.0"
   }
 }

pnpm-lock.yaml

@@ -80,12 +80,9 @@ function _highlight(
   language,
   attributeString,
 ) {
-  // Don't customize or highlight DartPad snippets
-  // so that inject_embed can convert them.
-  if (language.includes('-dartpad') || language.includes('file-')) {
-    return `<pre><code class="language-${language}">
-${markdown.utils.escapeHtml(content)}
-</code></pre>`;
+  // Specially handle DartPad snippets so that inject_embed can convert them.
+  if (language.includes('-dartpad')) {
+    return `<pre><code data-dartpad="true" data-embed="true" data-theme="light">${markdown.utils.escapeHtml(content)}</code></pre>`;
   }
 
   const attributes = _parseAttributes(attributeString);

site-shared

@@ -30,7 +30,6 @@ export const markdown = (() => {
     });
 
   _registerAsides(markdown);
-  _registerContainers(markdown);
 
   return markdown;
 })();
@@ -100,25 +99,3 @@ function _registerAsides(markdown) {
 
   _registerAside(markdown, 'secondary', null, null, 'alert-secondary');
 }
-
-/**
- * Registers custom containers used on the site.
- *
- * @param {import('markdown-it/lib').MarkdownIt} markdown
- * @private
- */
-function _registerContainers(markdown) {
-  // TODO(parlough): Consider removing all usages of mini-toc.
-  markdown.use(markdownItContainer, 'mini-toc', {
-    render: function (tokens, index) {
-      if (tokens[index].nesting === 1) {
-        const header = /\s+(.*)/.exec(tokens[index].info)[1];
-        return `<div class="mini-toc">
-<h4 class="no_toc">${header}</h4>
-`;
-      } else {
-        return '</div>\n';
-      }
-    },
-  });
-}

src/_11ty/plugins/highlight.js

@@ -460,20 +460,6 @@ li.card {
   margin: 0 auto;
 }
 
-.mini-toc {
-  @extend .alert;
-  background-color: $gray-light;
-
-  h4 {
-    margin-top: 0;
-  }
-
-  ul {
-    padding-left: 1.5rem;
-    margin-bottom: 0;
-  }
-}
-
 .table {
   width: 100%;
   @extend .table-striped;
@@ -588,9 +574,15 @@ thead:has(th:empty) {
 .content > p {
   > i.material-symbols, > span.material-symbols {
     vertical-align: bottom;
+    user-select: none;
   }
 }
 
+// Make icons used in system requirements table unselectable.
+.system-support {
+  user-select: none;
+}
+
 // Overwrite bootstrap's breadcrumbs
 .breadcrumb {
   align-items: center;

src/_11ty/plugins/markdown.js

@@ -187,7 +187,7 @@ pre {
 }
 
 // Border and resizability for dartpad
-iframe[src^="https://dartpad"]:not(#try-dart-pad), iframe[src^="https://old-dartpad"] {
+iframe[src^="https://dartpad"]:not(#try-dart-pad) {
   border: 1px solid #ccc;
   margin-bottom: 1rem;
   min-height: 400px;

src/_sass/_site.scss

@@ -1,7 +1,7 @@
 ---
 title: "Asynchronous programming: futures, async, await"
 description: Learn about and practice writing asynchronous code in DartPad!
-js: [{url: 'https://old-dartpad-3ce3f.web.app/inject_embed.dart.js', defer: true}]
+js: [{url: '/assets/js/inject_dartpad.js', defer: true}]
 ---
 <?code-excerpt replace="/ *\/\/\s+ignore_for_file:[^\n]+\n//g; /(^|\n) *\/\/\s+ignore:[^\n]+\n/$1/g; /(\n[^\n]+) *\/\/\s+ignore:[^\n]+\n/$1\n/g"?>
 <?code-excerpt plaster="none"?>

src/_sass/components/_code.scss

@@ -1,7 +1,7 @@
 ---
 title: Dart cheatsheet codelab
 description: Interactively learn (or relearn) some of Dart's unique features.
-js: [{url: 'https://old-dartpad-3ce3f.web.app/inject_embed.dart.js', defer: true}]
+js: [{url: '/assets/js/inject_dartpad.js', defer: true}]
 ---
 <?code-excerpt replace="/ *\/\/\s+ignore_for_file:[^\n]+\n//g; /(^|\n) *\/\/\s+ignore:[^\n]+\n/$1/g; /(\n[^\n]+) *\/\/\s+ignore:[^\n]+\n/$1\n/g"?>
 

src/content/codelabs/async-await.md

@@ -1,7 +1,7 @@
 ---
 title: Iterable collections
 description: An interactive guide to using Iterable objects such as lists and sets.
-js: [{url: 'https://old-dartpad-3ce3f.web.app/inject_embed.dart.js', defer: true}]
+js: [{url: '/assets/js/inject_dartpad.js', defer: true}]
 ---
 <?code-excerpt replace="/ *\/\/\s+ignore_for_file:[^\n]+\n//g; /(^|\n) *\/\/\s+ignore:[^\n]+\n/$1/g; /(\n[^\n]+) *\/\/\s+ignore:[^\n]+\n/$1\n/g"?>
 <?code-excerpt plaster="none"?>