More work on example website setup.

Dockerfile

@@ -50,8 +50,9 @@ RUN make deps && make clean:dev
 COPY tasks/build-deps /app/tasks/build-deps
 RUN make build-deps && make clean:dev
 
-COPY tasks/app/static-site /app/tasks/app/
-RUN make app:static-site && make clean:dev
+COPY src/api-umbrella/example-website/package.json src/api-umbrella/example-website/yarn.lock /app/src/api-umbrella/example-website/
+COPY tasks/app-deps/example-website/yarn /app/tasks/app-deps/example-website/
+RUN make app-deps:example-website:yarn && make clean:dev
 
 COPY src/api-umbrella/admin-ui/.yarnrc src/api-umbrella/admin-ui/package.json src/api-umbrella/admin-ui/yarn.lock /app/src/api-umbrella/admin-ui/
 COPY tasks/app-deps/admin-ui/yarn /app/tasks/app-deps/admin-ui/
@@ -64,6 +65,10 @@ RUN make app-deps:web-app:yarn && make clean:dev
 COPY tasks/app-deps /app/tasks/app-deps
 RUN make app-deps && make clean:dev
 
+COPY src/api-umbrella/example-website /app/src/api-umbrella/example-website
+COPY tasks/app/example-website/build /app/tasks/app/example-website/
+RUN make app:example-website:build && make clean:dev
+
 COPY src/api-umbrella/web-app/assets /app/src/api-umbrella/web-app/assets
 COPY src/api-umbrella/web-app/webpack.config.js /app/src/api-umbrella/web-app/webpack.config.js
 COPY tasks/app/web-app/precompile /app/tasks/app/web-app/

Taskfile.yml

@@ -223,6 +223,20 @@ tasks:
     generates:
       - ./build/work/stamp/app-deps/admin-ui/yarn
 
+  app-deps:example-website:yarn:
+    deps:
+      - build-deps:yarn
+    cmds:
+      - ./tasks/app-deps/example-website/yarn
+    sources:
+      - ./build/work/stamp/build-deps/yarn
+      - ./src/api-umbrella/example-website/package.json
+      - ./src/api-umbrella/example-website/yarn.lock
+      - ./tasks/app-deps/example-website/yarn
+      - ./tasks/helpers.sh
+    generates:
+      - ./build/work/stamp/app-deps/example-website/yarn
+
   app-deps:lua:argparse:
     deps:
       - deps:luarocks
@@ -638,6 +652,7 @@ tasks:
   app-deps:
     cmds:
       - task: app-deps:admin-ui:yarn
+      - task: app-deps:example-website:yarn
       - task: app-deps:lua:argparse
       - task: app-deps:lua:bcrypt
       - task: app-deps:lua:cmsgpack
@@ -691,19 +706,36 @@ tasks:
   app:core:
     deps:
       - app:admin-ui:build
+      - app:example-website:build
       - app:locale
       - app:web-app:precompile
     cmds:
       - ./tasks/app/core
     sources:
       - ./build/work/stamp/app/admin-ui/build
+      - ./build/work/stamp/app/example-website/build
       - ./build/work/stamp/app/locale
       - ./build/work/stamp/app/web-app/precompile
       - ./tasks/app/core
       - ./tasks/helpers.sh
     generates:
       - ./build/work/stamp/app/core
 
+  app:example-website:build:
+    deps:
+      - app-deps:example-website:yarn
+    cmds:
+      - ./tasks/app/example-website/build
+    sources:
+      - ./build/work/stamp/app-deps/example-website/yarn
+      - ./src/api-umbrella/example-website/assets/**/*
+      - ./src/api-umbrella/example-website/content/**/*
+      - ./src/api-umbrella/example-website/layouts/**/*
+      - ./tasks/app/example-website/build
+      - ./tasks/helpers.sh
+    generates:
+      - ./build/work/stamp/app/example-website/build
+
   app:locale:
     deps:
       - app-deps:admin-ui:yarn
@@ -819,6 +851,7 @@ tasks:
   lint:js:
     deps:
       - app-deps:admin-ui:yarn
+      - app-deps:example-website:yarn
       - app-deps:web-app:yarn
     cmds:
       - ./tasks/lint/js

build/package_dependencies.sh

@@ -100,10 +100,6 @@ if [[ "$ID_NORMALIZED" == "rhel" ]]; then
     # For tests and building static site.
     ruby-devel
     rubygem-bundler
-
-    # For nokogiri dependency (for static-site and tests)
-    libxml2-devel
-    libxslt-devel
   )
   test_runtime_dependencies=(
     unbound
@@ -127,6 +123,10 @@ if [[ "$ID_NORMALIZED" == "rhel" ]]; then
 
     # Postgres Ruby client for tests
     libpq-devel
+
+    # For nokogiri dependency
+    libxml2-devel
+    libxslt-devel
   )
 
   if [[ "$VERSION_ID" == "7" ]]; then
@@ -253,10 +253,6 @@ elif [[ "$ID_NORMALIZED" == "debian" ]]; then
     ruby-dev
     ruby-bundler
 
-    # For nokogiri dependency (for static-site and tests)
-    libxml2-dev
-    libxslt-dev
-
     # lua-psl
     libpsl-dev
   )
@@ -282,6 +278,10 @@ elif [[ "$ID_NORMALIZED" == "debian" ]]; then
 
     # Postgres Ruby client for tests
     libpq-dev
+
+    # For nokogiri dependency
+    libxml2-dev
+    libxslt-dev
   )
 
   # Install GCC 7+ for compiling TrafficServer (C++17 required).

docker/dev/docker-entrypoint

@@ -32,6 +32,9 @@ ln -snf /build/test/tmp/run /app/test/tmp/run
 mkdir -p /app/build/work/tasks/app-deps/admin-ui/yarn/_persist/node_modules
 ln -snf /app/build/work/tasks/app-deps/admin-ui/yarn/_persist/node_modules /app/src/api-umbrella/admin-ui/node_modules
 
+mkdir -p /app/build/work/tasks/app-deps/example-website/yarn/_persist/node_modules
+ln -snf /app/build/work/tasks/app-deps/example-website/yarn/_persist/node_modules /app/src/api-umbrella/example-website/node_modules
+
 mkdir -p /app/build/work/tasks/app-deps/web-app/yarn/_persist/node_modules
 ln -snf /app/build/work/tasks/app-deps/web-app/yarn/_persist/node_modules /app/src/api-umbrella/web-app/node_modules
 

scripts/rake/outdated_packages.rb

@@ -5,10 +5,6 @@
 
 class OutdatedPackages
   REPOS = {
-    "api_umbrella_static_site" => {
-      :git => "https://github.com/NREL/api-umbrella-static-site.git",
-      :git_ref => "master",
-    },
     "glauth" => {
       :git => "https://github.com/glauth/glauth.git",
     },

src/api-umbrella/cli/read_config.lua

@@ -423,8 +423,7 @@ local function set_computed_config()
       },
     },
     static_site = {
-      dir = path.join(embedded_root_dir, "apps/static-site/current"),
-      build_dir = path.join(embedded_root_dir, "apps/static-site/current/build"),
+      build_dir = path.join(embedded_root_dir, "apps/core/current/build/dist/example-website"),
     },
   })
 

src/api-umbrella/example-website/layouts/partials/head.html

@@ -1,6 +1,6 @@
 <head>
   {{ $options := (dict "includePaths" (slice "node_modules/bootstrap/scss")) }}
-  {{ $css := resources.Get "stylesheets/application.scss" | resources.ToCSS $options | resources.PostCSS -}}
+  {{ $css := resources.Get "stylesheets/application.scss" | resources.ToCSS $options -}}
   {{ $secureCSS := $css | resources.Fingerprint -}}
   <link rel="stylesheet" href="{{ $secureCSS.RelPermalink }}" integrity="{{ $secureCSS.Data.Integrity }}" crossorigin="anonymous">
 </head>

src/api-umbrella/example-website/package.json

@@ -3,7 +3,6 @@
     "bootstrap": "^5.1.0",
     "escape-html": "^1.0.3",
     "form-serialize": "^0.7.2",
-    "postcss-cli": "^7.1.2",
     "promise-polyfill": "^8.2.0",
     "whatwg-fetch": "^3.6.2"
   }