adapt-authoring-adaptframework 1.9.0 → 1.9.1

package/lib/AdaptFrameworkModule.js

@@ -111,9 +111,7 @@ class AdaptFrameworkModule extends AbstractModule {
   async installFramework (version, force = false) {
     this.log('verbose', 'INSTALL')
     try {
-      const modsPath = path.resolve(this.path, '..', 'node_modules')
       try {
-        await fs.stat(modsPath)
         await fs.readFile(path.resolve(this.path, 'package.json'))
         if (!force) {
           this.log('verbose', 'INSTALL no action, force !== true')
@@ -125,13 +123,6 @@ class AdaptFrameworkModule extends AbstractModule {
         // if src and node_modules are missing, install required
       }
       await this.runCliCommand('installFramework', { version })
-      // move node_modules into place
-      this.log('verbose', 'INSTALL node_modules')
-      try {
-        await fs.rm(modsPath, { recursive: true })
-      } catch (e) {}
-      // move node_modules so it can be shared with all builds
-      await fs.rename(path.join(this.path, 'node_modules'), modsPath)
     } catch (e) {
       this.log('error', `failed to install framework, ${e.message}`)
       throw this.app.errors.FW_INSTALL_FAILED

package/lib/AdaptFrameworkUtils.js

@@ -198,12 +198,15 @@ class AdaptFrameworkUtils {
      * @param {Object} options
      * @param {String} options.destDir The destination directory path
      * @param {Array<String>} options.enabledPlugins List of plugins to include
+     * @param {Boolean} options.copyNodeModules Whether to physically copy node_modules
      * @param {Boolean} options.linkNodeModules Whether to symlink node_modules
      * @return {Promise}
      */
   static async copyFrameworkSource (options) {
     const { path: fwPath } = await App.instance.waitForModule('adaptframework')
-    const BLACKLIST = ['.git', '.DS_Store', 'thumbs.db', 'node_modules', 'course', 'migrations']
+    const BLACKLIST = ['.git', '.DS_Store', 'thumbs.db', 'course', 'migrations']
+    if (options.copyNodeModules !== true) BLACKLIST.push('node_modules')
+
     const srcDir = path.join(fwPath, 'src')
     const enabledPlugins = options.enabledPlugins ?? []
     await fs.cp(fwPath, options.destDir, {
@@ -219,7 +222,7 @@ class AdaptFrameworkUtils {
         return !BLACKLIST.includes(path.basename(f))
       }
     })
-    if (!options.linkNodeModules) await fs.symlink(`${fwPath}/node_modules`, `${options.destDir}/node_modules`, 'junction')
+    if (options.linkNodeModules !== false) await fs.symlink(`${fwPath}/node_modules`, `${options.destDir}/node_modules`, 'junction')
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adapt-authoring-adaptframework",
-  "version": "1.9.0",
+  "version": "1.9.1",
   "description": "Adapt framework integration for the Adapt authoring tool",
   "homepage": "https://github.com/adapt-security/adapt-authoring-adaptframework",
   "license": "GPL-3.0",