retire use of pnpm and code references

homebridge · Oct 1, 2024 · 16b7edf · 16b7edf
1 parent 69ac82d
commit 16b7edf
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 136 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to `homebridge-config-ui-x` will be documented in this file.
 ### Other Changes
 
 - update `@homebridge/hap-client` to `v2`
+- retire use of `pnpm` and code references
 
 ### Homebridge Dependencies
 

diff --git a/src/bin/hb-service.ts b/src/bin/hb-service.ts
@@ -1329,7 +1329,7 @@ export class HomebridgeServiceHelper {
   }
 
   /**
-   * Install / Remove a plugin using pnpm (supported platforms only)
+   * Install / Remove a plugin (supported platforms only)
    */
   private async npmPluginManagement(args: any[]) {
     if (!this.enableHbServicePluginManagement) {
@@ -1361,13 +1361,7 @@ export class HomebridgeServiceHelper {
       this.logger(`Path does not exist: "${cwd}"`, 'fail')
     }
 
-    let cmd: string
-
-    if (process.env.UIX_USE_PNPM === '1') {
-      cmd = `pnpm -C "${cwd}" ${action} ${target.name}`
-    } else {
-      cmd = `npm --prefix "${cwd}" ${action} ${target.name}`
-    }
+    let cmd: string = `npm --prefix "${cwd}" ${action} ${target.name}`
 
     if (action === 'add') {
       cmd += `@${target.version}`

diff --git a/src/bin/platforms/darwin.ts b/src/bin/platforms/darwin.ts
@@ -112,50 +112,33 @@ export class DarwinInstaller extends BasePlatform {
 
       const targetNodeVersion = execSync('node -v').toString('utf8').trim()
 
-      if (this.isPackage() && process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-        // pnpm+package mode
-        const cwd = dirname(process.env.UIX_CUSTOM_PLUGIN_PATH)
-
-        if (!await pathExists(cwd)) {
-          this.hbService.logger(`Path does not exist: "${cwd}"`, 'fail')
-          process.exit(1)
-        }
-
-        execSync(`pnpm -C "${cwd}" rebuild`, {
-          cwd,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt plugins in ${process.env.UIX_CUSTOM_PLUGIN_PATH} for Node.js ${targetNodeVersion}.`, 'succeed')
-      } else {
-        // normal global npm setups
-        const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
-          env: Object.assign({
-            npm_config_loglevel: 'silent',
-            npm_update_notifier: 'false',
-          }, process.env),
-        }).toString('utf8')
-
-        execSync('npm rebuild --unsafe-perm', {
-          cwd: process.env.UIX_BASE_PATH,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
-
-        if (all === true) {
-          // rebuild all modules
-          try {
-            execSync('npm rebuild --unsafe-perm', {
-              cwd: npmGlobalPath,
-              stdio: 'inherit',
-            })
-            this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
-          } catch (e) {
-            this.hbService.logger('Could not rebuild all modules - check Homebridge logs.', 'warn')
-          }
+      const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
+        env: Object.assign({
+          npm_config_loglevel: 'silent',
+          npm_update_notifier: 'false',
+        }, process.env),
+      }).toString('utf8')
+
+      execSync('npm rebuild --unsafe-perm', {
+        cwd: process.env.UIX_BASE_PATH,
+        stdio: 'inherit',
+      })
+      this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
+
+      if (all === true) {
+        // rebuild all modules
+        try {
+          execSync('npm rebuild --unsafe-perm', {
+            cwd: npmGlobalPath,
+            stdio: 'inherit',
+          })
+          this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
+        } catch (e) {
+          this.hbService.logger('Could not rebuild all modules - check Homebridge logs.', 'warn')
         }
-
-        await this.setNpmPermissions(npmGlobalPath)
       }
+
+      await this.setNpmPermissions(npmGlobalPath)
     } catch (e) {
       console.error(e.toString())
       this.hbService.logger('ERROR: Failed Operation', 'fail')

diff --git a/src/bin/platforms/linux.ts b/src/bin/platforms/linux.ts
@@ -199,46 +199,29 @@ export class LinuxInstaller extends BasePlatform {
 
       const targetNodeVersion = execSync('node -v').toString('utf8').trim()
 
-      if (this.isPackage() && process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-        // pnpm+package mode
-        const cwd = dirname(process.env.UIX_CUSTOM_PLUGIN_PATH)
-
-        if (!await pathExists(cwd)) {
-          this.hbService.logger(`Path does not exist: "${cwd}"`, 'fail')
-          process.exit(1)
-        }
+      const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
+        env: Object.assign({
+          npm_config_loglevel: 'silent',
+          npm_update_notifier: 'false',
+        }, process.env),
+      }).toString('utf8')
+
+      execSync('npm rebuild --unsafe-perm', {
+        cwd: process.env.UIX_BASE_PATH,
+        stdio: 'inherit',
+      })
+      this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
 
-        execSync(`pnpm -C "${cwd}" rebuild`, {
-          cwd,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt plugins in ${process.env.UIX_CUSTOM_PLUGIN_PATH} for Node.js ${targetNodeVersion}.`, 'succeed')
-      } else {
-        // normal global npm setups
-        const npmGlobalPath = execSync('/bin/echo -n "$(npm -g prefix)/lib/node_modules"', {
-          env: Object.assign({
-            npm_config_loglevel: 'silent',
-            npm_update_notifier: 'false',
-          }, process.env),
-        }).toString('utf8')
-
-        execSync('npm rebuild --unsafe-perm', {
-          cwd: process.env.UIX_BASE_PATH,
-          stdio: 'inherit',
-        })
-        this.hbService.logger(`Rebuilt homebridge-config-ui-x for Node.js ${targetNodeVersion}.`, 'succeed')
-
-        if (all === true) {
-          // rebuild all global node_modules
-          try {
-            execSync('npm rebuild --unsafe-perm', {
-              cwd: npmGlobalPath,
-              stdio: 'inherit',
-            })
-            this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
-          } catch (e) {
-            this.hbService.logger('Could not rebuild all plugins - check logs.', 'warn')
-          }
+      if (all === true) {
+        // rebuild all global node_modules
+        try {
+          execSync('npm rebuild --unsafe-perm', {
+            cwd: npmGlobalPath,
+            stdio: 'inherit',
+          })
+          this.hbService.logger(`Rebuilt plugins in ${npmGlobalPath} for Node.js ${targetNodeVersion}.`, 'succeed')
+        } catch (e) {
+          this.hbService.logger('Could not rebuild all plugins - check logs.', 'warn')
         }
       }
     } catch (e) {

diff --git a/src/core/config/config.service.ts b/src/core/config/config.service.ts
@@ -48,7 +48,6 @@ export class ConfigService {
   public enableTerminalAccess = this.runningInDocker || this.runningInSynologyPackage || this.runningInPackageMode || Boolean(process.env.HOMEBRIDGE_CONFIG_UI_TERMINAL === '1')
 
   // plugin management
-  public usePnpm = (process.env.UIX_USE_PNPM === '1')
   public usePluginBundles = (process.env.UIX_USE_PLUGIN_BUNDLES === '1')
 
   // recommend child bridges on platforms with > 2GB ram
@@ -214,7 +213,6 @@ export class ConfigService {
         customWallpaperHash: this.customWallpaperHash,
         setupWizardComplete: this.setupWizardComplete,
         recommendChildBridges: this.recommendChildBridges,
-        usePnpm: this.usePnpm,
       },
       formAuth: Boolean(this.ui.auth !== 'none'),
       theme: this.ui.theme || 'orange',

diff --git a/src/modules/plugins/plugins.service.ts b/src/modules/plugins/plugins.service.ts
@@ -451,11 +451,7 @@ export class PluginsService {
     const installOptions: Array<string> = []
 
     // check to see if custom plugin path is using a package.json file
-    if (
-      installPath === this.configService.customPluginPath
-      && !(action === 'uninstall' && this.configService.usePnpm)
-      && await pathExists(resolve(installPath, '../package.json'))
-    ) {
+    if (installPath === this.configService.customPluginPath && await pathExists(resolve(installPath, '../package.json'))) {
       installOptions.push('--save')
     }
 
@@ -1174,8 +1170,8 @@ export class PluginsService {
         this.logger.error('ERROR: You might be able to fix this problem by running: npm install -g npm')
       }
     }
-    // Linux and macOS don't require the full path to npm / pnpm
-    return this.configService.usePnpm ? ['pnpm'] : ['npm']
+    // Linux and macOS don't require the full path to npm
+    return ['npm']
   }
 
   /**
@@ -1399,14 +1395,9 @@ export class PluginsService {
       npm_config_update_notifier: 'false',
       npm_config_prefer_online: 'true',
       npm_config_foreground_scripts: 'true',
+      npm_config_loglevel: 'error',
     })
 
-    if (!this.configService.usePnpm) {
-      Object.assign(env, {
-        npm_config_loglevel: 'error',
-      })
-    }
-
     // set global prefix for unix based systems
     if (command.includes('-g') && basename(cwd) === 'lib') {
       cwd = dirname(cwd)

diff --git a/src/self-check.ts b/src/self-check.ts
@@ -13,17 +13,10 @@ function tryRebuildNodePtyModule() {
   logger.warn('[node-pty] Trying to rebuild automatically...')
   logger.warn(`[node-pty] Path: ${modulePath}`)
   try {
-    if (process.env.UIX_USE_PNPM === '1' && process.env.UIX_CUSTOM_PLUGIN_PATH) {
-      execSync('pnpm rebuild @homebridge/node-pty-prebuilt-multiarch', {
-        cwd: process.env.UIX_CUSTOM_PLUGIN_PATH,
-        stdio: 'ignore',
-      })
-    } else {
-      execSync('npm run install --unsafe-perm', {
-        cwd: modulePath,
-        stdio: 'ignore',
-      })
-    }
+    execSync('npm run install --unsafe-perm', {
+      cwd: modulePath,
+      stdio: 'ignore',
+    })
   } catch (e) {
     if (platform() !== 'win32') {
       execSync('sudo -E -n run install --unsafe-perm', {

diff --git a/ui/src/app/core/settings.service.ts b/ui/src/app/core/settings.service.ts
@@ -33,7 +33,6 @@ interface EnvInterface {
   customWallpaperHash: string
   setupWizardComplete: boolean
   recommendChildBridges: boolean
-  usePnpm: boolean
 }
 
 interface AppSettingsInterface {

diff --git a/ui/src/app/modules/status/status.component.html b/ui/src/app/modules/status/status.component.html
@@ -40,8 +40,6 @@ <h3 class="primary-text m-0">{{ 'menu.label_status' | translate }}</h3>
   </div>
   <div class="row mb-auto">
     <div class="col-md-12 text-center px-4 pt-1 pt-lg-2 pb-3 pb-lg-2 grey-text">
-      <a class="red-text" href="javascript: void(0);" (click)="openPnpmModal()" *ngIf="$settings.env.usePnpm">
-        <i class="fas fa-fw fa-warning"></i></a>
       <!-- The below copyright notice shall be included and displayed on all copies or substantial portions of this software. -->
       <small>
         &copy; 2024

diff --git a/ui/src/app/modules/status/status.component.ts b/ui/src/app/modules/status/status.component.ts
@@ -1,5 +1,4 @@
 import { AuthService } from '@/app/core/auth/auth.service'
-import { InformationComponent } from '@/app/core/components/information/information.component'
 import { NotificationService } from '@/app/core/notification.service'
 import { SettingsService } from '@/app/core/settings.service'
 import { IoNamespace, WsService } from '@/app/core/ws.service'
@@ -278,23 +277,6 @@ export class StatusComponent implements OnInit, OnDestroy {
     })
   }
 
-  openPnpmModal() {
-    const ref = this.$modal.open(InformationComponent, {
-      size: 'lg',
-      backdrop: 'static',
-    })
-    ref.componentInstance.title = 'pnpm'
-    ref.componentInstance.subtitle = 'This warning is visible as you are using the pnpm package manager.'
-    ref.componentInstance.message = 'The next version of Homebridge UI will no longer support pnpm.'
-    + ' You should consider updating your Homebridge instance to use npm instead.'
-    + ' This can be done by following the update instructions in the Homebridge APT package documentation.'
-    + ' See the link below for more information.'
-    ref.componentInstance.faIconClass = 'fab fa-fw fa-npm red-text'
-
-    ref.componentInstance.ctaButtonLabel = 'Update Info'
-    ref.componentInstance.ctaButtonLink = 'https://github.com/homebridge/homebridge-apt-pkg/blob/latest/README.md#using-apt'
-  }
-
   ngOnDestroy() {
     this.io.end()
     this.saveWidgetsEvent.complete()