apostrophe 3.39.1 → 3.40.0-alpha

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 3.40.0 (2023-02-11)
+
+* For devops purposes, the `APOS_BASE_URL` environment variable is now respected as an override of the `baseUrl` option.
+
+## 3.39.2 (2023-02-03)
+
+### Fixes
+
+* Hotfix for a backwards compatibility break in webpack that triggered a tiptap bug. The admin UI build will now succeed as expected.
+
 ## 3.39.1 (2023-02-02)
 
 ### Fixes

package/index.js

@@ -449,6 +449,8 @@ async function apostrophe(options, telemetry, rootSpan) {
       throw 'Specify the `shortName` option and set it to the name of your project\'s repository or folder';
     }
     self.title = self.options.title;
+    // Environment variable override
+    self.options.baseUrl = process.env.APOS_BASE_URL || self.options.baseUrl;
     self.baseUrl = self.options.baseUrl;
     self.prefix = self.options.prefix || '';
   }

package/modules/@apostrophecms/asset/lib/webpack/apos/webpack.config.js

@@ -2,6 +2,7 @@ const path = require('path');
 const merge = require('webpack-merge').merge;
 const scss = require('./webpack.scss');
 const vue = require('./webpack.vue');
+const js = require('./webpack.js');
 
 let BundleAnalyzerPlugin;
 
@@ -12,7 +13,7 @@ if (process.env.APOS_BUNDLE_ANALYZER) {
 module.exports = ({
   importFile, modulesDir, outputPath, outputFilename
 }, apos) => {
-  const tasks = [ scss, vue ].map(task =>
+  const tasks = [ scss, vue, js ].map(task =>
     task(
       {
         importFile,

package/modules/@apostrophecms/asset/lib/webpack/apos/webpack.js.js

@@ -0,0 +1,21 @@
+module.exports = (options, apos) => {
+  return {
+    module: {
+      rules: [
+        {
+          test: /\.(m)?js$/i,
+          resolve: {
+            byDependency: {
+              esm: {
+                // Be tolerant of imports like lodash/debounce that
+                // should really be lodash/debounce.js, as dependencies
+                // like tiptap are not fully on board with that rule yet
+                fullySpecified: false
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.39.1",
+  "version": "3.40.0-alpha",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {

package/test/attachments.js

@@ -201,7 +201,7 @@ describe('Attachment', function() {
         extension: 'jpg',
         _id: 'test'
       });
-      assert(url === '/uploads/attachments/test-test.full.jpg');
+      assert.strictEqual(url, '/uploads/attachments/test-test.full.jpg');
     });
 
     it('should generate the "one-half" URL when one-half size specified for image', function() {

package/test/base-url-env-var.js

@@ -0,0 +1,36 @@
+const t = require('../test-lib/test.js');
+const assert = require('assert');
+let apos;
+let savedBaseUrl;
+
+const config = {
+  root: module,
+  // Should get overridden by the above
+  baseUrl: 'http://localhost:3000'
+};
+
+describe('Locales', function() {
+  this.timeout(t.timeout);
+
+  before(async function() {
+    savedBaseUrl = process.env.APOS_BASE_URL;
+    process.env.APOS_BASE_URL = 'https://madethisup.com';
+    apos = await t.create(config);
+  });
+
+  after(function() {
+    if (savedBaseUrl) {
+      process.env.APOS_BASE_URL = savedBaseUrl;
+    } else {
+      delete process.env.APOS_BASE_URL;
+    }
+    return t.destroy(apos);
+  });
+
+  it('APOS_BASE_URL should take effect', async function() {
+    const req = apos.task.getReq();
+    const home = await apos.doc.find(req, { slug: '/' }).toObject();
+    assert(home);
+    assert.strictEqual(home._url, 'https://madethisup.com/');
+  });
+});