Remove generated code

.github/workflows/build-extension.yml

@@ -1,9 +1,6 @@
 name: Build extension
 
 on:
-  push:
-    branches:
-    - '*'
   pull_request:
     branches:
     - '*'
@@ -14,11 +11,15 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-    - name: Install node
+
+    - name: Set up Node.js
       uses: actions/setup-node@v3
       with:
-       node-version: '20.x'
-       npm-version: '10.9.0'
+        node-version: 'lts/*'
+
+    - name: Install Yarn
+      run: corepack enable
+
     - name: Install Python
       uses: actions/setup-python@v4
       with:
@@ -37,6 +38,7 @@ jobs:
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(yarn cache dir)"
+
     - name: Setup yarn cache
       uses: actions/cache@v3
       id: yarn-cache
@@ -48,9 +50,10 @@ jobs:
 
     - name: Install dependencies
       run: python -m pip install -U jupyterlab jupyter_packaging jupyterlab_widgets
+
     - name: Use existing lockfile
       run: yarn install --frozen-lockfile
+
     - name: Build the extension
       working-directory: js
-      run: |
-        npm install
+      run: npm install

.github/workflows/test.yml

@@ -1,7 +1,6 @@
 name: Test
 
 on:
-  push:
   pull_request:
   workflow_dispatch:
 
@@ -44,6 +43,20 @@ jobs:
         python-version: ${{ matrix.python-version }}
         use-only-tar-bz2: false  # https://github.com/conda-incubator/setup-miniconda/issues/264
 
+    - name: Set up Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 'lts/*'
+
+    - name: Install Yarn
+      run: corepack enable
+
+    - name: Build labextension
+      run: |
+        cd js
+        npm install
+        cd ..
+
     - name: Run tests
       run: |
         python -m pytest -vs tests --cov=nglview --cov-report=html --disable-pytest-warnings

MANIFEST.in

@@ -1,6 +1,6 @@
 include nglview/datafiles/*
-recursive-include nglview/static *.*
-recursive-include nglview/staticlab *.*
+recursive-include nglview/nbextension *.*
+recursive-include nglview/labextension *.*
 include nglview/theme/*
 include LICENSE README.md DEVELOPMENT.md CHANGELOG.md
 include setup.py

devtools/release.py

@@ -1,19 +1,5 @@
 #!/usr/bin/env python
 
-"""
-Steps:
-    - cd nglview/static
-    - git rm -rf ./*
-
-    - cd nglview/staticlab
-    - git rm -rf ./*
-
-    - cd js
-    - npm install
-    - cd ../nglview
-    - git add static staticlab
-"""
-
 import subprocess
 import sys
 from pathlib import Path

js/DEVELOPMENT.md

@@ -0,0 +1,2 @@
+yarn==1.22.19
+node==22.11.0

js/package.json

@@ -35,7 +35,7 @@
   },
   "scripts": {
     "prepublish": "yarn build:prod && webpack && yarn run copy:labextension",
-    "copy:labextension": "cp -r nglview-js-widgets/labextension/* ../nglview/staticlab/",
+    "copy:labextension": "mkdir -p ../nglview/labextension && cp -r nglview-js-widgets/labextension/* ../nglview/labextension/",
     "build": "yarn run build:lib && yarn run build:labextension:dev",
     "build:prod": "yarn run build:lib && yarn run build:labextension",
     "build:labextension": "jupyter labextension build .",

js/webpack.config.js

@@ -30,7 +30,7 @@ module.exports = [
         entry: './lib/extension.js',
         output: {
             filename: 'extension.js',
-            path: path.resolve(__dirname, '..', 'nglview', 'static'),
+            path: path.resolve(__dirname, '..', 'nglview', 'nbextension'),
             libraryTarget: 'amd'
         },
         mode: 'production'
@@ -44,7 +44,7 @@ module.exports = [
         entry: './lib/index.js',
         output: {
             filename: 'index.js',
-            path: path.resolve(__dirname, '..', 'nglview', 'static'),
+            path: path.resolve(__dirname, '..', 'nglview', 'nbextension'),
             libraryTarget: 'amd'
         },
         devtool: 'source-map',

nglview/__init__.py

@@ -35,7 +35,7 @@
 def _jupyter_nbextension_paths():
     return [{
         'section': 'notebook',
-        'src': 'static',
+        'src': 'nbextension',
         'dest': 'nglview-js-widgets',
         'require': 'nglview-js-widgets/extension'
     }]