Static build

modules/@apostrophecms/asset/index.js

@@ -803,6 +803,7 @@ module.exports = {
           process.env.HEROKU_RELEASE_VERSION ||
           process.env.PLATFORM_TREE_ID;
         if (viaEnv) {
+          console.log('===>', viaEnv);
           return viaEnv;
         }
         try {
@@ -1164,6 +1165,7 @@ module.exports = {
       // Return the URL of the asset with the given path, taking into account
       // the release id, uploadfs, etc.
       url(path) {
+        console.log(`${process.pid} here we go for ${path}`);
         return `${self.getAssetBaseUrl()}${path}`;
       },
       devServerUrl(path) {

modules/@apostrophecms/doc-type/index.js

@@ -394,7 +394,7 @@
           }
           await self.apos.schema.indexFields(self.schema, doc, texts);
         }
-      }
+      },
 
     };
   },
@@ -1648,7 +1648,62 @@
           name: key,
           ...self.columns[key]
         }));
+      },
+
+
+      async getAllUrlMetadata(req) {
+        const results = [];
+        let skip = 0;
+        // Declared here so we can use do/while
+        let docs = null;
+
+        do {
+          // Paginate through 100 at a time to avoid exhausting
+          // memory
+          docs = await self.getUrlMetadataQuery(req)
+            .skip(skip).limit(100).toArray();
+          await Promise.all(docs.map(async doc => {
+            results.push(...await self.getUrlMetadata(req, doc));
+          }));
+          skip += docs.length;
+        } while (docs.length > 0);
+
+        return results;
+      },          
+
+      // Used to build sitemaps and assist in static site builds. Extend to
+      // return all URLs that provide views of this document and
+      // should be included in sitemaps and static builds. You may
+      // use `async` when extending
+      getUrlMetadata(req, piece) {
+        if (!piece._url) {
+          return [];
+        }
+        return [
+          {
+            url: piece._url,
+            type: piece.type,
+            aposDocId: piece.aposDocId,
+            i18nId: piece.aposDocId,
+            _id: piece._id,
+            // For legacy reasons. Google 100% ignores this
+            changefreq: 'daily',
+            // For legacy reasons. Google 100% ignores this
+            priority: 1.0
+          }
+        ];
+      },
+
+      // Extend to change the query used when fetching documents of this type
+      // for purposes of building sitemaps and static sites. Should be efficient
+      // while still capturing enough information to generate all URLs for
+      // this particular type of document. By default no relationships are fetched
+      // and widget loaders for areas are not run
+      getUrlMetadataQuery(req) {
+        return self.find(req, {})
+          .relationships(false).areas(false);
       }
+
     };
   },
   extendMethods(self) {

modules/@apostrophecms/express/index.js

@@ -731,6 +731,7 @@ module.exports = {
 
         // awaitable listen function
         function listen() {
+          console.log('--->', process.env);
           if (address !== false) {
             self.server = self.apos.baseApp.listen(port, address);
           } else if (port) {

modules/@apostrophecms/page-type/index.js

@@ -107,12 +107,17 @@ module.exports = {
       'slug'
     ]);
     self.rules = {};
-    self.dispatchAll();
     self.composeFilters();
     self.composeColumns();
   },
   handlers(self) {
     return {
+      'apostrophe:modulesRegistered': {
+        dispatchAll() {
+          // Late enough that all subclasses have contributed things to self
+          self.dispatchAll();
+        }
+      },
       '@apostrophecms/page:serve': {
         async dispatchPage(req) {
           if (!req.data.bestPage) {

modules/@apostrophecms/piece-page-type/index.js

@@ -15,7 +15,7 @@
 //
 // ### `piecesFilters`
 //
-// If present, this is an array of objects with `name` properties.This works
+// If present, this is an array of objects with `name` properties. This works
 // only if the corresponding query builders exist and have a `launder` method.
 // An array of choices for each is populated in `req.data.piecesFilters`. The
 // choices in the array are objects with `label` and `value` properties.
@@ -37,6 +37,7 @@
     self.piecesCssName = self.apos.util.cssName(self.pieces.name);
 
     self.piecesFilters = self.options.piecesFilters || [];
+    console.log(`>> ${self.__meta.name}`);
 
     self.enableAddUrlsToPieces();
   },
@@ -199,6 +200,26 @@
 
       dispatchAll() {
         self.dispatch('/', self.indexPage);
+        if (self.apos.url.options.static) {
+          self.dispatch(`/page/:page`, req => {
+            req.query.page = req.params.page;
+            return self.indexPage(req);
+          });
+          console.log(self.options.piecesFilters);
+          console.log(`** ${self.__meta.name}`);
+          console.log(self.piecesFilters);
+          for (const filter of self.piecesFilters) {
+            self.dispatch(`/${filter.name}/:filterValue`, req => {
+              req.query[filter.name] = req.params.filterValue;
+              return self.indexPage(req);
+            });
+            self.dispatch(`/${filter.name}/:filterValue/page/:page`, req => {
+              req.query[filter.name] = req.params.filterValue;
+              req.query.page = req.params.page;
+              return self.indexPage(req);
+            });
+          }
+        }
         self.dispatch('/:slug', self.showPage);
       },
 
@@ -340,15 +361,38 @@
 
       async populatePiecesFilters(query) {
         const req = query.req;
-        req.data.piecesFilters = req.data.piecesFilters || {};
+        const filtersWithChoices = await self.getFiltersWithChoices(query);
+        req.data.filters = filtersWithChoices;
+        // for bc (less useful)
+        req.data.piecesFilters = {};
+        for (const filter of filtersWithChoices) {
+          req.data.piecesFilters[filter.name] = filter.choices;
+        }
+      },
+
+      async getFiltersWithChoices(query, { allCounts = false } = {}) {
+        const results = [];
         for (const filter of self.piecesFilters) {
           // The choices for each filter should reflect the effect of all
           // filters except this one (filtering by topic pares down the list of
           // categories and vice versa)
           const _query = query.clone();
           _query[filter.name](undefined);
-          req.data.piecesFilters[filter.name] = await _query.toChoices(filter.name, _.pick(filter, 'counts'));
+          const choices = await _query.toChoices(filter.name, allCounts || _.pick(filter, 'counts'));
+          console.log(query.req.params, filter.name);
+          for (const choice of choices) {
+            choice._url = query.req.data.page._url + self.apos.url.getChoiceFilter(filter.name, choice.value, 1);
+            if (query.req.query[filter.name] === choice.value) {
+              choice.active = true;
+              console.log('MATCH');
+            }
+          }
+          results.push({
+            ...filter,
+            choices
+          });
         }
+        return results;
       }
     };
 
@@ -368,6 +412,36 @@
         } else {
           return data;
         }
+      },
+      async getUrlMetadata(_super, req, page) {
+        const metadata = _super(req, page);
+        if (!metadata.length) {
+          return metadata;
+        }
+        const query = self.indexQuery(req);
+        const filters = await self.getFiltersWithChoices(query, { allCounts: true });
+        for (const filter of filters) {
+          for (const choice of filter.choices) {
+            const pages = Math.min(1, Math.ceil(choice.count / self.perPage));
+            for (let page = 1; (page <= pages); page++) {
+              metadata.push({
+                ...metadata[0],
+                i18nId: `${metadata[0].i18nId}.${self.apos.util.slugify(filter.name)}.${self.apos.util.slugify(choice.value)}.${page}`,
+                _url: metadata[0]._url + self.apos.url.getChoiceFilter(filter.name, choice.value, page)
+              });
+            }
+          }
+        }
+        await query.toCount();
+        const pages = query.get('totalPages');
+        for (let page = 2; (2 <= pages); page++) {
+          metadata.push({
+            ...metadata[0],
+            i18nId: `${metadata[0].i18nId}.${page}`,
+            _url: metadata[0]._url + self.apos.url.getPageFilter(page)
+          });
+        }
+        return metadata;
       }
     };
   }

modules/@apostrophecms/template/views/outerLayoutBase.html

@@ -1,6 +1,9 @@
 <!DOCTYPE html>
 <html lang="{% block locale %}{{ data.locale }}{% endblock %}" {% block extraHtml %}{% endblock %}>
   <head>
+    {% block encoding %}
+      <meta charset="utf-8">
+    {% endblock %}
     {% block startHead %}
     {% endblock %}
     {% component '@apostrophecms/template:inject' with { where: 'head', end: 'prepend', when: 'hmr' } %}