More versioning, milestone: Jekyll, Eleventy, and Hugo live editing

javascript-modules/engines/astro-engine/package.json

@@ -34,7 +34,6 @@
     "@astrojs/compiler": "^1.0.0 || ^2.0.0",
     "@bookshop/astro-bookshop": "3.10.1",
     "@bookshop/vite-plugin-astro-bookshop": "3.10.1",
-    "astro": "^4.15.12",
     "esbuild": "^0.19.1",
     "esbuild-sass-plugin": "^2.13.0",
     "postcss": "^8.4.29",
@@ -44,9 +43,10 @@
   },
   "peerDependencies": {
     "react": "^17.0.2 || ^18.0.0",
-    "react-dom": "^17.0.2 || ^18.0.0"
+    "react-dom": "^17.0.2 || ^18.0.0",
+    "astro": "^2.0.0 || ^3.0.0 || ^4.0.0"
   },
   "engines": {
     "node": ">=14.16"
   }
-}
+}

javascript-modules/engines/eleventy-engine/lib/engine.js

@@ -48,9 +48,13 @@ export class Engine {
                 async exists() {
                     return true
                 },
+                dirname(file) {
+                    return file.replace(/\/[^\/]+$/, "")
+                },
                 resolve(root, file, ext) {
                     return `${root}${file}`
-                }
+                },
+                sep: "/"
             }
         });
     }

javascript-modules/engines/jekyll-engine/lib/engine.js

@@ -54,9 +54,13 @@ export class Engine {
                 async exists() {
                     return true
                 },
+                dirname(file) {
+                    return file.replace(/\/[^\/]+$/, "")
+                },
                 resolve(root, file, ext) {
                     return `${root}${file}`
-                }
+                },
+                sep: "/"
             }
         });
     }

javascript-modules/integration-tests/features/eleventy/eleventy_bookshop_components.feature

@@ -25,7 +25,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Hello World"
 
   Scenario: Components are rendered from bookshop
@@ -41,7 +41,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Bookshop: Result 🤽‍♂️"
 
   Scenario: Nested components are rendered from bookshop
@@ -57,7 +57,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Bookshop: Result 🤽‍♂️"
 
   Scenario: Flat root components are rendered from bookshop
@@ -73,7 +73,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Bookshop: Result 🤽‍♂️"
 
   Scenario: Nested flat components are rendered from bookshop
@@ -89,7 +89,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Bookshop: Result 🤽‍♂️"
 
   Scenario: Standard components take precendence over flat components
@@ -109,7 +109,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Standard: Result 🤽‍♂️"
 
   Scenario: Components can use the page front matter
@@ -126,7 +126,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "Bookshop: Result 🛗"
 
   Scenario: Components can use further components
@@ -151,7 +151,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "<h1>🩳</h1>"
     And site/_site/index.html should contain the text "<span>🪣</span>"
 
@@ -172,7 +172,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "<h1>🧻</h1>"
     And site/_site/index.html should contain the text "<p>⛳</p>"
 
@@ -194,7 +194,7 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "🅰️🫀"
     And site/_site/index.html should contain the text "🅱️🫑"
 
@@ -221,6 +221,6 @@ Feature: Basic Eleventy Bookshop
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should contain the text "tag-contents-tag"
 

javascript-modules/integration-tests/features/eleventy/eleventy_bookshop_includes.feature

@@ -34,8 +34,8 @@ Feature: Eleventy Bookshop Includes
       """
     When I run "npm start" in the site directory
     Then stderr should be empty
-    And stdout should contain "v1.0.0"
+    And stdout should contain "v3.0.0"
     And site/_site/index.html should leniently contain each row:
-      | text |
+      | text                                        |
       | Component🎉 <!--bookshop-live end--> -Block |
-      | Site🎉 <!--bookshop-live end--> -Inline |
+      | Site🎉 <!--bookshop-live end--> -Inline     |