Update releaser config

Author: trungleduc

.github/workflows/build.yml

@@ -44,13 +44,12 @@ jobs:
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: yarn-${{ hashFiles('frontend/yarn.lock') }}
+          key: yarn-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
             yarn-
 
       - name: Lint the application
         shell: bash -l {0}
-        working-directory: frontend
         run: |
           set -eux
           yarn install
@@ -181,7 +180,7 @@ jobs:
 
       - name: Install UI test dependencies
         shell: bash -l {0}
-        working-directory: frontend/ui-tests
+        working-directory: ui-tests
         env:
           PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
         run: yarn install
@@ -191,16 +190,16 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/pw-browsers
-          key: ${{ runner.os }}-${{ hashFiles('frontend/ui-tests/yarn.lock') }}
+          key: ${{ runner.os }}-${{ hashFiles('ui-tests/yarn.lock') }}
 
       - name: Install browser
         shell: bash -l {0}
         run: npx playwright install chromium
-        working-directory: frontend/ui-tests
+        working-directory: ui-tests
 
       - name: Execute integration tests
         shell: bash -l {0}
-        working-directory: frontend/ui-tests
+        working-directory: ui-tests
         run: |
           npx playwright test
 
@@ -210,5 +209,5 @@ jobs:
         with:
           name: tljh-playwright-tests
           path: |
-            frontend/ui-tests/test-results
-            frontend/ui-tests/playwright-report
+            ui-tests/test-results
+            ui-tests/playwright-report

.gitignore

@@ -20,10 +20,14 @@ MANIFEST
 # Local TLJH config file
 config.yaml
 
+# Frontend assets
 .yarn
 node_modules
-frontend/dist
-frontend/lib
-frontend/ui-tests/playwright-report
-frontend/ui-tests/test-results
-**/js/react/
+dist/
+ui-tests/playwright-report
+ui-tests/test-results
+**/js
+lib/
+
+# Hatch version
+_version.py

CHANGELOG.md

@@ -17,42 +17,43 @@ You can find below the list of changes since the creation of the plugin.
 
 ## What's Changed
 
-* Add installation instructions to the README by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/1
-* Fix manifest by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/2
-* Add optional name to the environment by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/7
-* Show more information on the spawner options page by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/10
-* Add minimal documentation to the README by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/11
-* Update README instructions to install the plugin by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/12
-* Expose list_images by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/13
-* Show human readable value for mem and cpu limits by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/16
-* Rename from PlasmaBio to Plasma by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/17
-* Add a simple CI workflow by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/18
-* Replace the service by extra hub handlers by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/19
-* Add tests by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/21
-* Show the build logs in a dialog by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/22
-* Lowercase the autogenerated name from the repo by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/23
-* Package the tests by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/25
-* Async start method in the default spawner by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/28
-* Hide 'Cancel' button from logs window by @pierrepo in https://github.com/plasmabio/tljh-repo2docker/pull/33
-* Update instead of overwrite extra_host_config by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/34
-* Await rendered template if neccesary by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/40
-* Pin dependencies by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/41
-* Add support for GIT_CREDENTIAL_ENV to build private repos by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/42
-* Update repo2docker image by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/49
-* Pin to `jupyterhub~=1.5` for development, update `dockerspawner`, default ref to `HEAD` by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/50
-* Update Python versions on CI by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/51
-* Use --label to set labels by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/48
-* Expose custom build-args as advanced option in the UI by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/52
-* Update test binder repo to the new URL by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/53
-* Rename test repo to `tljh-repo2docker-test-binder` by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/54
-* Pin `notebook<7` and `sqlalchemy<2` for now by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/62
-* Resolve 'Show Logs' issue by adding _xsrf token by @yamaton in https://github.com/plasmabio/tljh-repo2docker/pull/61
+- Add installation instructions to the README by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/1
+- Fix manifest by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/2
+- Add optional name to the environment by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/7
+- Show more information on the spawner options page by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/10
+- Add minimal documentation to the README by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/11
+- Update README instructions to install the plugin by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/12
+- Expose list_images by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/13
+- Show human readable value for mem and cpu limits by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/16
+- Rename from PlasmaBio to Plasma by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/17
+- Add a simple CI workflow by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/18
+- Replace the service by extra hub handlers by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/19
+- Add tests by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/21
+- Show the build logs in a dialog by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/22
+- Lowercase the autogenerated name from the repo by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/23
+- Package the tests by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/25
+- Async start method in the default spawner by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/28
+- Hide 'Cancel' button from logs window by @pierrepo in https://github.com/plasmabio/tljh-repo2docker/pull/33
+- Update instead of overwrite extra_host_config by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/34
+- Await rendered template if neccesary by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/40
+- Pin dependencies by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/41
+- Add support for GIT_CREDENTIAL_ENV to build private repos by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/42
+- Update repo2docker image by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/49
+- Pin to `jupyterhub~=1.5` for development, update `dockerspawner`, default ref to `HEAD` by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/50
+- Update Python versions on CI by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/51
+- Use --label to set labels by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/48
+- Expose custom build-args as advanced option in the UI by @TimoRoth in https://github.com/plasmabio/tljh-repo2docker/pull/52
+- Update test binder repo to the new URL by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/53
+- Rename test repo to `tljh-repo2docker-test-binder` by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/54
+- Pin `notebook<7` and `sqlalchemy<2` for now by @jtpio in https://github.com/plasmabio/tljh-repo2docker/pull/62
+- Resolve 'Show Logs' issue by adding \_xsrf token by @yamaton in https://github.com/plasmabio/tljh-repo2docker/pull/61
 
 ## New Contributors
-* @jtpio made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/1
-* @pierrepo made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/33
-* @TimoRoth made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/34
-* @yamaton made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/61
+
+- @jtpio made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/1
+- @pierrepo made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/33
+- @TimoRoth made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/34
+- @yamaton made their first contribution in https://github.com/plasmabio/tljh-repo2docker/pull/61
 
 **Full Changelog**: https://github.com/plasmabio/tljh-repo2docker/commits/v1
 

CONTRIBUTING.md

@@ -26,7 +26,6 @@ source bin/activate
 
 ## Install the development requirements
 
-
 ```bash
 python -m pip install -r dev-requirements.txt
 
@@ -63,4 +62,4 @@ To run the tests:
 
 ```bash
 python -m pytest --cov
-```
+```

README.md

@@ -39,19 +39,19 @@ for more info on installing TLJH plugins.
 
 ### List the environments
 
-The *Environments* page shows the list of built environments, as well as the ones currently being built:
+The _Environments_ page shows the list of built environments, as well as the ones currently being built:
 
 ![environments](https://user-images.githubusercontent.com/591645/80962805-056df500-8e0e-11ea-81ab-6efc1c97432d.png)
 
 ### Add a new environment
 
-Just like on [Binder](https://mybinder.org), new environments can be added by clicking on the *Add New* button and providing a URL to the repository. Optional names, memory, and CPU limits can also be set for the environment:
+Just like on [Binder](https://mybinder.org), new environments can be added by clicking on the _Add New_ button and providing a URL to the repository. Optional names, memory, and CPU limits can also be set for the environment:
 
 ![add-new](https://user-images.githubusercontent.com/591645/80963115-9fce3880-8e0e-11ea-890b-c9b928f7edb1.png)
 
 ### Follow the build logs
 
-Clicking on the *Logs* button will open a new dialog with the build logs:
+Clicking on the _Logs_ button will open a new dialog with the build logs:
 
 ![logs](https://user-images.githubusercontent.com/591645/82306574-86f18580-99bf-11ea-984b-4749ddde15e7.png)
 

package.json

@@ -3,7 +3,16 @@
     "version": "1.0.1",
     "description": "tljh_repo2docker frontend package",
     "license": "BSD-3-Clause",
+    "homepage": "https://github.com/plasmabio/tljh-repo2docker",
+    "bugs": {
+        "url": "https://github.com/plasmabio/tljh-repo2docker/issues"
+    },
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/plasmabio/tljh-repo2docker.git"
+    },
     "scripts": {
+        "watch": "cross-env NODE_ENV=development webpack watch --config webpack.config.js",
         "build": "cross-env NODE_ENV=development webpack --config webpack.config.js",
         "build:prod": "cross-env NODE_ENV=production webpack --config webpack.config.js",
         "eslint": "eslint --fix --ext .js,.jsx,.ts,.tsx src/",
@@ -12,7 +21,7 @@
         "prettier": "prettier --write \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
         "lint": "yarn prettier && yarn eslint",
         "lint:check": "yarn prettier:check && yarn eslint:check",
-        "clean": "rimraf ./lib ./tljh_repo2docker/static/js/react"
+        "clean": "rimraf ./lib ./tljh_repo2docker/static/js"
     },
     "devDependencies": {
         "@types/react": "^18.2.0",
@@ -134,4 +143,4 @@
             }
         ]
     }
-}
+}

pyproject.toml

@@ -1,33 +1,65 @@
 [build-system]
-requires = ["hatchling>=1.5.0,<2"]
 build-backend = "hatchling.build"
+requires = ["hatchling>=1.5.0,<2", "hatch-nodejs-version>=0.3.2"]
 
 [project]
-name = "tljh-repo2docker"
-dynamic = ["version"]
-readme = "README.md"
-license = { file = "LICENSE" }
 dependencies = [
-    "aiodocker~=0.19",
-    "dockerspawner~=12.1",
-    "jupyter_client>=6.1,<8"
+  "aiodocker~=0.19",
+  "dockerspawner~=12.1",
+  "jupyter_client>=6.1,<8",
 ]
+dynamic = ["version"]
+license = {file = "LICENSE"}
+name = "tljh-repo2docker"
+readme = "README.md"
 
 [project.entry-points.tljh]
 tljh_repo2docker = "tljh_repo2docker"
 
 [tool.hatch.version]
-path = "tljh_repo2docker/__version__.py"
+source = "nodejs"
 
 [tool.hatch.build.targets.sdist]
-include = ["/tljh_repo2docker"]
 artifacts = ["tljh_repo2docker/static"]
 exclude = [".github"]
 
+[tool.hatch.build.targets.wheel]
+artifacts = ["tljh_repo2docker/static"]
+
+[tool.hatch.build.hooks.version]
+path = "tljh_repo2docker/_version.py"
+
+[tool.hatch.build.hooks.jupyter-builder]
+build-function = "hatch_jupyter_builder.npm_builder"
+dependencies = ["hatch-jupyter-builder>=0.5"]
+ensured-targets = [
+  "tljh_repo2docker/static/js/servers.js",
+  "tljh_repo2docker/static/js/environments.js",
+]
+skip-if-exists = [
+  "tljh_repo2docker/static/js/servers.js",
+  "tljh_repo2docker/static/js/environments.js",
+]
+
+[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
+build_cmd = "build:prod"
+npm = ["yarn"]
+
+[tool.hatch.build.hooks.jupyter-builder.editable-build-kwargs]
+build_cmd = "build"
+build_dir = "tljh_repo2docker/static/js"
+npm = ["yarn"]
+source_dir = "src"
+
 [tool.jupyter-releaser.options]
 version_cmd = "hatch version"
 
 [tool.jupyter-releaser.hooks]
+before-build-npm = [
+  "yarn install",
+  "yarn build:prod",
+]
+before-build-python = ["yarn clean"]
 before-bump-version = ["python -m pip install hatch"]
 
 [tool.check-wheel-contents]

tljh_repo2docker/__version__.py

@@ -3,6 +3,6 @@
   <script id="tljh-page-data" type="application/json">
     {"images": {{ images | tojson  }}, "default_mem_limit": "{{default_mem_limit}}", "default_cpu_limit":"{{default_cpu_limit}}", "machine_profiles": {{ machine_profiles | tojson  }}}
   </script>
-  <script src="{{ base_url }}environments-static/js/react/environments.js"></script>
+  <script src="{{ base_url }}environments-static/js/environments.js"></script>
 </div>
 {% endblock %}

tljh_repo2docker/templates/images.html

@@ -5,6 +5,6 @@
       "images": {{ images | tojson  }}, "allow_named_servers": {{allow_named_servers | tojson}}, "named_server_limit_per_user": {{named_server_limit_per_user}}, "server_data":  {{ server_data| tojson }}, "default_server_data":  {{ default_server_data| tojson }}
     }
   </script>
-  <script src="{{ base_url }}environments-static/js/react/servers.js"></script>
+  <script src="{{ base_url }}environments-static/js/servers.js"></script>
 </div>
 {% endblock %}