feat: move build to default directory, add sitemap (resolves fluid-pr…

…oject#254) (fluid-project#257)

.dockerignore

@@ -1,3 +1,3 @@
 .git
 node_modules
-out
+_site

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
       HEADLESS: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: node_modules
           key: ${{ runner.OS }}-build-${{ hashFiles('**/package-lock.json') }}

.gitignore

@@ -1,4 +1,3 @@
-/node_modules/
-/dist/
-*~
-.project
+.DS_Store
+_site
+node_modules

Dockerfile

@@ -2,17 +2,16 @@ FROM node:18-alpine AS builder
 
 WORKDIR /app
 
-RUN apk add --no-cache git 
-
 COPY package.json ./
 
+RUN apk add --no-cache git
+
 RUN npm install
 
 COPY . ./
 
-RUN echo | npm run build
-
+RUN npm run build
 
 FROM nginx:1.18.0-alpine
 
-COPY --from=builder /app/out /usr/share/nginx/html
+COPY --from=builder /app/_site /usr/share/nginx/html

eleventy.config.js

@@ -78,8 +78,7 @@ module.exports = function (eleventyConfig) {
 
     return {
         dir: {
-            input: "src",
-            output: "dist"
+            input: "src"
         }
     };
 };

netlify.toml

@@ -1,11 +1,11 @@
 [build]
   command = "npm run build"
-  publish = "dist"
+  publish = "_site"
   ignore = "git log -1 --pretty=%B | grep dependabot"
 
 [dev]
   command = "npm run start"
   targetPort = 8080
-  publish = "dist"
+  publish = "_site"
   autoLaunch = false
   framework = "#custom"

package.json

@@ -8,7 +8,7 @@
         "start": "npm-run-all -l clean dev",
         "build": "npm-run-all -l clean build:*",
         "build:eleventy": "cross-env ELEVENTY_ENV=production eleventy",
-        "clean": "npx rimraf dist",
+        "clean": "rimraf _site",
         "dev": "cross-env ELEVENTY_ENV=development eleventy --serve",
         "lint": "fluid-lint-all",
         "pretest": "npm run build",

src/_data/site.js

@@ -0,0 +1,5 @@
+"use strict";
+
+module.exports = {
+    url: process.env.DEPLOY_PRIME_URL || "http://localhost:8080"
+};

src/robots.njk

@@ -0,0 +1,11 @@
+---
+permalink: /robots.txt
+eleventyExcludeFromCollections: true
+---
+Sitemap: {{ site.url }}/sitemap.xml
+
+User-Agent: *
+Disallow: /404.html
+
+User-agent: GPTBot
+Disallow: /

src/scripts/create-search-digest.js

@@ -194,7 +194,7 @@ fluid.docs.search.digester.stripTags = function (rawHTML) {
 fluid.defaults("fluid.docs.search.digester", {
     gradeNames: ["fluid.component"],
     documentsRoot: "%infusion-docs/src/documents",
-    outputPath: "%infusion-docs/dist/js/search-digest.js",
+    outputPath: "%infusion-docs/_site/js/search-digest.js",
     outputTemplate: "(function (fluid) {\n    \"use strict\";\n    fluid.registerNamespace(\"fluid.docs.search\");\n    fluid.docs.search.digest = %digest;\n\n fluid.docs.search.index = %index; \n})(fluid);\n",
     members: {
         digestBlocks: []

src/sitemap.njk

@@ -0,0 +1,15 @@
+---
+permalink: /sitemap.xml
+eleventyExcludeFromCollections: true
+---
+<?xml version="1.0" encoding="utf-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+	{% for page in collections.all %}
+	{%- if page.url -%}
+	<url>
+		<loc>{{ site.url }}{{ page.url | url }}</loc>
+		<lastmod>{{ page.date.toISOString() }}</lastmod>
+	</url>
+	{% endif -%}
+	{%- endfor -%}
+</urlset>

tests/browser/test-search-manipulation.html

@@ -19,7 +19,7 @@
     <script type="text/javascript" src="../../node_modules/infusion/tests/test-core/utils/js/IoCTestUtils.js"></script>
 
     <script type="text/javascript" src="../../node_modules/lunr/lunr.js"></script>
-    <script type="text/javascript" src="../../dist/js/search-digest.js"></script>
+    <script type="text/javascript" src="../../_site/js/search-digest.js"></script>
     <script type="text/javascript" src="../../src/static/js/search-string-parser.js"></script>
     <script type="text/javascript" src="../../src/static/js/search.js"></script>
 

tests/browser/test-search-string-parser.html

@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../../node_modules/fluid-binder/src/js/transforms.js"></script>
     <script type="text/javascript" src="../../node_modules/fluid-binder/src/js/binder.js"></script>
     <script type="text/javascript" src="../../node_modules/fluid-location-bar-relay/src/js/locationBar.js"></script>
-    <script type="text/javascript" src="../../dist/js/search-digest.js"></script>
+    <script type="text/javascript" src="../../_site/js/search-digest.js"></script>
     <script type="text/javascript" src="../../src/static/js/search-string-parser.js"></script>
 
     <!-- QUnit/jqUnit dependencies -->

tests/browser/test-search.html

@@ -23,7 +23,7 @@
     <script type="text/javascript" src="../../node_modules/fluid-binder/src/js/binder.js"></script>
     <script type="text/javascript" src="../../node_modules/fluid-location-bar-relay/src/js/locationBar.js"></script>
     <script type="text/javascript" src="../../node_modules/lunr/lunr.js"></script>
-    <script type="text/javascript" src="../../dist/js/search-digest.js"></script>
+    <script type="text/javascript" src="../../_site/js/search-digest.js"></script>
     <script type="text/javascript" src="../../src/static/js/search-string-parser.js"></script>
     <script type="text/javascript" src="../../src/static/js/search.js"></script>