apostrophe 3.24.0 → 3.25.0-alpha.2022080101

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## UNRELEASED
+
+### Adds
+
+* Tasks can now be registered with the `afterModuleReady` flag, which is more useful than `afterModuleInit` because it waits for the module to be more fully initialized, including all "improvements" loaded via npm. The original `afterModuleInit` flag is still supported in case someone was counting on its behavior.
+
+### Changes
+
+* Since Microsoft has ended support for IE11 and support for ES5 builds is responsible for 50% of Apostrophe's installation time, the `es5: true` option now requires that the optional [@apostrophecms/asset-es5](https://github.com/apostrophecms/asset-es5) module also be installed by those who really need it. However, for backwards compatibility, if the option is enabled without the additional module a warning will be printed and the asset build will succeed normally without IE11 support.
+
+## 3.25.0 (2022-07-20)
+
+### Adds
+
+* `radio` and `checkboxes` input field types now support a server side `choices` function for supplying their `choices` array dynamically, just like `select` fields do. Future custom field types can opt into this functionality with the field type flag `dynamicChoices: true`.
+
+### Fixes
+
+* `AposSelect` now emits values on `change` event as they were originally given. Their values "just work" so you do not have to think about JSON anymore when you receive it.
+* Unpinned tiptap as the tiptap team has made releases that resolve the packaging errors that caused us to pin it in 3.22.1.
+* Pinned `vue-loader` to the `15.9.x` minor release series for now. The `15.10.0` release breaks support for using `npm link` to develop the `apostrophe` module itself.
+* Minimum version of `sanitize-html` bumped to ensure a potential denial-of-service vector is closed.
+
 ## 3.24.0 (2022-07-06)
 
 ### Adds

package/index.js

@@ -562,7 +562,8 @@ async function apostrophe(options, telemetry, rootSpan) {
     self.modules = {};
     for (const item of modulesToBeInstantiated()) {
       // module registers itself in self.modules
-      await self.synth.create(item, { apos: self });
+      const module = await self.synth.create(item, { apos: self });
+      await module.emit('moduleReady');
     }
   }
 

package/modules/@apostrophecms/asset/index.js

@@ -42,6 +42,7 @@ module.exports = {
   },
 
   async init(self) {
+
     self.restartId = self.apos.util.generateId();
     self.iconMap = {
       ...globalIcons
@@ -63,6 +64,7 @@ module.exports = {
     self.buildWatcherEnable = process.env.APOS_ASSET_WATCH !== '0' && self.options.watch !== false;
     self.buildWatcherDebounceMs = parseInt(self.options.watchDebounceMs || 1000, 10);
     self.buildWatcher = null;
+
   },
   handlers (self) {
     return {
@@ -121,6 +123,16 @@ module.exports = {
         usage: 'Build Apostrophe frontend CSS and JS bundles',
         afterModuleInit: true,
         async task(argv = {}) {
+          if (self.options.es5 && !self.es5TaskFn) {
+            self.apos.util.warnDev(stripIndent`
+              es5: true is set. IE11 compatibility builds now require that you
+              install the optional @apostrophecms/asset-es5 module. Until then,
+              for backwards compatibility, your build will succeed but
+              will not be IE11 compatible.
+            `);
+            self.options.es5 = false;
+            delete self.builds['src-es5'];
+          }
           // The lock could become huge, cache it, see computeCacheMeta()
           let packageLockContentCached;
           const req = self.apos.task.getReq();
@@ -350,7 +362,11 @@ module.exports = {
                 modulesDir,
                 outputPath: bundleDir,
                 outputFilename,
-                bundles: webpackExtraBundles
+                bundles: webpackExtraBundles,
+                // Added on the fly by the
+                // @apostrophecms/asset-es5 module,
+                // if it is present
+                es5TaskFn: self.es5TaskFn
               }, self.apos);
 
               const webpackInstanceConfigMerged = self.webpackExtensions
@@ -841,7 +857,7 @@ module.exports = {
 
       'clear-cache': {
         usage: 'Clear build cache',
-        afterModuleInit: true,
+        afterModuleReady: true,
         async task(argv) {
           const cacheBaseDir = self.getCacheBasePath();
 
@@ -1161,7 +1177,7 @@ module.exports = {
       // If you are trying to enable IE11 support for ui/src, use the
       // `es5: true` option (es5 builds are disabled by default).
       configureBuilds() {
-        const srcPrologue = stripIndent`
+        self.srcPrologue = stripIndent`
           (function() {
             window.apos = window.apos || {};
             var data = document.body && document.body.getAttribute('data-apos');
@@ -1188,26 +1204,7 @@ module.exports = {
             index: true,
             // Load only in browsers that support ES6 modules
             condition: 'module',
-            prologue: srcPrologue
-          },
-          'src-es5': {
-            // An alternative build from the same sources for IE11
-            source: 'src',
-            webpack: true,
-            scenes: [ 'public', 'apos' ],
-            // The CSS from the src build is identical, do not duplicate it
-            outputs: [ 'js' ],
-            label: 'apostrophe:ie11Build',
-            // Load index.js and index.scss from each module
-            index: true,
-            // The polyfills babel will be expecting
-            prologue: stripIndent`
-              import "core-js/stable";
-              import "regenerator-runtime/runtime";
-              ${srcPrologue}
-            `,
-            // Load only in browsers that do not support ES6 modules
-            condition: 'nomodule'
+            prologue: self.srcPrologue
           },
           public: {
             scenes: [ 'public', 'apos' ],
@@ -1236,9 +1233,6 @@ module.exports = {
           // We could add an apos-ie11 bundle that just pushes a "sorry charlie" prologue,
           // if we chose
         };
-        if (!self.options.es5) {
-          delete self.builds['src-es5'];
-        }
       },
       // Filter the given css performing any necessary transformations,
       // such as support for the /modules path regardless of where

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

@@ -1,7 +1,7 @@
 const path = require('path');
 const merge = require('webpack-merge').merge;
 const scssTask = require('./webpack.scss');
-const es5Task = require('./webpack.es5');
+const { stripIndent } = require('common-tags');
 const srcBuildNames = [ 'src-build', 'src-es5-build' ];
 
 let BundleAnalyzerPlugin;
@@ -11,14 +11,11 @@ if (process.env.APOS_BUNDLE_ANALYZER) {
 }
 
 module.exports = ({
-  importFile, modulesDir, outputPath, outputFilename, bundles = {}, es5
+  importFile, modulesDir, outputPath, outputFilename, bundles = {}, es5, es5TaskFn
 }, apos) => {
   const mainBundleName = outputFilename.replace('.js', '');
-  const taskFns = [ scssTask ];
+  const taskFns = [ scssTask, ...(es5 ? [ es5TaskFn ] : []) ];
 
-  if (es5) {
-    taskFns.push(es5Task);
-  }
   const tasks = taskFns.map(task =>
     task(
       {

package/modules/@apostrophecms/db/index.js

@@ -168,7 +168,7 @@ This database contains an Apostrophe 2.x website. Exiting to avoid content loss.
       // and start up your app, which will recreate them.
       reset: {
         usage: 'Usage: node app @apostrophecms/db:reset\n\nThis destroys ALL of your content. EVERYTHING in your database.\n',
-        afterModuleInit: true,
+        afterModuleReady: true,
         exitAfter: false,
         task: async () => {
           const argv = self.apos.argv;

package/modules/@apostrophecms/image/ui/apos/components/AposImageRelationshipEditor.vue

@@ -396,7 +396,7 @@ export default {
         };
     },
     updateAspectRatio(value) {
-      this.aspectRatio = parseFloat(value);
+      this.aspectRatio = value;
       this.computeMaxSizes();
       this.computeMinSizes();
     },

package/modules/@apostrophecms/module/index.js

@@ -705,8 +705,12 @@ module.exports = {
       },
 
       async executeAfterModuleInitTask() {
+        return self.executeAfterModuleTask('afterModuleInit');
+      },
+
+      async executeAfterModuleTask(when) {
         for (const [ name, info ] of Object.entries(self.tasks || {})) {
-          if (info.afterModuleInit) {
+          if (info[when]) {
             // Execute a task like @apostrophecms/asset:build or
             // @apostrophecms/db:reset which
             // must run before most modules are awake
@@ -764,6 +768,11 @@ module.exports = {
 
   handlers(self) {
     return {
+      moduleReady: {
+        executeAfterModuleReadyTask() {
+          return self.executeAfterModuleTask('afterModuleReady');
+        }
+      },
       'apostrophe:modulesRegistered': {
         addHelpers() {
           // We check this just to allow init in bootstrap tests that

package/modules/@apostrophecms/permission/ui/apos/components/AposInputRole.vue

@@ -7,26 +7,15 @@
     :display-options="displayOptions"
   >
     <template #body>
-      <div class="apos-input-wrapper apos-input__role">
-        <select
-          class="apos-input apos-input--select apos-input--role" :id="uid"
-          @change="change($event.target.value)"
-          :disabled="field.readOnly"
-        >
-          <option
-            v-for="choice in choices" :key="JSON.stringify(choice.value)"
-            :value="JSON.stringify(choice.value)"
-            :selected="choice.value === value.data"
-          >
-            {{ $t(choice.label) }}
-          </option>
-        </select>
-        <AposIndicator
-          icon="menu-down-icon"
-          class="apos-input-icon"
-          :icon-size="20"
-        />
-      </div>
+      <AposSelect
+        :choices="choices"
+        :disabled="field.readOnly"
+        :selected="value.data"
+        :id="uid"
+        :classes="[ 'apos-input__role' ]"
+        :wrapper-classes="[ 'apos-input__role' ]"
+        @change="change"
+      />
       <div class="apos-input__role__permission-grid">
         <div
           v-for="permissionSet in permissionSets"
@@ -152,7 +141,7 @@ export default {
     },
     change(value) {
       // Allows expression of non-string values
-      this.next = this.choices.find(choice => choice.value === JSON.parse(value)).value;
+      this.next = this.choices.find(choice => choice.value === value).value;
     },
     async getPermissionSets(role) {
       return (await apos.http.get(`${apos.permission.action}/grid`, {

package/modules/@apostrophecms/schema/index.js

@@ -1453,6 +1453,12 @@ module.exports = {
         _.each(self.apos.area.widgetManagers, function (manager, type) {
           self.register('widget', type, manager.schema);
         });
+      },
+
+      async getChoices(req, field) {
+        return typeof field.choices === 'string'
+          ? self.apos.modules[field.moduleName][field.choices](req)
+          : field.choices;
       }
 
     };
@@ -1466,7 +1472,7 @@ module.exports = {
           let choices = [];
           if (
             !field ||
-            field.type !== 'select' ||
+            !self.fieldTypes[field.type].dynamicChoices ||
             !(field.choices && typeof field.choices === 'string')
           ) {
             throw self.apos.error('invalid');

package/modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -231,7 +231,9 @@ module.exports = (self) => {
 
   self.addFieldType({
     name: 'checkboxes',
+    dynamicChoices: true,
     async convert(req, field, data, destination) {
+      const choices = await self.getChoices(req, field);
       if (typeof data[field.name] === 'string') {
         data[field.name] = self.apos.launder.string(data[field.name]).split(',');
 
@@ -241,14 +243,14 @@ module.exports = (self) => {
         }
 
         destination[field.name] = _.filter(data[field.name], function (choice) {
-          return _.includes(_.map(field.choices, 'value'), choice);
+          return _.includes(_.map(choices, 'value'), choice);
         });
       } else {
         if (!Array.isArray(data[field.name])) {
           destination[field.name] = [];
         } else {
           destination[field.name] = _.filter(data[field.name], function (choice) {
-            return _.includes(_.map(field.choices, 'value'), choice);
+            return _.includes(_.map(choices, 'value'), choice);
           });
         }
       }
@@ -303,13 +305,9 @@ module.exports = (self) => {
 
   self.addFieldType({
     name: 'select',
+    dynamicChoices: true,
     async convert(req, field, data, destination) {
-      let choices;
-      if ((typeof field.choices) === 'string') {
-        choices = await self.apos.modules[field.moduleName][field.choices](req);
-      } else {
-        choices = field.choices;
-      }
+      const choices = await self.getChoices(req, field);
       destination[field.name] = self.apos.launder.select(data[field.name], choices, field.def);
     },
     index: function (value, field, texts) {

package/modules/@apostrophecms/schema/ui/apos/components/AposInputCheckboxes.vue

@@ -8,7 +8,7 @@
     <template #body>
       <AposCheckbox
         :for="getChoiceId(uid, choice.value)"
-        v-for="choice in field.choices"
+        v-for="choice in choices"
         :key="choice.value"
         :id="getChoiceId(uid, choice.value)"
         :choice="choice"
@@ -21,10 +21,11 @@
 
 <script>
 import AposInputMixin from 'Modules/@apostrophecms/schema/mixins/AposInputMixin';
+import AposInputChoicesMixin from 'Modules/@apostrophecms/schema/mixins/AposInputChoicesMixin';
 
 export default {
   name: 'AposInputCheckboxes',
-  mixins: [ AposInputMixin ],
+  mixins: [ AposInputMixin, AposInputChoicesMixin ],
   beforeMount: function () {
     this.value.data = Array.isArray(this.value.data) ? this.value.data : [];
   },
@@ -38,7 +39,7 @@ export default {
     },
     validate(values) {
       // The choices and values should always be arrays.
-      if (!Array.isArray(this.field.choices) || !Array.isArray(values)) {
+      if (!Array.isArray(this.choices) || !Array.isArray(values)) {
         return 'malformed';
       }
 
@@ -48,7 +49,7 @@ export default {
 
       if (Array.isArray(values)) {
         values.forEach(chosen => {
-          if (!this.field.choices.map(choice => {
+          if (!this.choices.map(choice => {
             return choice.value;
           }).includes(chosen)) {
             return 'invalid';

package/modules/@apostrophecms/schema/ui/apos/components/AposInputRadio.vue

@@ -8,7 +8,7 @@
     <template #body>
       <label
         class="apos-choice-label" :for="getChoiceId(uid, choice.value)"
-        v-for="choice in field.choices" :key="choice.value"
+        v-for="choice in choices" :key="choice.value"
         :class="{'apos-choice-label--disabled': field.readOnly}"
       >
         <input
@@ -43,12 +43,13 @@
 
 <script>
 import AposInputMixin from 'Modules/@apostrophecms/schema/mixins/AposInputMixin';
+import AposInputChoicesMixin from 'Modules/@apostrophecms/schema/mixins/AposInputChoicesMixin';
 import InformationIcon from 'vue-material-design-icons/Information.vue';
 
 export default {
   name: 'AposInputRadio',
   components: { InformationIcon },
-  mixins: [ AposInputMixin ],
+  mixins: [ AposInputMixin, AposInputChoicesMixin ],
   methods: {
     getChoiceId(uid, value) {
       return (uid + JSON.stringify(value)).replace(/\s+/g, '');
@@ -58,7 +59,7 @@ export default {
         return 'required';
       }
 
-      if (value && !this.field.choices.find(choice => choice.value === value)) {
+      if (value && !this.choices.find(choice => choice.value === value)) {
         return 'invalid';
       }
 
@@ -66,7 +67,7 @@ export default {
     },
     change(value) {
       // Allows expression of non-string values
-      this.next = this.field.choices.find(choice => choice.value === JSON.parse(value)).value;
+      this.next = this.choices.find(choice => choice.value === JSON.parse(value)).value;
     }
   }
 };

package/modules/@apostrophecms/schema/ui/apos/components/AposInputSelect.vue

@@ -20,10 +20,11 @@
 
 <script>
 import AposInputMixin from 'Modules/@apostrophecms/schema/mixins/AposInputMixin';
+import AposInputChoicesMixin from 'Modules/@apostrophecms/schema/mixins/AposInputChoicesMixin';
 
 export default {
   name: 'AposInputSelect',
-  mixins: [ AposInputMixin ],
+  mixins: [ AposInputMixin, AposInputChoicesMixin ],
   props: {
     icon: {
       type: String,
@@ -37,34 +38,15 @@ export default {
     };
   },
   async mounted() {
-    let choices;
-    if (typeof this.field.choices === 'string') {
-      const action = this.options.action;
-      const response = await apos.http.get(
-        `${action}/choices`,
-        {
-          qs: {
-            fieldId: this.field._id
-          },
-          busy: true
-        }
-      );
-      if (response.choices) {
-        choices = response.choices;
-      }
-    } else {
-      choices = this.field.choices;
-    }
     // Add an null option if there isn't one already
-    if (!this.field.required && !choices.find(choice => {
+    if (!this.field.required && !this.choices.find(choice => {
       return choice.value === null;
     })) {
-      this.choices.push({
+      this.choices.unshift({
         label: '',
         value: null
       });
     }
-    this.choices = this.choices.concat(choices);
     this.$nextTick(() => {
       // this has to happen on nextTick to avoid emitting before schemaReady is
       // set in AposSchema
@@ -87,7 +69,7 @@ export default {
     },
     change(value) {
       // Allows expression of non-string values
-      this.next = this.choices.find(choice => choice.value === JSON.parse(value)).value;
+      this.next = this.choices.find(choice => choice.value === value).value;
     }
   }
 };

package/modules/@apostrophecms/schema/ui/apos/mixins/AposInputChoicesMixin.js

@@ -0,0 +1,32 @@
+/*
+* Provides prep work for fetching choices from the server
+* or defaulting to the choices provided with the field.
+*/
+
+export default {
+  data() {
+    return {
+      choices: []
+    };
+  },
+
+  async mounted() {
+    if (typeof this.field.choices === 'string') {
+      const action = this.options.action;
+      const response = await apos.http.get(
+        `${action}/choices`,
+        {
+          qs: {
+            fieldId: this.field._id
+          },
+          busy: true
+        }
+      );
+      if (response.choices) {
+        this.choices = response.choices;
+      }
+    } else {
+      this.choices = this.field.choices;
+    }
+  }
+};

package/modules/@apostrophecms/ui/ui/apos/components/AposSelect.vue

@@ -1,7 +1,9 @@
 <template>
-  <div class="apos-input-wrapper">
+  <div class="apos-input-wrapper" :class="wrapperClasses">
     <select
       class="apos-input apos-input--select"
+      :class="classes"
+      :uid="uid"
       :disabled="disabled"
       @change="change($event.target.value)"
     >
@@ -30,6 +32,22 @@ export default {
       type: String,
       default: 'menu-down-icon'
     },
+    uid: {
+      type: Number,
+      default: null
+    },
+    classes: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    wrapperClasses: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     choices: {
       type: Array,
       default() {
@@ -48,7 +66,7 @@ export default {
   emits: [ 'change' ],
   methods: {
     change(value) {
-      this.$emit('change', value);
+      this.$emit('change', JSON.parse(value));
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "3.24.0",
+  "version": "3.25.0-alpha.2022080101",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {
@@ -31,19 +31,16 @@
   "license": "MIT",
   "dependencies": {
     "@apostrophecms/vue-color": "^2.8.2",
-    "@babel/core": "^7.16.7",
-    "@babel/preset-env": "^7.16.7",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.1",
-    "@tiptap/extension-highlight": "2.0.0-beta.33",
-    "@tiptap/extension-link": "2.0.0-beta.38",
-    "@tiptap/extension-text-align": "2.0.0-beta.29",
-    "@tiptap/extension-text-style": "2.0.0-beta.23",
-    "@tiptap/extension-underline": "2.0.0-beta.23",
-    "@tiptap/starter-kit": "2.0.0-beta.185",
-    "@tiptap/vue-2": "2.0.0-beta.79",
+    "@tiptap/extension-highlight": "^2.0.0-beta.33",
+    "@tiptap/extension-link": "^2.0.0-beta.38",
+    "@tiptap/extension-text-align": "^2.0.0-beta.29",
+    "@tiptap/extension-text-style": "^2.0.0-beta.23",
+    "@tiptap/extension-underline": "^2.0.0-beta.23",
+    "@tiptap/starter-kit": "^2.0.0-beta.185",
+    "@tiptap/vue-2": "^2.0.0-beta.79",
     "autoprefixer": "^10.4.1",
-    "babel-loader": "^8.2.5",
     "bluebird": "^3.7.2",
     "body-parser": "^1.18.2",
     "boring": "^1.1.1",
@@ -54,7 +51,6 @@
     "connect-mongo": "^3.0.0",
     "connect-multiparty": "^2.1.1",
     "cookie-parser": "^1.4.5",
-    "core-js": "~3.14.0",
     "cors": "^2.8.5",
     "credential": "^2.0.0",
     "css-loader": "^5.2.4",
@@ -98,11 +94,10 @@
     "postcss-scss": "^4.0.3",
     "prompts": "^2.4.1",
     "qs": "^6.10.1",
-    "regenerator-runtime": "^0.13.7",
     "regexp-quote": "0.0.0",
     "resolve": "^1.19.0",
     "resolve-from": "^5.0.0",
-    "sanitize-html": "^2.0.0",
+    "sanitize-html": "^2.7.1",
     "sass": "^1.52.3",
     "sass-loader": "^10.1.1",
     "server-destroy": "^1.0.1",
@@ -119,7 +114,7 @@
     "vue": "^2.6.14",
     "vue-advanced-cropper": "^1.10.1",
     "vue-click-outside-element": "^1.0.15",
-    "vue-loader": "^15.9.6",
+    "vue-loader": "~15.9.8",
     "vue-material-design-icons": "~4.12.1",
     "vue-style-loader": "^4.1.2",
     "vue-template-compiler": "^2.6.14",

package/test/assets.js

@@ -267,55 +267,13 @@ describe('Assets', function() {
     await t.destroy(apos);
   });
 
-  it('should inject modules and nomodules scripts for extra bundles when es5 enabled', async function () {
-    const jar = apos.http.jar();
-
-    const es5Modules = {
-      ...modules,
-      '@apostrophecms/asset': {
-        options: {
-          es5: true
-        }
-      }
-    };
-
-    apos = await t.create({
-      root: module,
-      modules: es5Modules
-    });
-
-    const { _id: homeId } = await apos.page.find(apos.task.getAnonReq(), { level: 0 }).toObject();
-
-    await apos.doc.db.insertMany(pagesToInsert(homeId));
-
-    await apos.asset.tasks.build.task();
-
-    const bundlePage = await apos.http.get('/bundle', { jar });
-
-    assert(bundlePage.includes(getScriptMarkup('public-module-bundle', 'module')));
-    assert(bundlePage.includes(getScriptMarkup('public-nomodule-bundle', 'nomodule')));
-
-    assert(bundlePage.includes(getScriptMarkup('extra2-module-bundle', 'module')));
-    assert(bundlePage.includes(getScriptMarkup('extra2-nomodule-bundle', 'nomodule')));
-  });
-
   it('should build with cache and gain performance', async function() {
-    await t.destroy(apos);
     await removeCache();
     await removeCache(cacheFolderPath.replace('/webpack-cache', '/changed'));
 
-    const es5Modules = {
-      ...modules,
-      '@apostrophecms/asset': {
-        options: {
-          es5: true
-        }
-      }
-    };
-
     apos = await t.create({
       root: module,
-      modules: es5Modules
+      modules
     });
     assert.throws(() => fs.readdirSync(cacheFolderPath), {
       code: 'ENOENT'
@@ -330,11 +288,10 @@ describe('Assets', function() {
     });
     const execTime = Date.now() - startTime;
     const { meta, folders } = getCacheMeta();
-    assert.equal(folders.length, 3);
-    assert.equal(Object.keys(meta).length, 3);
+    assert.equal(folders.length, 2);
+    assert.equal(Object.keys(meta).length, 2);
     assert(meta['default:apos']);
     assert(meta['default:src']);
-    assert(meta['default:src-es5']);
 
     // Cache
     startTime = Date.now();
@@ -343,11 +300,10 @@ describe('Assets', function() {
     });
     const execTimeCached = Date.now() - startTime;
     const { meta: meta2, folders: folders2 } = getCacheMeta();
-    assert.equal(folders2.length, 3);
-    assert.equal(Object.keys(meta2).length, 3);
+    assert.equal(folders2.length, 2);
+    assert.equal(Object.keys(meta2).length, 2);
     assert(meta2['default:apos']);
     assert(meta2['default:src']);
-    assert(meta2['default:src-es5']);
 
     // Expect at least 40% gain, in reallity it should be 50+
     const gain = (execTime - execTimeCached) / execTime * 100;
@@ -358,8 +314,6 @@ describe('Assets', function() {
     assert(meta2['default:apos'].mdate);
     assert(meta['default:src'].mdate);
     assert(meta2['default:src'].mdate);
-    assert(meta['default:src-es5'].mdate);
-    assert(meta2['default:src-es5'].mdate);
     assert(
       new Date(meta['default:apos'].mdate) < new Date(meta2['default:apos'].mdate)
     );
@@ -374,13 +328,6 @@ describe('Assets', function() {
       new Date(meta2['default:src'].mdate).toISOString(),
       fs.statSync(meta2['default:src'].location).mtime.toISOString()
     );
-    assert(
-      new Date(meta['default:src-es5'].mdate) < new Date(meta2['default:src-es5'].mdate)
-    );
-    assert.equal(
-      new Date(meta2['default:src-es5'].mdate).toISOString(),
-      fs.statSync(meta2['default:src-es5'].location).mtime.toISOString()
-    );
   });
 
   it('should invalidate build cache when namespace changes', async function() {
@@ -389,14 +336,12 @@ describe('Assets', function() {
       'check-apos-build': false
     });
     const { meta, folders } = getCacheMeta();
-    assert.equal(folders.length, 6);
-    assert.equal(Object.keys(meta).length, 6);
+    assert.equal(folders.length, 4);
+    assert.equal(Object.keys(meta).length, 4);
     assert(meta['test:apos']);
     assert(meta['test:src']);
-    assert(meta['test:src-es5']);
     assert(meta['default:apos']);
     assert(meta['default:src']);
-    assert(meta['default:src-es5']);
     delete process.env.APOS_DEBUG_NAMESPACE;
   });
 
@@ -410,34 +355,25 @@ describe('Assets', function() {
       JSON.stringify(lock, null, '  '),
       'utf8'
     );
-    const es5Modules = {
-      ...modules,
-      '@apostrophecms/asset': {
-        options: {
-          es5: true
-        }
-      }
-    };
 
     apos = await t.create({
       root: module,
-      modules: es5Modules
+      modules
     });
     await apos.asset.tasks.build.task({
       'check-apos-build': false
     });
 
     const { meta, folders } = getCacheMeta();
-    assert.equal(folders.length, 9);
-    assert.equal(Object.keys(meta).length, 9);
+    assert.equal(folders.length, 6);
+    assert.equal(Object.keys(meta).length, 6);
     assert(meta['default:apos_2']);
     assert(meta['default:src_2']);
-    assert(meta['default:src-es5_2']);
   });
 
   it('should invalidate build cache when configuration changes', async function() {
     await t.destroy(apos);
-    const es5Modules = {
+    const customModules = {
       ...modules,
       'bundle-page': {
         webpack: {
@@ -451,16 +387,11 @@ describe('Assets', function() {
             }
           }
         }
-      },
-      '@apostrophecms/asset': {
-        options: {
-          es5: true
-        }
       }
     };
     apos = await t.create({
       root: module,
-      modules: es5Modules
+      modules: customModules
     });
     await apos.asset.tasks.build.task({
       'check-apos-build': false
@@ -468,11 +399,10 @@ describe('Assets', function() {
 
     const { meta, folders } = getCacheMeta();
 
-    assert.equal(folders.length, 11);
-    assert.equal(Object.keys(meta).length, 11);
+    assert.equal(folders.length, 7);
+    assert.equal(Object.keys(meta).length, 7);
     assert(!meta['default:apos_3']);
     assert(meta['default:src_3']);
-    assert(meta['default:src-es5_3']);
   });
 
   it('should clear build cache', async function() {
@@ -583,7 +513,7 @@ describe('Assets', function() {
     fs.writeFileSync(assetPath, assetContent, 'utf8');
   });
 
-  it('should watch and rebuild assets and reload page in development (src, src-es5)', async function() {
+  it('should watch and rebuild assets and reload page in development (src)', async function() {
     await t.destroy(apos);
     let result = {};
     const setTestResult = (obj) => {
@@ -608,9 +538,6 @@ describe('Assets', function() {
       modules: {
         'default-page': {},
         '@apostrophecms/asset': {
-          options: {
-            es5: true
-          },
           extendMethods() {
             return {
               async watchUiAndRebuild(_super) {
@@ -678,10 +605,9 @@ describe('Assets', function() {
 
     // * only src related builds were triggered
     await retryAssertTrue(
-      () => result.builds.length === 2 &&
-        result.builds.includes('src') &&
-        result.builds.includes('src-es5'),
-      'Unable to verify builds "src" and "src-es5" have been triggered',
+      () => result.builds.length === 1 &&
+        result.builds.includes('src'),
+      'Unable to verify build "src" has been triggered',
       50,
       1000
     );
@@ -733,9 +659,6 @@ describe('Assets', function() {
       modules: {
         'default-page': {},
         '@apostrophecms/asset': {
-          options: {
-            es5: true
-          },
           extendMethods() {
             return {
               async watchUiAndRebuild(_super) {
@@ -856,9 +779,6 @@ describe('Assets', function() {
           }
         },
         '@apostrophecms/asset': {
-          options: {
-            es5: true
-          },
           extendMethods() {
             return {
               async watchUiAndRebuild(_super) {
@@ -1073,9 +993,6 @@ describe('Assets', function() {
       autoBuild: true,
       modules: {
         '@apostrophecms/asset': {
-          options: {
-            es5: true
-          },
           extendMethods() {
             return {
               async watchUiAndRebuild(_super) {
@@ -1153,7 +1070,7 @@ describe('Assets', function() {
     // * no builds were triggered
     await retryAssertTrue(
       () => result.builds.length === 0,
-      'Unable to verify builds "src" and "src-es5" have NOT been triggered',
+      'Unable to verify build "src" has NOT been triggered',
       50,
       1000
     );

package/modules/@apostrophecms/asset/lib/webpack/src/webpack.es5.js

@@ -1,33 +0,0 @@
-module.exports = (options, apos) => {
-  return {
-    target: [ 'web', 'es5' ],
-    module: {
-      rules: [
-        {
-          test: /\.js$/,
-          exclude: [
-            /\/core-js($|\/)/,
-            /\/regenerator-runtime($|\/)/
-          ],
-          use: [
-            {
-              loader: 'babel-loader',
-              options: {
-                presets: [
-                  [
-                    '@babel/preset-env',
-                    {
-                      targets: {
-                        browsers: '> 1%, IE 11, not dead'
-                      }
-                    }
-                  ]
-                ]
-              }
-            }
-          ]
-        }
-      ]
-    }
-  };
-};