fix npm path (#635)

.github/workflows/CI.yml

@@ -466,9 +466,7 @@ jobs:
           mkdir -p build
           mkdir -p artifacts
 
-          pushd "./src_assets/common/assets/web"
           npm install
-          popd
 
           cd build
           cmake -DCMAKE_BUILD_TYPE=Release \
@@ -588,9 +586,7 @@ jobs:
 
       - name: Build MacOS
         run: |
-          pushd "./src_assets/common/assets/web"
           npm install
-          popd
 
           mkdir build
           cd build
@@ -893,7 +889,6 @@ jobs:
             yasm
 
       - name: Install npm packages
-        working-directory: src_assets/common/assets/web
         run: |
           npm install
 

CMakeLists.txt

@@ -503,6 +503,9 @@ set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/sunshine.png)
 set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}")
 set(CPACK_STRIP_FILES YES)
 
+# install npm modules
+install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/node_modules" DESTINATION "${SUNSHINE_ASSETS_DIR}/web")
+
 # Platform specific options
 if(WIN32) # see options at: https://cmake.org/cmake/help/latest/cpack_gen/nsis.html
 	install(TARGETS sunshine RUNTIME DESTINATION "." COMPONENT application)

Dockerfile

@@ -43,7 +43,6 @@ WORKDIR /root/sunshine-build/
 COPY . .
 
 # setup npm and dependencies
-WORKDIR /root/sunshine-build/src_assets/common/assets/web
 RUN npm install
 
 # setup build directory

docs/source/building/linux.rst

@@ -231,9 +231,7 @@ npm dependencies
 Install npm dependencies.
    .. code-block:: bash
 
-      pushd ./src_assets/common/assets/web
       npm install
-      popd
 
 Build
 -----

docs/source/building/macos.rst

@@ -29,9 +29,7 @@ npm dependencies
 Install npm dependencies.
    .. code-block:: bash
 
-      pushd ./src_assets/common/assets/web
       npm install
-      popd
 
 Build
 -----

docs/source/building/windows.rst

@@ -19,9 +19,7 @@ Install nodejs and npm. Downloads available `here <https://nodejs.org/en/downloa
 Install npm dependencies.
    .. code-block:: bash
 
-      pushd ./src_assets/common/assets/web
       npm install
-      popd
 
 Build
 -----

packaging/linux/aur/PKGBUILD

@@ -25,7 +25,7 @@ prepare() {
 }
 
 build() {
-    pushd "$pkgname/src_assets/common/assets/web"
+    pushd "$pkgname"
     npm install
     popd
 

packaging/linux/flatpak/dev.lizardbyte.sunshine.yml

@@ -142,7 +142,7 @@ modules:
         NPM_CONFIG_LOGLEVEL: info
     build-commands:
       # Install npm dependencies
-      - cd ${FLATPAK_BUILDER_BUILDDIR}/src_assets/common/assets/web && npm install
+      - cd ${FLATPAK_BUILDER_BUILDDIR} && npm install
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
       - -DCMAKE_INSTALL_PREFIX=/app

packaging/macos/Portfile

@@ -56,7 +56,7 @@ platform darwin {
 }
 
 pre-build {
-    system -W ${worksrcpath}/src_assets/common/assets/web "npm install"
+    system -W ${worksrcpath} "npm install"
 }
 
 notes-append "Run @PROJECT_NAME@ by executing 'sunshine <path to user config>', e.g. 'sunshine ~/sunshine.conf' "