adapt-authoring-ui 3.0.3 → 3.0.5

package/app/modules/assetManagement/views/assetManagementEditAssetView.js

@@ -32,8 +32,10 @@ define([
     },
 
     updateTitle: function(e) {
-      if(!this.form.fields.title.getValue()) { // add the asset file name if there isn't already a title
-        this.form.fields.title.setValue($(e.currentTarget).val().replace("C:\\fakepath\\", ""));
+      const value = $(e.currentTarget).val();
+      this.$('.asset-thumb').toggle(!value);
+      if(value && !this.form.fields.title.getValue()) {
+        this.form.fields.title.setValue(value.replace("C:\\fakepath\\", ""));
       }
     },
 
@@ -70,12 +72,14 @@ define([
             });
           }
           const newData = await Helpers.submitForm(this.form, {
-            method: model.isNew() ? 'POST' : 'PATCH', 
+            method: model.isNew() ? 'POST' : 'PATCH',
             url: model.url(),
             beforeSubmit: this.sanitiseData
           });
           const _id = newData && newData._id;
 
+          if(newData) this.model.set(newData);
+
           if(this.model.get('isModal')) {
             if(_id) Origin.trigger('assetManagement:collection:refresh', null, true, _id);
             Origin.trigger('assetManagement:modalEdit:remove');

package/lib/JavaScriptTask.js

@@ -441,6 +441,9 @@ export default class JavaScriptTask {
       const outputOptions = {
         file: options.out,
         format: 'amd',
+        // Pin to Rollup v2 output defaults (changed in v4) so the AMD bundle is unaffected by the upgrade
+        interop: 'compat',
+        esModule: true,
         plugins: [
           !isSourceMapped && terser({
             mangle: false,

package/lib/UiModule.js

@@ -1,6 +1,5 @@
 import { AbstractModule, Hook } from 'adapt-authoring-core'
 import path from 'path'
-import UiBuild from './UiBuild.js'
 
 const CSP_POLICY = [
   "default-src 'self'",
@@ -87,6 +86,7 @@ class UiModule extends AbstractModule {
    * @return {Promise}
    */
   async build () {
+    const { default: UiBuild } = await import('./UiBuild.js')
     const build = new UiBuild({
       app: this.app,
       log: this.log.bind(this),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-ui",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Front-end application for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-ui",
   "license": "GPL-3.0",
@@ -17,7 +17,7 @@
     "@babel/plugin-transform-react-jsx": "^7.20.13",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.18.6",
-    "@rollup/plugin-babel": "^6.0.3",
+    "@rollup/plugin-babel": "^7.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^16.0.3",
     "@rollup/plugin-terser": "^1.0.0",
@@ -32,9 +32,9 @@
     "magic-string": "^0.30.0",
     "requirejs": "^2.3.6",
     "resolve": "^1.22.2",
-    "rollup": "^2.79.1",
+    "rollup": "^4.61.0",
     "rollup-plugin-inject-process-env": "*",
-    "upath": "^2.0.1"
+    "upath": "^3.0.7"
   },
   "peerDependencies": {
     "adapt-authoring-adaptframework": "^3.0.0",

package/tests/JavaScriptTask.build.spec.js

@@ -0,0 +1,84 @@
+import { describe, it, before, after } from 'node:test'
+import assert from 'node:assert/strict'
+import os from 'node:os'
+import path from 'node:path'
+import fs from 'fs-extra'
+import { rollup } from 'rollup'
+import { babel } from '@rollup/plugin-babel'
+import { nodeResolve } from '@rollup/plugin-node-resolve'
+import commonjs from '@rollup/plugin-commonjs'
+import terser from '@rollup/plugin-terser'
+
+/**
+ * Integration smoke test for the Rollup build. Unlike the pure-utility specs,
+ * this drives a real rollup() build through the same plugin stack and output
+ * options that lib/JavaScriptTask.js uses, so a breaking Rollup major upgrade
+ * (e.g. the v2 -> v4 jump) fails CI instead of silently shipping a broken
+ * adapt.min.js. It exercises: the native v4 parser, commonjs/node-resolve/babel
+ * plugin compatibility, the AMD output format and the interop/esModule pins.
+ */
+describe('JavaScriptTask rollup build (integration)', () => {
+  let tmpDir
+  let entry
+  let out
+
+  before(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'jstask-build-'))
+    // a CommonJS dependency, to exercise @rollup/plugin-commonjs + interop
+    fs.writeFileSync(path.join(tmpDir, 'cjsDep.js'), 'module.exports = { greet: name => "hi " + name }\n')
+    // a JSX component, to exercise @babel/preset-react under the v4 plugin API
+    fs.writeFileSync(path.join(tmpDir, 'widget.jsx'), 'export default () => <div className="widget">hello</div>\n')
+    entry = path.join(tmpDir, 'entry.js')
+    fs.writeFileSync(entry, [
+      'import cjsDep from "./cjsDep.js"',
+      'import Widget from "./widget.jsx"',
+      'export default { greeting: cjsDep.greet("adapt"), Widget }'
+    ].join('\n') + '\n')
+    out = path.join(tmpDir, 'adapt.min.js')
+  })
+
+  after(() => {
+    fs.removeSync(tmpDir)
+  })
+
+  it('bundles the plugin stack into a loadable AMD module with the v2-compatible output options', async () => {
+    const bundle = await rollup({
+      input: entry,
+      shimMissingExports: true,
+      plugins: [
+        commonjs(),
+        nodeResolve({ browser: true, preferBuiltins: false }),
+        babel({
+          babelHelpers: 'bundled',
+          extensions: ['.js', '.jsx'],
+          presets: [
+            ['@babel/preset-react', { runtime: 'classic' }],
+            ['@babel/preset-env', { useBuiltIns: false }]
+          ]
+        })
+      ]
+    })
+
+    await bundle.write({
+      file: out,
+      format: 'amd',
+      // these mirror the migration-sensitive pins in lib/JavaScriptTask.js
+      interop: 'compat',
+      esModule: true,
+      plugins: [terser({ mangle: false, compress: false })],
+      amd: { define: 'require' },
+      footer: 'window.__AMD = function(id, value) { window.define(id, function() { return value; }); window.require([id]); return value; };',
+      strict: true
+    })
+    await bundle.close()
+
+    const code = fs.readFileSync(out, 'utf8')
+    assert.ok(code.length > 0, 'bundle should not be empty')
+    // amd.define: 'require' renames the AMD wrapper function from define to require
+    assert.match(code, /require\(\[/)
+    // esModule: true emits the interop marker for the default export
+    assert.match(code, /__esModule/)
+    // the custom footer must survive into the output
+    assert.match(code, /window\.__AMD/)
+  })
+})