adminforth 1.1.104 → 1.1.105

package/dist/modules/codeInjector.js

@@ -91,7 +91,7 @@ class CodeInjector {
     }
     prepareSources(_a) {
         return __awaiter(this, arguments, void 0, function* ({ filesUpdated, verbose = false }) {
-            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+            var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
             // check SPA_TMP_PATH exists and create if not
             try {
                 yield fs.promises.access(CodeInjector.SPA_TMP_PATH, fs.constants.F_OK);
@@ -245,7 +245,7 @@ class CodeInjector {
             // icons are collectionName:iconName. Get list of all unique collection names:
             const collections = new Set(icons.map((icon) => icon.split(':')[0]));
             // package names @iconify-prerendered/vue-<collection name>
-            const packageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
+            const iconPackageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
             // for each icon generate import statement
             const iconImports = uniqueIcons.map((icon) => {
                 const [collection, iconName] = icon.split(':');
@@ -358,47 +358,67 @@ class CodeInjector {
             const spaPackageLock = JSON.parse(yield fs.promises.readFile(spaPackageLockPath, 'utf-8'));
             const spaLockHash = hashify(spaPackageLock);
             /* customPackageLock */
-            const usersPackagePath = path.join('./package.json');
-            const usersPackage = JSON.parse(yield fs.promises.readFile(usersPackagePath, 'utf-8'));
-            const usersLockPath = path.join('./package-lock.json');
-            const usersLock = JSON.parse(yield fs.promises.readFile(usersLockPath, 'utf-8'));
-            const usersLockHash = hashify(usersLock);
-            const packagesNamesHash = hashify(packageNames);
-            const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
-            const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
-            try {
-                const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
-                if (existingHash === fullHash) {
-                    console.log('Hashes match, skipping npm ci/install');
-                    return;
+            let usersLockHash = '';
+            let usersLock = null;
+            if ((_m = this.adminforth.config.customization) === null || _m === void 0 ? void 0 : _m.customComponentsDir) {
+                const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
+                let usersPackage = null;
+                try {
+                    usersPackage = JSON.parse(yield fs.promises.readFile(usersPackagePath, 'utf-8'));
                 }
-                else {
+                catch (e) {
+                    // user package.json does not exist, user does not have custom components
+                }
+                if (usersPackage) {
+                    const usersLockPath = path.join(this.adminforth.config.customization.customComponentsDir, 'package-lock.json');
+                    try {
+                        usersLock = JSON.parse(yield fs.promises.readFile(usersLockPath, 'utf-8'));
+                    }
+                    catch (e) {
+                        throw new Error(`Custom package-lock.json does not exist in ${this.adminforth.config.customization.customComponentsDir}, but package.json does. 
+            We can't determine version of packages without package-lock.json. Please run npm install in ${this.adminforth.config.customization.customComponentsDir}`);
+                    }
+                    usersLockHash = hashify(usersLock);
+                }
+                const iconPackagesNamesHash = hashify(iconPackageNames);
+                const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
+                const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
+                try {
+                    const existingHash = yield fs.promises.readFile(hashPath, 'utf-8');
+                    if (existingHash === fullHash) {
+                        console.log('Hashes match, skipping npm ci/install');
+                        return;
+                    }
+                    else {
+                        if (verbose) {
+                            console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
+                        }
+                    }
+                }
+                catch (e) {
+                    // ignore
                     if (verbose) {
-                        console.log(`Hashes do not match: existing ${existingHash} new ${fullHash}, proceeding with npm ci/install`);
+                        console.log('Hash file does not exist, proceeding with npm ci/install');
                     }
                 }
-            }
-            catch (e) {
-                // ignore
-                if (verbose) {
-                    console.log('Hash file does not exist, proceeding with npm ci/install');
+                yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
+                let customPackgeNames = [];
+                if (usersPackage && usersLock) {
+                    customPackgeNames = [
+                        ...Object.keys(usersPackage.dependencies),
+                        ...Object.keys(usersPackage.devDependencies || [])
+                    ].reduce((acc, packageName) => {
+                        const version = usersLock.packages[`node_modules/${packageName}`].version;
+                        acc.push(`${packageName}@${version}`);
+                        return acc;
+                    }, []);
                 }
+                if (iconPackageNames.length) {
+                    const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
+                    yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
+                }
+                yield fs.promises.writeFile(hashPath, fullHash);
             }
-            yield this.runNpmShell({ command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH });
-            // get packages with version from customPackage
-            const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon', 'adminforth'];
-            const customPackgeNames = [...Object.keys(usersPackage.dependencies), ...Object.keys(usersPackage.devDependencies || [])]
-                .filter((packageName) => !IGNORE_PACKAGES.includes(packageName))
-                .reduce((acc, packageName) => {
-                const version = usersLock.packages[`node_modules/${packageName}`].version;
-                acc.push(`${packageName}@${version}`);
-                return acc;
-            }, []);
-            if (packageNames.length) {
-                const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
-                yield this.runNpmShell({ command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH });
-            }
-            yield fs.promises.writeFile(hashPath, fullHash);
         });
     }
     watchForReprepare(_a) {

package/modules/codeInjector.ts

@@ -271,7 +271,7 @@ class CodeInjector implements ICodeInjector {
     const collections = new Set(icons.map((icon) => icon.split(':')[0]));
 
     // package names @iconify-prerendered/vue-<collection name>
-    const packageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
+    const iconPackageNames = Array.from(collections).map((collection) => `@iconify-prerendered/vue-${collection}`);
 
     // for each icon generate import statement
     const iconImports = uniqueIcons.map((icon) => {
@@ -411,16 +411,30 @@ class CodeInjector implements ICodeInjector {
     const spaLockHash = hashify(spaPackageLock);
 
     /* customPackageLock */
-    const usersPackagePath = path.join('./package.json');
-    const usersPackage = JSON.parse(await fs.promises.readFile(usersPackagePath, 'utf-8'));
-
-    const usersLockPath = path.join('./package-lock.json');
-    const usersLock = JSON.parse(await fs.promises.readFile(usersLockPath, 'utf-8'));
-    const usersLockHash = hashify(usersLock);
+    let usersLockHash = '';
+    let usersLock = null;
+    if (this.adminforth.config.customization?.customComponentsDir) {
+      const usersPackagePath = path.join(this.adminforth.config.customization.customComponentsDir, 'package.json');
+      let usersPackage = null;
+      try {
+        usersPackage = JSON.parse(await fs.promises.readFile(usersPackagePath, 'utf-8'));
+      } catch (e) {
+        // user package.json does not exist, user does not have custom components
+      }
+      if (usersPackage) {
+        const usersLockPath = path.join(this.adminforth.config.customization.customComponentsDir, 'package-lock.json');
+        try {
+          usersLock = JSON.parse(await fs.promises.readFile(usersLockPath, 'utf-8'));
+        } catch (e) {
+          throw new Error(`Custom package-lock.json does not exist in ${this.adminforth.config.customization.customComponentsDir}, but package.json does. 
+            We can't determine version of packages without package-lock.json. Please run npm install in ${this.adminforth.config.customization.customComponentsDir}`);
+        }
+        usersLockHash = hashify(usersLock);
+      }
 
-    const packagesNamesHash = hashify(packageNames);
+    const iconPackagesNamesHash = hashify(iconPackageNames);
 
-    const fullHash = `${spaLockHash}::${packagesNamesHash}::${usersLockHash}`;
+    const fullHash = `${spaLockHash}::${iconPackagesNamesHash}::${usersLockHash}`;
     const hashPath = path.join(CodeInjector.SPA_TMP_PATH, 'node_modules', '.adminforth_hash');
 
     try {
@@ -442,25 +456,29 @@ class CodeInjector implements ICodeInjector {
 
     await this.runNpmShell({command: 'ci', verbose, cwd: CodeInjector.SPA_TMP_PATH});
 
-    // get packages with version from customPackage
-    const IGNORE_PACKAGES = ['tsx', 'typescript', 'express', 'nodemon', 'adminforth'];
-    const customPackgeNames = [...Object.keys(usersPackage.dependencies), ...Object.keys(usersPackage.devDependencies || [])]
-      .filter((packageName) => !IGNORE_PACKAGES.includes(packageName))
-      .reduce(
-        (acc, packageName) => {
-          const version = usersLock.packages[`node_modules/${packageName}`].version;
-          acc.push(`${packageName}@${version}`);
-          return acc;
-        }, []);
-
-    if (packageNames.length) {
-      const npmInstallCommand = `install ${[...packageNames, ...customPackgeNames].join(' ')}`;
+    let customPackgeNames = [];
+    if (usersPackage && usersLock) {
+      customPackgeNames = [
+        ...Object.keys(usersPackage.dependencies),
+        ...Object.keys(usersPackage.devDependencies || [])
+      ].reduce(
+          (acc, packageName) => {
+            const version = usersLock.packages[`node_modules/${packageName}`].version;
+            acc.push(`${packageName}@${version}`);
+            return acc;
+          }, []
+      );
+    }
+
+    if (iconPackageNames.length) {
+      const npmInstallCommand = `install ${[...iconPackageNames, ...customPackgeNames].join(' ')}`;
       await this.runNpmShell({command: npmInstallCommand, cwd: CodeInjector.SPA_TMP_PATH});
     }
 
     await fs.promises.writeFile(hashPath, fullHash);
 
   }
+}
 
 async watchForReprepare({ verbose }) {
     const spaPath = path.join(ADMIN_FORTH_ABSOLUTE_PATH, 'spa');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adminforth",
-  "version": "1.1.104",
+  "version": "1.1.105",
   "description": "OpenSource Vue3 powered forth-generation admin panel",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",