Do not copy any theme files into project level node_modules

Author: knolleary

lib/launcher.js

@@ -4,7 +4,7 @@ const fs = require('fs/promises')
 const { readFileSync } = require('fs')
 const path = require('path')
 const { log, info, debug, warn, NRlog } = require('./logging/log')
-const { copyDir, hasProperty } = require('./utils')
+const { hasProperty } = require('./utils')
 const { States } = require('./states')
 const { default: got } = require('got')
 
@@ -55,7 +55,6 @@ class Launcher {
             credentials: path.join(this.projectDir, 'flows_cred.json'),
             settings: path.join(this.projectDir, 'settings.js'),
             userSettings: path.join(this.projectDir, 'settings.json'),
-            themeDir: path.join(this.projectDir, 'node_modules', '@flowfuse', 'nr-theme'),
             npmrc: path.join(this.projectDir, '.npmrc')
         }
     }
@@ -80,11 +79,11 @@ class Launcher {
                 packageData.dependencies['@flowfuse/nr-assistant'] = `file:${devPath}`
             }
         }
-        if (!packageData.dependencies['@flowfuse/nr-theme']) {
-            // Ensure the theme package is in package.json so that its resources
-            // don't get removed by npm.
-            packageData.dependencies['@flowfuse/nr-theme'] = '*'
-        }
+        // if (!packageData.dependencies['@flowfuse/nr-theme']) {
+        //     // Ensure the theme package is in package.json so that its resources
+        //     // don't get removed by npm.
+        //     packageData.dependencies['@flowfuse/nr-theme'] = '*'
+        // }
         packageData.version = `0.0.0-${this.snapshot.id}`
         packageData.name = this.snapshot.env.FF_PROJECT_NAME
         if (this.snapshot.name && this.snapshot.description) {
@@ -393,26 +392,6 @@ class Launcher {
         }
     }
 
-    async writeThemeFiles () {
-        info('Updating theme files')
-        const sourceDir1 = path.join(__dirname, '..', 'node_modules', '@flowfuse', 'nr-theme')
-        const sourceDir2 = path.join(__dirname, '..', '..', 'nr-theme')
-        const sourceDir = existsSync(sourceDir1) ? sourceDir1 : sourceDir2
-        const targetDir = path.join(this.projectDir, 'node_modules', '@flowfuse', 'nr-theme')
-        try {
-            if (!existsSync(sourceDir)) {
-                info(`Could not write theme files. Theme not found: '${sourceDir}'`)
-                return
-            }
-            if (!existsSync(targetDir)) {
-                await fs.mkdir(targetDir, { recursive: true })
-            }
-            await copyDir(sourceDir, targetDir, { recursive: true })
-        } catch (error) {
-            info(`Could not write theme files to disk: '${targetDir}'`)
-        }
-    }
-
     async logAuditEvent (event, body) {
         const data = {
             timestamp: Date.now(),
@@ -459,13 +438,6 @@ class Launcher {
             await this.writeSettings()
         }
 
-        if (!existsSync(this.files.themeDir)) {
-            // As the theme may not present (due to earlier versions of the agent launcher),
-            // we will independently write the theme files to the device project
-            // (if the directory is not present)
-            await this.writeThemeFiles()
-        }
-
         const filterEnv = (env) =>
             Object.entries(env).reduce((acc, [key, value]) =>
                 key.startsWith('FORGE') ? acc : { ...acc, [key]: value }, {})

lib/utils.js

@@ -1,13 +1,10 @@
-const path = require('path')
-const fs = require('fs').promises
 const proxyFromEnv = require('proxy-from-env')
 
 module.exports = {
     compareNodeRedData,
     compareObjects,
     isObject,
     hasProperty,
-    copyDir,
     getWSProxyAgent,
     getHTTPProxyAgent
 }
@@ -85,39 +82,6 @@ function hasProperty (object, property) {
     return !!(object && Object.prototype.hasOwnProperty.call(object, property))
 }
 
-/**
- * Copy a directory from one location to another
- * @param {string} src - source directory
- * @param {string} dest - destination directory
- * @param {Object} [options] - options
- * @param {boolean} [options.recursive=true] - whether to copy recursively (default: true)
- */
-async function copyDir (src, dest, { recursive = true } = {}) {
-    // for nodejs v 16.7.0 and later, fs.cp will be available
-    if (fs.cp && typeof fs.cp === 'function') {
-        await fs.cp(src, dest, { recursive })
-        return
-    }
-    // fallback to own implementation of recursive copy (for Node.js 14)
-    // TODO: remove this when Node.js 14 is no longer supported by the device agent
-    const cp = async (src, dest) => {
-        const lstat = await fs.lstat(src).catch(_err => { })
-        if (!lstat) {
-            // do nothing
-        } else if (lstat.isFile()) {
-            await fs.copyFile(src, dest)
-        } else if (lstat.isDirectory()) {
-            await fs.mkdir(dest).catch(_err => { })
-            if (recursive) {
-                for (const f of await fs.readdir(src)) {
-                    await cp(path.join(src, f), path.join(dest, f))
-                }
-            }
-        }
-    }
-    await cp(src, dest)
-}
-
 /**
  * Get a specific proxy agent for a WebSocket connection. This should be applied to the `wsOptions.agent` property
  *