@tutorialkit-rb/cli 0.1.5 → 0.1.8

package/dist/index.js

@@ -14,7 +14,7 @@ import "yargs-parser";
 // package.json
 var package_default = {
   name: "@tutorialkit-rb/cli",
-  version: "0.1.5",
+  version: "0.1.8",
   description: "Interactive tutorials powered by WebContainer API",
   author: "StackBlitz Inc.",
   type: "module",
@@ -675,30 +675,32 @@ import path4 from "node:path";
 import * as prompts3 from "@clack/prompts";
 import chalk4 from "chalk";
 
-// src/commands/create/hosting-config/_headers.txt?raw
-var headers_default = "/*\n  Cross-Origin-Embedder-Policy: require-corp\n  Cross-Origin-Opener-Policy: same-origin\n";
+// src/commands/create/hosting-config/Dockerfile.txt?raw
+var Dockerfile_default = `# Minimal nginx image to serve pre-built static files
+# Build happens in GitHub Actions (with WASM caching), not here
 
-// src/commands/create/hosting-config/netlify_toml.txt?raw
-var netlify_toml_default = '[[headers]]\n  for = "/*"\n  [headers.values]\n    Cross-Origin-Embedder-Policy = "require-corp"\n    Cross-Origin-Opener-Policy = "same-origin"\n';
+FROM nginx:alpine
 
-// src/commands/create/hosting-config/vercel.json?raw
-var vercel_default = {
-  headers: [
-    {
-      source: "/(.*)",
-      headers: [
-        {
-          key: "Cross-Origin-Embedder-Policy",
-          value: "require-corp"
-        },
-        {
-          key: "Cross-Origin-Opener-Policy",
-          value: "same-origin"
-        }
-      ]
-    }
-  ]
-};
+# Copy pre-built site from GitHub Actions
+COPY dist /usr/share/nginx/html
+
+# Add required headers for WebContainers (SharedArrayBuffer support)
+RUN echo 'add_header Cross-Origin-Embedder-Policy "require-corp";' > /etc/nginx/conf.d/custom-headers.conf \\
+    && echo 'add_header Cross-Origin-Opener-Policy "same-origin";' >> /etc/nginx/conf.d/custom-headers.conf \\
+    && echo 'add_header Cross-Origin-Resource-Policy "cross-origin";' >> /etc/nginx/conf.d/custom-headers.conf
+
+EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]
+`;
+
+// src/commands/create/hosting-config/deploy_flyio_yml.txt?raw
+var deploy_flyio_yml_default = "name: Build and Deploy\n\non:\n  push:\n    branches: [main]\n  workflow_dispatch:\n\nconcurrency:\n  group: deploy\n  cancel-in-progress: false\n\njobs:\n  build:\n    runs-on: ubuntu-latest\n    steps:\n      - uses: actions/checkout@v4\n\n      - uses: actions-rust-lang/setup-rust-toolchain@v1\n        with:\n          toolchain: 1.74.0\n\n      - name: Install wasi-vfs\n        env:\n          WASI_VFS_VERSION: 0.5.4\n        run: |\n          curl -LO \"https://github.com/kateinoigakukun/wasi-vfs/releases/download/v${WASI_VFS_VERSION}/wasi-vfs-cli-x86_64-unknown-linux-gnu.zip\"\n          unzip wasi-vfs-cli-x86_64-unknown-linux-gnu.zip\n          mv wasi-vfs /usr/local/bin/wasi-vfs\n\n      - uses: ruby/setup-ruby@v1\n        env:\n          BUNDLE_GEMFILE: ruby-wasm/Gemfile\n          BUNDLE_PATH: ruby-wasm/vendor\n        with:\n          ruby-version: 3.3\n          bundler-cache: true\n\n      - uses: actions/setup-node@v4\n        with:\n          node-version: 20\n          cache: npm\n\n      - name: Cache ruby.wasm build artifacts\n        uses: actions/cache@v4\n        with:\n          path: |\n            ruby-wasm/build\n            ruby-wasm/rubies\n          key: ${{ runner.os }}-ruby-wasm-${{ hashFiles('ruby-wasm/Gemfile.lock') }}\n          restore-keys: |\n            ${{ runner.os }}-ruby-wasm-\n\n      - name: Build ruby.wasm\n        run: npm run build:wasm\n\n      - name: Build tutorial\n        run: |\n          npm install\n          npm run build\n\n      - name: Setup flyctl\n        if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'\n        uses: superfly/flyctl-actions/setup-flyctl@master\n\n      - name: Deploy to Fly.io\n        if: github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch'\n        run: flyctl deploy --local-only\n        env:\n          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}\n";
+
+// src/commands/create/hosting-config/fly_toml.txt?raw
+var fly_toml_default = "# Fly.io configuration\n# Update 'app' to your Fly.io app name after running: fly apps create <name>\napp = 'my-tutorial'\nprimary_region = 'sjc'\n\n[build]\n\n[http_service]\n  internal_port = 80\n  force_https = true\n  auto_stop_machines = 'stop'\n  auto_start_machines = true\n  min_machines_running = 0\n  processes = ['app']\n\n[[vm]]\n  size = 'shared-cpu-1x'\n";
+
+// src/commands/create/hosting-config/netlify_toml.txt?raw
+var netlify_toml_default = '[build]\n  publish = "./dist"\n  command = "# no build needed \u2014 CI handles the build"\n\n[[headers]]\n  for = "/*"\n  [headers.values]\n    Cross-Origin-Embedder-Policy = "require-corp"\n    Cross-Origin-Opener-Policy = "same-origin"\n';
 
 // src/commands/create/generate-hosting-config.ts
 async function generateHostingConfig(dest, flags) {
@@ -707,9 +709,11 @@ async function generateHostingConfig(dest, flags) {
     provider = await prompts3.select({
       message: "Select hosting providers for automatic configuration:",
       options: [
-        { value: "Vercel", label: "Vercel" },
         { value: "Netlify", label: "Netlify" },
-        { value: "Cloudflare", label: "Cloudflare" },
+        { value: "Fly.io", label: "Fly.io" },
+        // TODO: re-enable when full deployment pipelines are added
+        // { value: 'Vercel', label: 'Vercel' },
+        // { value: 'Cloudflare', label: 'Cloudflare' },
         { value: "skip", label: "Skip hosting configuration" }
       ],
       initialValue: DEFAULT_VALUES.provider
@@ -731,20 +735,20 @@ async function generateHostingConfig(dest, flags) {
   }
   let config;
   let filename;
+  let extraFiles;
   switch (provider.toLowerCase()) {
-    case "vercel": {
-      config = typeof vercel_default === "string" ? vercel_default : JSON.stringify(vercel_default, null, 2);
-      filename = "vercel.json";
-      break;
-    }
     case "netlify": {
       config = netlify_toml_default;
       filename = "netlify.toml";
       break;
     }
-    case "cloudflare": {
-      config = headers_default;
-      filename = "_headers";
+    case "fly.io": {
+      config = fly_toml_default;
+      filename = "fly.toml";
+      extraFiles = [
+        { filename: "Dockerfile", content: Dockerfile_default },
+        { filename: path4.join(".github", "workflows", "deploy.yml"), content: deploy_flyio_yml_default }
+      ];
       break;
     }
   }
@@ -756,7 +760,16 @@ async function generateHostingConfig(dest, flags) {
       task: async () => {
         const filepath = path4.join(resolvedDest, filename);
         fs3.writeFileSync(filepath, config);
-        return `Added ${filepath}`;
+        const added = [filepath];
+        if (extraFiles) {
+          for (const extra of extraFiles) {
+            const extraPath = path4.join(resolvedDest, extra.filename);
+            fs3.mkdirSync(path4.dirname(extraPath), { recursive: true });
+            fs3.writeFileSync(extraPath, extra.content);
+            added.push(extraPath);
+          }
+        }
+        return added.map((f) => `Added ${f}`).join("\n");
       }
     });
   }
@@ -1122,10 +1135,6 @@ function updatePackageJson(dest, projectName, flags, provider) {
   pkgJson.name = projectName;
   updateWorkspaceVersions(pkgJson.dependencies, TUTORIALKIT_VERSION);
   updateWorkspaceVersions(pkgJson.devDependencies, TUTORIALKIT_VERSION);
-  if (provider.toLowerCase() === "cloudflare") {
-    pkgJson.scripts = pkgJson.scripts || {};
-    pkgJson.scripts.postbuild = "cp _headers ./dist/";
-  }
   fs7.writeFileSync(pkgPath, JSON.stringify(pkgJson, null, 2));
   try {
     const pkgLockPath = path8.resolve(dest, "package-lock.json");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tutorialkit-rb/cli",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "description": "Interactive tutorials powered by WebContainer API",
   "author": "StackBlitz Inc.",
   "type": "module",

package/template/.claude/skills/rails-file-management/SKILL.md

@@ -0,0 +1,211 @@
+---
+name: rails-file-management
+description: |
+  Use this skill whenever organizing files for Rails tutorial lessons — _files/, _solution/,
+  templates, workspace paths. Trigger on: 'create _files', 'add _solution', 'template
+  inheritance', '.tk-config.json', 'extends path', 'workspace path', 'which files go where',
+  'add a gem', 'Gemfile', 'build-wasm', 'create a template', 'protected files', 'do not
+  override', or asking where to put Rails app code — even without mentioning file management.
+  Covers the three-layer merge model, built-in templates, `.tk-config.json` path formula for
+  different nesting depths, protected infrastructure files, and WASM gem build workflow. Do
+  NOT attempt file organization without this skill. Do NOT use for frontmatter (use
+  tutorial-lesson-config) or content hierarchy (use tutorial-content-structure).
+---
+
+# Rails File Management
+
+How to organize files across templates, `_files`, and `_solution` directories for Rails tutorial lessons.
+
+## The File Layering Model
+
+When a lesson loads, TutorialKit merges files from multiple sources in this order:
+
+```
+Template (base)        ← Runtime infrastructure, package.json, bin/, lib/
+  ↓ overlaid by
+_files/ (lesson)       ← Lesson-specific Rails app code
+  ↓ replaced on "Solve"
+_solution/ (lesson)    ← Completed/answer code
+```
+
+Files from each layer **overlay** the previous — same-path files are replaced, new files are added.
+
+**Two template mechanisms (don't confuse them):**
+- **`template` frontmatter field** (e.g., `template: default`) — selects which base template JSON is loaded as the "Template (base)" layer. Almost always set in the part's `meta.md`. The tutorial's root `meta.md` contains `rails-app`—a minimal demo app used in the tutotiral.
+- **`_files/.tk-config.json` with `extends`** — extends the `_files` layer with files from another template directory. These provide the source code that overlays on top of the template used. Use it to share many files between lessons. Otherwise, prefer duplication and the `template` frontmatter..
+
+IMPORTANT: Files added via the `template` frontmatter are not visible in the editor; only the `_files` contents (including `_files/.tk-config.json`'s contents) are shown in the editor.
+
+## Templates
+
+Templates live in `src/templates/` and provide the base project structure for WebContainer.
+
+### Built-in Templates
+
+| Template | Purpose | Inherits From |
+|----------|---------|---------------|
+| `default` | Base Rails WASM runtime — Node.js wrappers, Express server, PGLite, WASM loader. Selected via `template: default` in frontmatter (the default). | (none) |
+| `rails-app` | Pre-generated Rails app at `workspace/`. Update this template to set up the base Rails app for the tutorial | `default` |
+
+### Template Inheritance
+
+Templates can extend other templates via `.tk-config.json`:
+
+```json
+{
+  "extends": "../rails-app"
+}
+```
+
+The child template's files overlay on top of the parent's files.
+
+### Creating a New Template
+
+Create a directory under `src/templates/` with:
+
+1. A `.tk-config.json` extending the appropriate parent
+2. The files that differ from the parent
+
+**Example:** A template for a blog tutorial:
+
+```
+src/templates/blog-app/
+  .tk-config.json          → { "extends": "../rails-app" }
+  workspace/
+    app/
+      models/post.rb
+      controllers/posts_controller.rb
+      views/posts/
+        index.html.erb
+        show.html.erb
+    config/routes.rb
+    db/
+      migrate/001_create_posts.rb
+      seeds.rb
+```
+
+### What Belongs in a Template vs. a Lesson
+
+| In a Template | In a Lesson's `_files/` |
+|---------------|------------------------|
+| Shared app structure used by multiple lessons | Files specific to one lesson |
+| Models, migrations, seeds for a baseline state | Modifications the user will build upon |
+| Routes and config shared across a chapter | One-off configuration changes |
+| Complete working app states (scaffolded code) | Starter/skeleton files the user will complete |
+
+**Rule of thumb:** If 3+ lessons need the same base state, create a template. If only one lesson uses it, put it in `_files/`.
+
+## `_files/` Directory
+
+The `_files/` directory contains files shown to the user when the lesson loads. These are the **starting state** for the lesson.
+
+### Path Convention
+
+All Rails app files **must** live under `workspace/` to match the WASI preopen at `/workspace`:
+
+```
+_files/
+  workspace/
+    app/
+      controllers/
+        products_controller.rb
+      models/
+        product.rb
+      views/
+        products/
+          index.html.erb
+    config/
+      routes.rb
+```
+
+### `.tk-config.json` Path Formula
+
+The `extends` path in `.tk-config.json` is **relative to the directory containing the `.tk-config.json` file**. To reach `src/templates/<name>`, count the `../` segments based on your content nesting depth:
+
+| Content structure | `../` count | Example `extends` value |
+|-------------------|-------------|------------------------|
+| `tutorial/lesson/_files/` | 4 | `"../../../../templates/rails-app"` |
+| `tutorial/part/lesson/_files/` | 5 | `"../../../../../templates/rails-app"` |
+| `tutorial/part/chapter/lesson/_files/` | 6 | `"../../../../../../templates/rails-app"` |
+
+The count is: 1 (`_files/`) + 1 (lesson dir) + N (intermediate dirs: part, chapter) + 1 (`tutorial/`) + 1 (`content/`) = **4 + number of intermediate levels**.
+
+For the standard `tutorial/part/lesson/_files/` structure used by most Rails tutorials, the path is always `"../../../../../templates/<name>"` (5 segments).
+
+## `_solution/` Directory
+
+The `_solution/` directory contains the **completed code** for the lesson. When the user clicks "Solve", solution files replace the corresponding `_files/`.
+
+### Structure
+
+Mirror the `_files/` directory structure:
+
+```
+_solution/
+  workspace/
+    store/
+      app/
+        controllers/
+          products_controller.rb      ← completed version
+```
+
+### When to Use
+
+- **Code-editing lessons** where the user modifies files — provide the finished version
+- **Not needed** for terminal-only lessons (e.g., running `rails new`, using the console)
+
+### Tips
+
+- `_solution/` can include files not present in `_files/` (e.g., a new file the user was asked to create)
+- Only include files that differ from the template + `_files/` — unchanged files don't need to appear
+
+## Do Not Override These Files
+
+The following files are **runtime infrastructure** provided by the `default` template. Lessons should never include these in `_files/` or `_solution/`:
+
+| Path | Purpose |
+|------|---------|
+| `package.json` | npm dependencies (WASM runtime, Express, PGLite) |
+| `bin/rails`, `bin/ruby`, `bin/console`, `bin/rackup` | Node.js CLI wrappers |
+| `lib/rails.js`, `lib/server.js`, `lib/database.js` | WASM runtime, HTTP bridge, DB |
+| `lib/boot-progress.js`, `lib/commands.js`, `lib/irb.js` | Boot progress, command dispatch, IRB |
+| `lib/server/frame_location_middleware.js` | Express middleware for frame location |
+| `lib/patches/authentication.rb` | Auto-login patch |
+| `lib/patches/app_generator.rb` | Rails generator WASM compat patch |
+| `scripts/` | Build and automation scripts |
+| `pgdata/` | PGLite database storage |
+
+## Managing Gems
+
+### Adding Gems
+
+Gems are compiled into the WASM binary. To add a gem:
+
+1. Edit `ruby-wasm/Gemfile` in the project root
+2. Run `bin/build-wasm` to rebuild the WASM binary
+
+```ruby
+# ruby-wasm/Gemfile
+source "https://rubygems.org"
+
+gem "wasmify-rails", "~> 0.4.0"
+gem "rails", "~> 8.0.0"
+
+# Add your gems here
+gem "devise"              # Authentication
+gem "friendly_id"         # Slugs
+gem "pagy"                # Pagination
+```
+
+### Gem Constraints
+
+- **Pure Ruby gems** work without issues
+- **Gems with native C extensions** need WASM-compatible builds — many common ones are already shimmed (see `rails-wasm-author-constraints` skill)
+- Rebuilding the WASM binary takes several minutes
+- The resulting binary is ~80MB and includes all gems
+
+### Gemfile in Templates
+
+The `ruby-wasm/Gemfile` is the **single source of truth** for which gems are available. Individual lessons cannot add gems at runtime — the Gemfile is baked into the WASM binary at build time.
+
+If your tutorial teaches the user to "add a gem to the Gemfile", be aware that this is a **conceptual exercise** — the gem must already be compiled into the WASM binary for it to actually work when they run `bundle install`.