From 84a36728ae36aec0fee669bb90b7097e8cfd3125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20H=C3=B8xbro=20Hansen?= <simon.hansen@me.com>
Date: Thu, 5 Oct 2023 12:15:30 +0200
Subject: [PATCH] Update build for npm upload and bump version in package.json
 (#5590)

---
 .github/workflows/build.yaml | 17 ++++++++++++++---
 panel/package-lock.json      |  4 ++--
 panel/package.json           |  2 +-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 406b5a899f..78cba9623b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -51,7 +51,7 @@ jobs:
           conda config --set always_yes True
           conda config --append channels pyviz/label/dev
           conda config --append channels bokeh/label/dev
-          conda install -y conda-build anaconda-client build bokeh
+          conda install -y conda-build anaconda-client build
       - name: conda build
         run: |
           bash ./scripts/build_conda.sh
@@ -63,22 +63,33 @@ jobs:
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_API_TOKEN }}" > $HOME/.npmrc
           npm whoami
           npm -v
+      - name: npm build
+        run: |
+          SETUPTOOLS_ENABLE_FEATURES="legacy-editable" python -m pip install -ve .
+          cd ./panel
+          npm publish --dry-run
+          cd ..
       - name: conda dev deploy
         if: (github.event_name == 'push' && (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
         run: |
           VERSION="$(echo "$(ls dist/*.whl)" | cut -d- -f2)"
           FILE="$CONDA_PREFIX/conda-bld/noarch/panel-$VERSION-py_0.tar.bz2"
           anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev $FILE
-          python setup.py develop
+      - name: npm dev deploy
+        if: (github.event_name == 'push' && (contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
+        run: |
           cd ./panel
           npm publish --tag dev
+          cd ..
       - name: conda main deploy
         if: (github.event_name == 'push' && !(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
         run: |
           VERSION="$(echo "$(ls dist/*.whl)" | cut -d- -f2)"
           FILE="$CONDA_PREFIX/conda-bld/noarch/panel-$VERSION-py_0.tar.bz2"
           anaconda --token ${{ secrets.CONDA_UPLOAD_TOKEN }} upload --user pyviz --label=dev --label=main $FILE
-          python setup.py develop
+      - name: npm main deploy
+        if: (github.event_name == 'push' && !(contains(steps.vars.outputs.tag, 'a') || contains(steps.vars.outputs.tag, 'b') || contains(steps.vars.outputs.tag, 'rc')))
+        run: |
           cd ./panel
           npm publish --tag latest
           cd ..
diff --git a/panel/package-lock.json b/panel/package-lock.json
index 8b284fe0b4..bb2be1d8bb 100644
--- a/panel/package-lock.json
+++ b/panel/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@holoviz/panel",
-  "version": "1.3.0-a.6",
+  "version": "1.3.0-a.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@holoviz/panel",
-      "version": "1.3.0-a.6",
+      "version": "1.3.0-a.7",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@bokeh/bokehjs": "~3.2.2",
diff --git a/panel/package.json b/panel/package.json
index b36fb21d16..3638d8322b 100644
--- a/panel/package.json
+++ b/panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@holoviz/panel",
-  "version": "1.3.0-a.6",
+  "version": "1.3.0-a.7",
   "description": "The powerful data exploration & web app framework for Python.",
   "license": "BSD-3-Clause",
   "repository": {