@tutorialkit-rb/cli 0.1.7 → 0.1.9

package/dist/index.js

@@ -14,7 +14,7 @@ import "yargs-parser";
 // package.json
 var package_default = {
   name: "@tutorialkit-rb/cli",
-  version: "0.1.7",
+  version: "0.1.9",
   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.7",
+  "version": "0.1.9",
   "description": "Interactive tutorials powered by WebContainer API",
   "author": "StackBlitz Inc.",
   "type": "module",

package/template/bin/build-pack

@@ -7,7 +7,7 @@ set -e
 #
 # This is the fast path (~30s) compared to the monolithic `bin/build-wasm`
 # (~5-20min). Requires a pre-built base binary (from bin/build-ruby-base
-# or the @tutorialkit-rb/ruby-3.3 npm package).
+# or downloaded from GitHub Releases).
 #
 # Usage: ./bin/build-pack
 
@@ -38,12 +38,34 @@ if [ -f "$RUBY_WASM_DIR/dist/ruby-base.wasm" ]; then
   echo "  Found: local build (dist/ruby-base.wasm)"
 fi
 
-# 2. npm package fallback
+# 2. GitHub Releases fallback
 if [ -z "$BASE_WASM" ]; then
-  NPM_BASE="$RUBY_WASM_DIR/node_modules/@tutorialkit-rb/ruby-3.3/dist/ruby-base.wasm"
-  if [ -f "$NPM_BASE" ]; then
-    BASE_WASM="$NPM_BASE"
-    echo "  Found: @tutorialkit-rb/ruby-3.3 npm package"
+  echo "  Not found locally, downloading from GitHub Releases..."
+  DOWNLOAD_DIR="$RUBY_WASM_DIR/dist"
+  mkdir -p "$DOWNLOAD_DIR"
+  DOWNLOAD_PATH="$DOWNLOAD_DIR/ruby-base.wasm"
+
+  REPO="Bakaface/tutorialkit.rb"
+
+  if command -v gh &> /dev/null; then
+    TAG=$(gh release list --repo "$REPO" --json tagName --jq '[.[] | select(.tagName | startswith("ruby-base-"))][0].tagName' 2>/dev/null)
+
+    if [ -n "$TAG" ]; then
+      echo "  Release: $TAG"
+      gh release download "$TAG" --repo "$REPO" --pattern "ruby-base.wasm" --dir "$DOWNLOAD_DIR" --clobber 2>/dev/null
+
+      # Also download rbconfig if not present locally
+      RBCONFIG_DIR="$RUBY_WASM_DIR/rbconfig/wasm32-wasi"
+      if [ ! -f "$RBCONFIG_DIR/rbconfig.rb" ]; then
+        mkdir -p "$RBCONFIG_DIR"
+        gh release download "$TAG" --repo "$REPO" --pattern "rbconfig.rb" --dir "$RBCONFIG_DIR" --clobber 2>/dev/null
+      fi
+    fi
+  fi
+
+  if [ -f "$DOWNLOAD_PATH" ]; then
+    BASE_WASM="$DOWNLOAD_PATH"
+    echo "  Downloaded from GitHub Releases"
   fi
 fi
 
@@ -51,7 +73,7 @@ if [ -z "$BASE_WASM" ]; then
   echo
   echo "Error: No base WASM binary found."
   echo "Either run 'bin/build-ruby-base' to build one,"
-  echo "or install @tutorialkit-rb/ruby-3.3 npm package."
+  echo "or ensure a ruby-base release exists on GitHub."
   exit 1
 fi
 

package/template/package.json

@@ -22,8 +22,8 @@
     "@codemirror/lang-yaml": "^6.1.2",
     "@codemirror/legacy-modes": "^6.5.1",
     "@nanostores/react": "0.7.2",
-    "@tutorialkit-rb/react": "0.1.7",
-    "@tutorialkit-rb/runtime": "0.1.7",
+    "@tutorialkit-rb/react": "0.1.9",
+    "@tutorialkit-rb/runtime": "0.1.9",
     "nanostores": "^0.10.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1"
@@ -31,9 +31,9 @@
   "devDependencies": {
     "@astrojs/check": "^0.7.0",
     "@astrojs/react": "^3.6.0",
-    "@tutorialkit-rb/astro": "0.1.7",
-    "@tutorialkit-rb/theme": "0.1.7",
-    "@tutorialkit-rb/types": "0.1.7",
+    "@tutorialkit-rb/astro": "0.1.9",
+    "@tutorialkit-rb/theme": "0.1.9",
+    "@tutorialkit-rb/types": "0.1.9",
     "@types/mdast": "^4.0.4",
     "@types/node": "^20.14.6",
     "@types/react": "^18.3.3",

package/template/ruby-wasm/bin/pack-gems

@@ -78,28 +78,18 @@ def find_rbconfig
   shipped = File.join(SCRIPT_DIR, "rbconfig", "wasm32-wasi", "rbconfig.rb")
   return shipped if File.exist?(shipped)
 
-  # 2. From @tutorialkit-rb/ruby-3.3 npm package
-  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
-                      "rbconfig", "wasm32-wasi", "rbconfig.rb")
-  return npm_pkg if File.exist?(npm_pkg)
-
-  # 3. Fallback: generated by a previous base binary build
+  # 2. Fallback: generated by a previous base binary build
   Dir.glob(File.join(SCRIPT_DIR, "rubies", "*/usr/local/lib/ruby/*/wasm32-wasi/rbconfig.rb")).first
 end
 
 def find_base_wasm
-  # 1. Locally-built custom binary (from bin/build-ruby-base)
+  # Locally-built or downloaded binary (from bin/build-ruby-base or GitHub Releases)
   local = File.join(SCRIPT_DIR, "dist", "ruby-base.wasm")
   return local if File.exist?(local)
 
-  # 2. From @tutorialkit-rb/ruby-3.3 npm package
-  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
-                      "dist", "ruby-base.wasm")
-  return npm_pkg if File.exist?(npm_pkg)
-
   $stderr.puts "Error: No base WASM binary found."
   $stderr.puts "Either run 'bin/build-ruby-base' to build a custom binary,"
-  $stderr.puts "or install @tutorialkit-rb/ruby-3.3 npm package."
+  $stderr.puts "or run 'bin/build-pack' which downloads from GitHub Releases."
   exit 1
 end
 
@@ -111,12 +101,7 @@ def find_usr_dir
     return path if Dir.exist?(path)
   end
 
-  # 2. From @tutorialkit-rb/ruby-3.3 npm package
-  npm_pkg = File.join(SCRIPT_DIR, "node_modules", "@tutorialkit-rb", "ruby-3.3",
-                      "rubies", "usr")
-  return npm_pkg if Dir.exist?(npm_pkg)
-
-  # 3. Fallback: glob for the rubies/ directory left by rbwasm
+  # 2. Fallback: glob for the rubies/ directory left by rbwasm
   candidates = Dir.glob(File.join(SCRIPT_DIR, "rubies", "ruby-3.3-wasm32-unknown-wasip1-full-*", "usr"))
   return candidates.first if candidates.any?
 
@@ -133,7 +118,7 @@ rbconfig_path = find_rbconfig
 unless rbconfig_path
   $stderr.puts "Error: Could not find rbconfig.rb for cross-compilation"
   $stderr.puts "Expected at: rbconfig/wasm32-wasi/rbconfig.rb"
-  $stderr.puts "Or install @tutorialkit-rb/ruby-3.3 npm package."
+  $stderr.puts "Or run 'bin/build-ruby-base' to generate one."
   exit 1
 end
 puts "rbconfig: #{rbconfig_path}"
@@ -149,7 +134,7 @@ if usr_dir
 else
   $stderr.puts "Warning: Could not find usr/ directory for /usr mapping."
   $stderr.puts "  The packed binary may be missing Ruby stdlib at /usr."
-  $stderr.puts "  Run 'bin/build-ruby-base' or install @tutorialkit-rb/ruby-3.3."
+  $stderr.puts "  Run 'bin/build-ruby-base' to generate it."
 end
 puts
 

package/template/ruby-wasm/package.json

@@ -1,6 +1,3 @@
 {
-  "private": true,
-  "optionalDependencies": {
-    "@tutorialkit-rb/ruby-3.3": "^3.3.0"
-  }
+  "private": true
 }