zwave-js · robertsLando · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -52,7 +52,7 @@ body:
         - Snap
         - NPM
         - Home Assistant Add-on
-        - Manually built (git clone - yarn build - yarn install
+        - Manually built (git clone - npm run build - npm install
     validations:
       required: true
   - type: input

diff --git a/.github/ISSUE_TEMPLATE/hass_discovery.md b/.github/ISSUE_TEMPLATE/hass_discovery.md
@@ -17,7 +17,7 @@ Home Assistant --> settings --> Integrations --> Z-Wave JS --> Configure --> Cre
 Build/Run method:
 
 [ ] Docker
-[ ] Git Clone + yarn install + yarn run build + yarn start
+[ ] Git Clone + npm install + npm run build + npm start
 [ ] Pkg
 
 Z-Wave JS UI version: **[Enter Version Number]**

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,14 +26,14 @@ jobs:
         uses: actions/setup-node@v3.4.1
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
-        run: yarn install --immutable
+        run: npm ci
 
       - name: Lint
         if: matrix['node-version'] == '18.x'
-        run: yarn run lint
+        run: npm run lint
 
       - name: Prepare lint auto-fix patch
         if: |
@@ -43,7 +43,7 @@ jobs:
         id: lint
         run: |
           # Run all lint commands and abort if one has unfixable errors
-          yarn run lint-fix
+          npm run lint-fix
           git diff --name-only || true
           if ! git diff --quiet ; then
             echo "has changes"
@@ -65,13 +65,13 @@ jobs:
           path: fix.patch
 
       - name: Test
-        run: yarn run test
+        run: npm run test
 
       - name: Generate coverage report
         if: matrix['node-version'] == '18.x'
         run: |
-          yarn run coverage
-          yarn run record-coverage
+          npm run coverage
+          npm run record-coverage
 
       - name: Coveralls
         uses: coverallsapp/github-action@master

diff --git a/.github/workflows/docker-release-test.yml b/.github/workflows/docker-release-test.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/setup-node@v3.6.0
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
 
       - uses: docker/setup-buildx-action@v3
       - uses: docker/setup-qemu-action@v3
@@ -61,8 +61,8 @@ jobs:
 
       - name: Pre-build frontend and backend files
         run: |
-          yarn install --immutable
-          yarn build
+          npm ci
+          npm run build
 
       - name: build+push
         uses: docker/build-push-action@v5

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'yarn'
+          cache: 'npm'
 
       - uses: docker/setup-buildx-action@v3
       - uses: docker/setup-qemu-action@v3
@@ -77,8 +77,8 @@ jobs:
 
       - name: Pre-build frontend and backend files
         run: |
-          yarn install --immutable
-          yarn build
+          npm ci
+          npm run build
 
       - name: build+push
         timeout-minutes: 120 # prevents this to run indeterminatly

diff --git a/.github/workflows/package_arm64.yml b/.github/workflows/package_arm64.yml
@@ -20,12 +20,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "yarn"
+          cache: "npm"
 
       - name: Install and pre-build
         run: |
-          yarn install --immutable
-          yarn build
+          npm ci
+          npm run build
 
       - uses: uraimo/run-on-arch-action@v2
         name: Package
@@ -45,7 +45,7 @@ jobs:
 
       - name: Build for arm64
         run: |
-          yarn pkg --skip-build --arch=arm64
+          npm run pkg -- --skip-build --arch=arm64
 
       - name: Upload artifacts
         if: github.event_name == 'workflow_dispatch'

diff --git a/.github/workflows/package_armv7.yml b/.github/workflows/package_armv7.yml
@@ -20,12 +20,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: "yarn"
+          cache: "npm"
 
       - name: Install and pre-build
         run: |
-          yarn install --immutable
-          yarn build
+          npm ci
+          npm run build
 
       - name: Restore cache
         uses: actions/cache@v3
@@ -57,7 +57,7 @@ jobs:
           export PKG_IGNORE_TAG=true
           curl https://github.com/yao-pkg/pkg-binaries/releases/download/node18/built-v18.18.2-linux-armv7 -LOJ
           mv built-v18.18.2-linux-armv7 $PKG_CACHE_PATH/built-v${{ matrix.node-version }}-linux-armv7
-          yarn pkg --skip-build --arch=armv7
+          npm run pkg -- --skip-build --arch=armv7
 
       - name: Upload artifacts
         if: github.event_name == 'workflow_dispatch'

diff --git a/.github/workflows/release-it.yml b/.github/workflows/release-it.yml
@@ -29,10 +29,10 @@ jobs:
         uses: actions/setup-node@v3.6.0
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Install dependencies
-        run: yarn install --immutable
+        run: npm ci
 
       - name: Initialize NPM config
         run: |

diff --git a/.github/workflows/update-dep.yml b/.github/workflows/update-dep.yml
@@ -25,11 +25,11 @@ jobs:
         uses: actions/setup-node@v3.6.0
         with:
           node-version: 20.x
-          cache: 'yarn'
+          cache: 'npm'
 
       - name: Update dependency
         run: |
-          yarn add ${{github.event.inputs.dep}}${{github.event.inputs.version}}
+          npm install ${{github.event.inputs.dep}}${{github.event.inputs.version || 'latest'}}
       - name: Check for changes
         id: check
         run: |

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,8 +4,9 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Debug",
-			"runtimeExecutable": "yarn",
+			"runtimeExecutable": "npm",
 			"runtimeArgs": [
+				"run",
 				"dev:server"
 			],
 			"env": {},
@@ -18,8 +19,9 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Debug HTTPS",
-			"runtimeExecutable": "yarn",
+			"runtimeExecutable": "npm",
 			"runtimeArgs": [
+				"run",
 				"dev:server"
 			],
 			"env": {},

diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -20,26 +20,20 @@ RUN \
         build-base \
         linux-headers \
         python3-dev \
-        npm=9.6.6-r0 \
-    \
-    && npm install --global yarn
-
-ENV YARN_HTTP_TIMEOUT=300000
-# set production env install will not install devDependencies
-ENV NODE_ENV=production
+        npm=9.6.6-r0
 
 COPY . .
 
-# if node_modules does not exist, run it, otherwise skip
-RUN [ -d 'node_modules' ] && echo "Skipping install" || yarn install --immutable
+# if node_modules does not exist, install deps, if dist is missing, install also dev deps
+RUN [ -d 'node_modules' ] && echo "Skipping install" || npm install $([ -d 'dist'] && echo '--omit=dev' || echo '')
 
 # Fix issue with serialport bindings #2349
 RUN npm_config_build_from_source=true npm rebuild @serialport/bindings-cpp
 
 # Build back and frontend only when not existing
 RUN [ -d 'dist' ] && echo "Skipping build" || npm run build
 
-RUN npm prune --production && \
+RUN npm prune --omit=dev && \
     rm -rf \
     package-lock.json \
     build \
@@ -50,14 +44,13 @@ RUN npm prune --production && \
     docs \
     kubernetes \
     test \
-    .yarn \
     .github \
     .vscode
 
 # add plugin support, space separated
 ARG plugins
 RUN if [ ! -z "$plugins" ]; \
-    then echo "Installing plugins ${plugins}"; yarn add ${plugins} ; fi
+    then echo "Installing plugins ${plugins}"; npm install ${plugins} ; fi
 
 # when update devices arg is set update config files from zwavejs repo
 ARG updateDevices

diff --git a/docker/Dockerfile.contrib b/docker/Dockerfile.contrib
@@ -31,14 +31,12 @@ FROM ${SRC} AS build
 
 # Setup the container
 USER root
-RUN apt-get update && apt-get install -y jq
 
 ### Build node-zwave-js ###
 USER node
 WORKDIR /home/node/node-zwave-js
-ENV YARN_HTTP_TIMEOUT=300000
 
-RUN yarn
+RUN yarn install --immutable
 RUN yarn build
 
 # Update the version info to match the branch built
@@ -56,18 +54,23 @@ RUN cat package.json \
 		> package2.json \
 	&& rm package.json && mv package2.json package.json
 
-RUN yarn
-RUN yarn build
+RUN npm ci
+RUN npm run build
 
 # Prune devDependencies
-RUN yarn remove $(cat package.json | jq -r '.devDependencies | keys | join(" ")') \
-	&& rm -rf \
-		build \
-		docs \
-		src \
-		static \
-		.yarn \
-		package.sh
+RUN npm prune --production && \
+    rm -rf \
+    package-lock.json \
+    build \
+    package.sh \
+    src \
+    api \
+    static \
+    docs \
+    kubernetes \
+    test \
+    .github \
+    .vscode
 
 # Copy to distribution folder
 RUN mkdir my_dist \
@@ -83,9 +86,7 @@ RUN mkdir my_dist \
 		snippets \
 		store \
 		views \
-		.yarnrc.yml \
 		package.json \
-		yarn.lock \
 		my_dist
 
 #####################

diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian
@@ -10,39 +10,35 @@ RUN apt-get update && apt-get install -y \
     python3 \
     && rm -rf /var/lib/apt/lists/*
 
-COPY package.json yarn.lock .yarnrc.yml ./
-COPY .yarn/releases .yarn/releases
-
-ENV YARN_HTTP_TIMEOUT=300000
 # set production env install will not install devDependencies
 ENV NODE_ENV=production
 
 COPY . .
 
 # if node_modules does not exist, run it, otherwise skip
-RUN [ -d 'node_modules' ] && echo "Skipping install" || yarn install --immutable
+RUN [ -d 'node_modules' ] && echo "Skipping install" || npm ci
 
 # Fix issue with serialport bindings #2349
 RUN npm_config_build_from_source=true npm rebuild @serialport/bindings-cpp
 
 # Build back and frontend only when not existing
-RUN [ -d 'dist' ] && echo "Skipping build" || yarn build
+RUN [ -d 'dist' ] && echo "Skipping build" || npm run build
 
-RUN yarn remove $(cat package.json | jq -r '.devDependencies | keys | join(" ")') && \
+RUN npm prune --production && \
     rm -rf \
     build \
     package.sh \
     src \
+    api \
     static \
     docs \
-    .yarn \
     .github \
     .vscode
 
 # add plugin support, space separated
 ARG plugins
 RUN if [ ! -z "$plugins" ]; \
-    then echo "Installing plugins ${plugins}"; yarn add ${plugins} ; fi
+    then echo "Installing plugins ${plugins}"; npm install ${plugins} ; fi
 
 # when update devices arg is set update config files from zwavejs repo
 ARG updateDevices

diff --git a/docs/development/intro.md b/docs/development/intro.md
@@ -2,16 +2,16 @@
 
 Developers who wants to debug the application have to open two terminals.
 
-In first terminal run `yarn dev` to start webpack-dev for front-end developing and hot reloading at <http://localhost:8092>
+In first terminal run `npm run dev` to start webpack-dev for front-end developing and hot reloading at <http://localhost:8092>
 (**THE PORT FOR DEVELOPING IS 8092**)
 
-In the second terminal run `yarn dev:server` to start the backend server with inspect and auto restart features
+In the second terminal run `npm run dev:server` to start the backend server with inspect and auto restart features
 
-To package the application run `yarn pkg` command and follow the steps
+To package the application run `npm run pkg` command and follow the steps
 
 ## Developing against a different backend
 
-By default running `yarn dev:server` will proxy the requests to a backend listening on _localhost_ on port _8091_.
+By default running `npm run dev:server` will proxy the requests to a backend listening on _localhost_ on port _8091_.
 
 If you want to run the development frontend against a different backend you have the following environment variables
 that you can use to redirect to a different backend: