From 0e5ddcc9b8d81901a7ab5fb5c3e7d25446cc11ea Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:00:53 -0500
Subject: [PATCH 1/5] Add note about trying out Polaris

---
 .../app/components/prose/highlight.ts         |  4 +++-
 .../docs/1-introduction/1-basics/prose.md     | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/apps/tutorial/app/components/prose/highlight.ts b/apps/tutorial/app/components/prose/highlight.ts
index 756338594..ac3a9a43d 100644
--- a/apps/tutorial/app/components/prose/highlight.ts
+++ b/apps/tutorial/app/components/prose/highlight.ts
@@ -13,13 +13,14 @@ export async function getHighlighter(): Promise<HLJSApi> {
    * since we now use hljs on initial page load, eagerly, we want to load
    * as little as possible
    */
-  let [hljs, glimmer, javascript, typescript, markdown, css] = await Promise.all([
+  let [hljs, glimmer, javascript, typescript, markdown, css, bash] = await Promise.all([
     import('highlight.js/lib/core'),
     import('highlightjs-glimmer'),
     import('highlight.js/lib/languages/javascript'),
     import('highlight.js/lib/languages/typescript'),
     import('highlight.js/lib/languages/markdown'),
     import('highlight.js/lib/languages/css'),
+    import('highlight.js/lib/languages/bash'),
   ]);
 
   HIGHLIGHT = hljs.default;
@@ -27,6 +28,7 @@ export async function getHighlighter(): Promise<HLJSApi> {
   HIGHLIGHT.registerLanguage('typescript', typescript.default);
   HIGHLIGHT.registerLanguage('markdown', markdown.default);
   HIGHLIGHT.registerLanguage('css', css.default);
+  HIGHLIGHT.registerLanguage('bash', bash.default);
 
   glimmer.setup(HIGHLIGHT);
 
diff --git a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
index d73bcf3c3..b1e0f0acd 100644
--- a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
+++ b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
@@ -124,3 +124,25 @@ However, because there are a number of more foundational concepts to cover, this
 [Signals]: https://www.solidjs.com/tutorial/introduction_signals
 [Runes]: https://svelte.dev/blog/runes 
 [tracked]: https://guides.emberjs.com/release/components/component-state-and-actions/#toc_tracked-properties
+
+## How do I get started with a bleeding-edge Ember app today?
+
+- For Webpack:
+  ```bash
+  git clone --branch webpack git@github.com:NullVoxPopuli/polaris-starter.git 
+  cd polaris-starter
+  pnpm install
+  pnpm start
+  ```
+  Or try it out on [Stackblitz](https://stackblitz.com/github/nullVoxPopuli/polaris-starter/tree/webpack?file=README.md) (however, Stackblitz may be [broken with Webpack](https://github.com/stackblitz/core/issues/2926) atm)
+
+
+- For Vite (alpha / unstable)
+  ```bash
+  git clone git@github.com:NullVoxPopuli/polaris-starter.git 
+  cd polaris-starter
+  pnpm install
+  pnpm start
+  ```
+  Or try it out on [Stackblitz](https://stackblitz.com/github/nullVoxPopuli/polaris-starter/tree/main?file=README.md)
+

From 791cab422cb9e21d609328bb7d726d5f6eb86748 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:33:38 -0500
Subject: [PATCH 2/5] Update prose.md

---
 apps/tutorial/public/docs/1-introduction/1-basics/prose.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
index b1e0f0acd..cd1d84af3 100644
--- a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
+++ b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
@@ -107,6 +107,7 @@ If you're an existing ember/glimmer user and are not yet using `<template>`, the
   For more information on "using anything as values", see [these docs](https://guides.emberjs.com/release/in-depth-topics/rendering-values/)
 
 
+<<<<<<< HEAD
 ## Why does the tutorial use `cell`?, I'm not using that in my projects.
 
 Not to worry!, `@tracked` is not going away. `cell`s are a fundamental primitive of reactivity as no reactive state can exist without them.  
@@ -136,7 +137,6 @@ However, because there are a number of more foundational concepts to cover, this
   ```
   Or try it out on [Stackblitz](https://stackblitz.com/github/nullVoxPopuli/polaris-starter/tree/webpack?file=README.md) (however, Stackblitz may be [broken with Webpack](https://github.com/stackblitz/core/issues/2926) atm)
 
-
 - For Vite (alpha / unstable)
   ```bash
   git clone git@github.com:NullVoxPopuli/polaris-starter.git 

From 06e79506af1990382b2e8954c9fa395ef8b7cd0e Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 5 Mar 2024 14:51:51 -0500
Subject: [PATCH 3/5] dedupe

---
 pnpm-lock.yaml | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 26ec1bc95..4fb9e8b88 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -2591,6 +2591,28 @@ packages:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/core@7.23.9:
+    resolution: {integrity: sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.23.5
+      '@babel/generator': 7.23.6
+      '@babel/helper-compilation-targets': 7.23.6
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helpers': 7.24.0
+      '@babel/parser': 7.24.0
+      '@babel/template': 7.24.0
+      '@babel/traverse': 7.24.0
+      '@babel/types': 7.24.0
+      convert-source-map: 2.0.0
+      debug: 4.3.4(supports-color@9.4.0)
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 6.3.1
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/core@7.24.0:
     resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
@@ -2751,6 +2773,19 @@ packages:
     dependencies:
       '@babel/types': 7.24.0
 
+  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.9):
+    resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/core': 7.23.9
+      '@babel/helper-environment-visitor': 7.22.20
+      '@babel/helper-module-imports': 7.22.15
+      '@babel/helper-simple-access': 7.22.5
+      '@babel/helper-split-export-declaration': 7.22.6
+      '@babel/helper-validator-identifier': 7.22.20
+
   /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
@@ -4476,7 +4511,7 @@ packages:
     resolution: {integrity: sha512-JVWCy+l6sX58tPYb8Q8BSK0i8rQzrVI0RFoilSZ9MP4MO/rk90XAXZHN8Ourr9lwJhSLBbc7KSMDh54FNGxnsg==}
     engines: {node: 12.* || 14.* || >= 16}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/parser': 7.24.0
       '@babel/traverse': 7.24.0
       '@embroider/macros': 1.13.5(@glint/template@1.3.0)

From 5be9d1efcea32b192864bcf4feaa408fddb97276 Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:48:08 -0500
Subject: [PATCH 4/5] whoops

---
 apps/tutorial/public/docs/1-introduction/1-basics/prose.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
index cd1d84af3..367fd7789 100644
--- a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
+++ b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
@@ -107,7 +107,6 @@ If you're an existing ember/glimmer user and are not yet using `<template>`, the
   For more information on "using anything as values", see [these docs](https://guides.emberjs.com/release/in-depth-topics/rendering-values/)
 
 
-<<<<<<< HEAD
 ## Why does the tutorial use `cell`?, I'm not using that in my projects.
 
 Not to worry!, `@tracked` is not going away. `cell`s are a fundamental primitive of reactivity as no reactive state can exist without them.  

From 51a99b3789414b6be3d0f7878293b987ac4817fe Mon Sep 17 00:00:00 2001
From: NullVoxPopuli <199018+NullVoxPopuli@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:08:35 -0500
Subject: [PATCH 5/5] Fix link, mention CTP

---
 apps/tutorial/public/docs/1-introduction/1-basics/prose.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
index 367fd7789..2b629317f 100644
--- a/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
+++ b/apps/tutorial/public/docs/1-introduction/1-basics/prose.md
@@ -53,9 +53,13 @@ However, manually typing in the editor for each example is a more effective way
 
 On smaller screens, there is a button in the bottom right of the screen so that slides the tutorial text out of the way so that the editor can be interacted with.
 
+<p class="call-to-play">
+  Callouts like these will be present in tutorials to guide focus, and be clear about what you're expected to do in a particular exercise.
+</p>
+
 This entire app is generated from [the docs folder][the-docs] and content can be edited, previewed, and created all within the GitHub UI. No need to download or install anything to contribute.
 
-[the-docs]: https://github.com/NullVoxPopuli/limber/tree/main/apps/tutorial/docs
+[the-docs]: https://github.com/NullVoxPopuli/limber/tree/main/apps/tutorial/public/docs
 
 ## What are components?