#5813 move js dir to top, second PR

README.md

@@ -56,7 +56,7 @@ how to install and run BeakerX.
 ```
 conda create -y -n beakerx 'python>=3' nodejs pandas openjdk maven
 source activate beakerx
-conda install -y -c conda-forge ipywidgets
+conda install -y -c conda-forge ipywidgets jupyterlab
 (cd beakerx; pip install -e . --verbose)
 beakerx-install
 ```
@@ -88,7 +88,7 @@ The notebook extensions are installed to run out of the repo, so just
 a local build should suffice:
 
 ```
-(cd beakerx/js; yarn install)
+(cd js/notebook; yarn install)
 ```
 
 ## Groovy with Interactive Plotting and Tables:

RELEASE.md

@@ -13,7 +13,7 @@ Create the release
 ------------------
 
 Update the version in `beakerx/beakerx/_version.py` and
-`beakerx/js/package.json` and `beakerx/jslab/package.json`.  Commit
+`beakerx/js/package.json` and `js/lab/package.json`.  Commit
 the change and push the git tag.
 
 ```bash
@@ -65,8 +65,8 @@ Publish on npmjs
 To update the embedded version of our widget library:
 
 - Do a full build.
-- Run `(cd beakerx/js; npm publish)`
-- Run `(cd beakerx/jslab; npm publish)`
+- Run `(cd js/notebook; npm publish)`
+- Run `(cd js/lab; npm publish)`
 
 Release to Docker Hub
 ---------------------

beakerx/setup.py

@@ -35,9 +35,9 @@
     'java'
 ])
 cmdclass['js'] = install_node_modules(
-    path='js',
-    build_dir=os.path.join(here, 'js', 'dist'),
-    source_dir=os.path.join(here, 'js', 'src')
+    path='../js/notebook',
+    build_dir=os.path.join(here, '../js/notebook', 'dist'),
+    source_dir=os.path.join(here, '../js/notebook', 'src')
 )
 cmdclass['java'] = run_gradle(cmd='build')
 

beakerx/js/webpack.config.js → js/notebook/webpack.config.js

@@ -82,7 +82,7 @@ module.exports = [
     entry: './src/extension.js',
     output: {
       filename: 'extension.js',
-      path: path.resolve(__dirname, '../beakerx/static'),
+      path: path.resolve(__dirname, '../../beakerx/beakerx/static'),
       libraryTarget: 'amd'
     },
     module: {
@@ -114,7 +114,7 @@ module.exports = [
     entry: './src/index.js',
     output: {
       filename: 'index.js',
-      path: path.resolve(__dirname, '../beakerx/static'),
+      path: path.resolve(__dirname, '../../beakerx/beakerx/static'),
       libraryTarget: 'amd'
     },
     module: {
@@ -162,7 +162,7 @@ module.exports = [
     entry: './src/embed.js',
     output: {
       filename: 'index.js',
-      path: path.resolve(__dirname, '../jslab/lib/'),
+      path: path.resolve(__dirname, '../js/lab/lib/'),
       libraryTarget: 'amd'
     },
     module: {