remove separate vendoring of node_modules

pujitm · pujitm · commit c2c6ff397bb8 · 2025-06-11T11:15:14.000-04:00
diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml
@@ -100,11 +100,6 @@ jobs:
         with:
           name: unraid-api
           path: ${{ github.workspace }}/plugin/api/
-      - name: Download PNPM Store
-        uses: actions/download-artifact@v4
-        with:
-          name: packed-node-modules
-          path: ${{ github.workspace }}/plugin/node-modules-archive/
       - name: Extract Unraid API
         run: |
           mkdir -p ${{ github.workspace }}/plugin/source/dynamix.unraid.net/usr/local/unraid-api
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -185,11 +185,6 @@ jobs:
         with:
           name: unraid-api
           path: ${{ github.workspace }}/api/deploy/unraid-api.tgz
-      - name: Upload Node Modules to Github artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: packed-node-modules
-          path: ${{ github.workspace }}/api/deploy/node-modules-archive/packed-node-modules.tar.xz
 
   build-unraid-ui-webcomponents:
     name: Build Unraid UI Library (Webcomponent Version)
diff --git a/api/scripts/build.ts b/api/scripts/build.ts
@@ -120,13 +120,6 @@ try {
         }
     }
 
-    const compressionLevel = process.env.WATCH_MODE ? '-1' : '-5';
-    await $`XZ_OPT=${compressionLevel} tar -cJf packed-node-modules.tar.xz node_modules`;
-    // Create a subdirectory for the node modules archive
-    await mkdir('../node-modules-archive', { recursive: true });
-    await $`mv packed-node-modules.tar.xz ../node-modules-archive/`;
-    // await $`rm -rf node_modules`;
-
     // Clean the release directory
     await $`rm -rf ../release/*`;
 
diff --git a/plugin/builder/build-plugin.ts b/plugin/builder/build-plugin.ts
@@ -3,7 +3,7 @@ import { $ } from "zx";
 import { escape as escapeHtml } from "html-sloppy-escaper";
 import { dirname, join } from "node:path";
 import { getTxzName, pluginName, startingDir, defaultArch, defaultBuild } from "./utils/consts";
-import { getAssetUrl, getPluginUrl } from "./utils/bucket-urls";
+import { getPluginUrl } from "./utils/bucket-urls";
 import { getMainTxzUrl } from "./utils/bucket-urls";
 import {
   deployDir,
@@ -12,7 +12,7 @@ import {
 } from "./utils/paths";
 import { PluginEnv, setupPluginEnv } from "./cli/setup-plugin-environment";
 import { cleanupPluginFiles } from "./utils/cleanup";
-import { bundleVendorStore, getVendorBundleName } from "./build-vendor-store";
+import { getVendorBundleName } from "./build-vendor-store";
 
 /**
  * Check if git is available
@@ -123,7 +123,6 @@ const main = async () => {
 
     await buildPlugin(validatedEnv);
     await moveTxzFile(validatedEnv);
-    await bundleVendorStore(validatedEnv.apiVersion);
   } catch (error) {
     console.error(error);
     process.exit(1);
diff --git a/plugin/builder/build-vendor-store.ts b/plugin/builder/build-vendor-store.ts
@@ -54,6 +54,7 @@ async function createNodeModulesTarball(outputPath: string): Promise<void> {
  * After this operation, the vendored node_modules will be available inside the `deployDir`.
  * 
  * @param apiVersion Required API version to use for the vendor bundle
+ * @deprecated vendored node_modules are now included in the API slackware package
  */
 export async function bundleVendorStore(apiVersion: string): Promise<void> {
     // Ensure deploy directory exists
diff --git a/plugin/docker-compose.yml b/plugin/docker-compose.yml
@@ -14,7 +14,6 @@ services:
       - ../unraid-ui/dist-wc:/app/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/uui
       - ../web/.nuxt/nuxt-custom-elements/dist/unraid-components:/app/source/dynamix.unraid.net/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/nuxt
       - ../api/deploy/release/:/app/source/dynamix.unraid.net/usr/local/unraid-api # Use the release dir instead of pack to allow watcher to not try to build with node_modules
-      - ../api/deploy/node-modules-archive:/app/node-modules-archive
     stdin_open: true # equivalent to -i
     tty: true        # equivalent to -t
     environment:
diff --git a/plugin/plugins/dynamix.unraid.net.plg b/plugin/plugins/dynamix.unraid.net.plg
@@ -9,8 +9,6 @@
   <!ENTITY txz_sha256 "">
   <!ENTITY txz_url "">
   <!ENTITY txz_name "">
-  <!ENTITY vendor_store_url "">
-  <!ENTITY vendor_store_filename "">
   <!ENTITY arch "x86_64">
   <!ENTITY build "1">
   <!ENTITY tag "">
@@ -219,7 +217,6 @@ exit 0
       PKG_FILE="&source;"      # Full path to the package file including .txz extension
       PKG_URL="&txz_url;"      # URL where package was downloaded from
       PKG_NAME="&txz_name;"    # Name of the package file
-      VENDOR_ARCHIVE="/boot/config/plugins/dynamix.my.servers/&vendor_store_filename;"
     <![CDATA[
 # Install the Slackware package
 echo "Installing package..."

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,6 @@ try {`
`120`	`120`	`}`
`121`	`121`	`}`
`122`	`122`
`123`		`- const compressionLevel = process.env.WATCH_MODE ? '-1' : '-5';`
`124`		- await $`XZ_OPT=${compressionLevel} tar -cJf packed-node-modules.tar.xz node_modules`;
`125`		`- // Create a subdirectory for the node modules archive`
`126`		`- await mkdir('../node-modules-archive', { recursive: true });`
`127`		- await $`mv packed-node-modules.tar.xz ../node-modules-archive/`;
`128`		- // await $`rm -rf node_modules`;
`129`		`-`
`130`	`123`	`// Clean the release directory`
`131`	`124`	await $`rm -rf ../release/*`;
`132`	`125`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ async function createNodeModulesTarball(outputPath: string): Promise<void> {`
`54`	`54`	* After this operation, the vendored node_modules will be available inside the `deployDir`.
`55`	`55`	`*`
`56`	`56`	`* @param apiVersion Required API version to use for the vendor bundle`
	`57`	`+ * @deprecated vendored node_modules are now included in the API slackware package`
`57`	`58`	`*/`
`58`	`59`	`export async function bundleVendorStore(apiVersion: string): Promise<void> {`
`59`	`60`	`// Ensure deploy directory exists`