adapt-authoring-ui 1.1.0 → 1.2.0

package/lib/JavaScriptTask.js

@@ -12,7 +12,7 @@ import { deflate, unzip, constants } from 'zlib'
 import { globSync } from 'glob'
 
 export default class JavaScriptTask {
-  constructor (buildDir, logFunc) {
+  constructor (buildDir, logFunc, uiPlugins) {
     this.log = logFunc ?? ((level, ...args) => console.log(level.toUpperCase(), ...args))
     this.convertSlashes = /\\/g
     this.cwd = process.cwd().replace(this.convertSlashes, '/') + '/'
@@ -20,19 +20,18 @@ export default class JavaScriptTask {
     this.isFirstRun = true
     this.cache = null
     this.extensions = ['.js', '.jsx']
-    this.cacheManager = new CacheManager()
+    this.cacheManager = new CacheManager({ logger: { log: this.log } })
     this.resolvedNodeModules = {}
     this.resolvedNodeModulesPaths = []
 
     this.buildConfig = {
     }
 
-    const packagesWithUiPlugin = globSync('node_modules/adapt-authoring-*/ui-plugins/')
-    const packageJsons = globSync(packagesWithUiPlugin.map(p => path.join(path.dirname(p), 'package.json')))
+    const packageJsons = globSync(uiPlugins.map(p => path.join(path.dirname(p), 'package.json')))
     const uiPluginDeps = packageJsons.reduce((arr, p) => {
       const packageJson = fs.readJSONSync(p)
       if (!packageJson.dependencies) return arr
-      return arr.concat(Object.keys(packageJson.dependencies))
+      return arr.concat(Object.keys(packageJson.dependencies).filter(k => !k.startsWith('adapt-authoring-')))
     }, [])
 
     this.options = {
@@ -42,6 +41,7 @@ export default class JavaScriptTask {
       out: path.join(buildDir, 'js', 'adapt.min.js'),
       modulesGlob: 'node_modules/adapt-authoring-ui/app/modules/*/index.js',
       pluginsGlob: 'node_modules/adapt-authoring-*/ui-plugins/*/index.js',
+      pluginsDirs: uiPlugins,
       pluginsOrder: files => files,
       external: {
         jquery: 'empty:',
@@ -145,12 +145,14 @@ export default class JavaScriptTask {
     })
   }
 
+  /* this throws an error
   findNodeModule = (cwd, baseUrl, moduleId) => {
     if (this.resolvedNodeModules[moduleId]) return this.resolvedNodeModules[moduleId]
     const resolved = this.resolvedNodeModules[moduleId] = resolve.sync(moduleId, { basedir: path.resolve(cwd, baseUrl) })
     if (resolved) this.resolvedNodeModulesPaths.push(path.normalize(resolved))
     return resolved
   }
+  */
 
   logPrettyError (err, cachePath, basePath) {
     let hasOutput = false
@@ -187,7 +189,7 @@ export default class JavaScriptTask {
     const cachePath = this.buildConfig.cachepath ?? this.cacheManager.cachePath(cwd, options.out)
     const isSourceMapped = Boolean(options.generateSourceMaps)
     const basePath = path.resolve(cwd + '/' + options.baseUrl).replace(this.convertSlashes, '/') + '/'
-    const findNodeModule = this.findNodeModule
+    // const findNodeModule = this.findNodeModule
     const resolvedNodeModulesPaths = this.resolvedNodeModulesPaths
     let resolveCount = 0
 
@@ -201,7 +203,7 @@ export default class JavaScriptTask {
       }
     })
 
-    const plugins = globSync(this.options.pluginsGlob).map(entry => {
+    const plugins = this.options.pluginsDirs.map(entry => {
       return {
         name: path.basename(path.dirname(entry)),
         main: path.basename(entry),
@@ -288,8 +290,8 @@ export default class JavaScriptTask {
               // Resolve node modules
               if (
                 isNodeResolved ||
-                  isImportedByNodeModule ||
-                  (!moduleId.includes('adapt-') && findNodeModule(cwd, options.baseUrl, moduleId))
+                  isImportedByNodeModule /*|| @note resolve undefined
+                  (!moduleId.includes('adapt-') && findNodeModule(cwd, options.baseUrl, moduleId))*/
               ) {
                 return null
               }

package/lib/UiBuild.js

@@ -9,11 +9,12 @@ import chalk from 'chalk'
 import JavaScriptTask from './JavaScriptTask.js'
 
 class UiBuild {
-  constructor ({ app, log, isDev, buildDir, enableWatch }) {
+  constructor ({ app, log, isDev, buildDir, enableWatch, uiPlugins }) {
     this.app = app
     this.log = log
     this.isDev = isDev
     this.enableWatch = enableWatch
+    this.uiPlugins = uiPlugins
 
     const outputDir = buildDir.replaceAll('\\', '/')
 
@@ -61,7 +62,7 @@ class UiBuild {
     this.preBuildHook = new Hook()
     this.postBuildHook = new Hook()
 
-    this.jsTask = new JavaScriptTask(this.Paths.Output, this.log)
+    this.jsTask = new JavaScriptTask(this.Paths.Output, this.log, this.uiPlugins)
   }
 
   collate (collateAtFolderName, destFolder, srcFileName) {
@@ -152,7 +153,7 @@ class UiBuild {
       isCore ? sorted[0].push(f) : sorted[1].push(f)
       return sorted
     }, [[], []])
-    const lessImports = [...core, ...theRest].reduce((s, p) => `${s}@import '${p}';\n`, '')
+    const lessImports = [...core.sort(), ...theRest.sort()].reduce((s, p) => `${s}@import '${p}';\n`, '')
     const { css, map } = await less.render(lessImports, lessOptions)
 
     try {

package/lib/UiModule.js

@@ -80,7 +80,8 @@ class UiModule extends AbstractModule {
       log: this.log.bind(this),
       isDev: !this.isProduction,
       buildDir: this.buildDir,
-      enableWatch: this.app.args.w || this.app.args.watch
+      enableWatch: this.app.args.w || this.app.args.watch,
+      uiPlugins: this.uiPlugins
     })
     build.preBuildHook.tap(() => this.preBuildHook.invoke(build))
     build.postBuildHook.tap(() => this.postBuildHook.invoke(build))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-ui",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Front-end application for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-ui",
   "license": "GPL-3.0",