Edit build&dev control of jupyterlab extension

minjk-bl · minjk-bl · commit a2764cff27ea · 2023-02-13T16:45:52.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
-dist/
+dist/
+jupyterlab/lib/visualpython
diff --git a/colab/build.colab.sh b/colab/build.colab.sh
@@ -10,8 +10,8 @@
 #
 
 # set visualpython version
-export VP_ORG_VER=2.2.12
-export VP_NEW_VER=2.2.13
+VP_ORG_VER=2.2.12
+VP_NEW_VER=2.2.13
 
 # make directories to save build output
 mkdir -p ../dist/colab
diff --git a/jupyterlab/build.jupyterlab.sh b/jupyterlab/build.jupyterlab.sh
@@ -8,8 +8,8 @@
 #    Date            : 2023. 02. 08
 #    Change Date     :
 #
-export VP_ORG_VER=2.2.12
-export VP_NEW_VER=2.2.13
+VP_ORG_VER=2.2.12
+VP_NEW_VER=2.2.13
 
 # on conda environment
 pip install build
@@ -19,15 +19,15 @@ cp ../LICENSE LICENSE
 cp ../README.md README.md
 
 # update version info
-grep -REil ${VP_ORG_VER//\./\\.} setup.py visualpython/* | xargs sed -i --follow-symlinks "s/${VP_ORG_VER//\./\\.}/${VP_NEW_VER}/g"
+grep -REil "version = \"${VP_ORG_VER}\"" pyproject.toml | xargs sed -i "s/version = \"${VP_ORG_VER//\./\\.}\"/version = \"${VP_NEW_VER}\"/g"
+grep -REil ${VP_ORG_VER//\./\\.} visualpython/* | xargs sed -i --follow-symlinks "s/${VP_ORG_VER//\./\\.}/${VP_NEW_VER}/g"
 
-mkdir -p ../dist/jupyterlab
+# Run dev-build script to build static files to ./visualpython/labextension
+# chmod 755 dev-build.jupyterlab.sh
+./dev-build.jupyterlab.sh
 
-# run build as static files
-# npm install   # install npm package dependencies
-# npm run build  # optional build step if using TypeScript, babel, etc.
-# jupyter labextension install  # install the current directory as an extension
-jlpm run build
+# make dist directory if not exist
+mkdir -p ../dist/jupyterlab
 
 # build file to output dir
 python -m build --outdir ../dist/jupyterlab
diff --git a/jupyterlab/dev-build.jupyterlab.sh b/jupyterlab/dev-build.jupyterlab.sh
@@ -0,0 +1,24 @@
+#
+#    Project Name    : Visual Python
+#    Description     : GUI-based Python code generator
+#    File Name       : dev-build.jupyterlab.sh
+#    Author          : Black Logic - Minju
+#    Note            : Dev-Build Visual Python for Jupyter Lab
+#    License         : GPLv3 (GNU General Public License v3.0)
+#    Date            : 2023. 02. 08
+#    Change Date     :
+#
+# cp current core source code
+rm -rf lib/visualpython
+cp -r ../visualpython lib/visualpython
+
+# convert text-loader, raw-loader, css-loader
+grep -rl "vp_text_loader" lib/visualpython/js/* | xargs sed -i "s/vp_text_loader('\(.\+\)')\(.\+$\)/'!!text-loader!\1'\2/g"
+grep -rl "vp_raw_loader" lib/visualpython/js/* | xargs sed -i "s/vp_raw_loader('\(.\+\)')\(.\+$\)/'\1'\2/g"
+grep -rl "vp_css_loader" lib/visualpython/js/* | xargs sed -i "s/vp_css_loader('\(.\+\)')\(.\+$\)/'\1.css'\2/g"
+
+# run build as static files
+# npm install   # install npm package dependencies
+# npm run build  # optional build step if using TypeScript, babel, etc.
+# jupyter labextension install  # install the current directory as an extension
+jlpm run build
diff --git a/jupyterlab/lib/visualpython b/jupyterlab/lib/visualpython
diff --git a/jupyterlab/package.json b/jupyterlab/package.json
@@ -17,7 +17,7 @@
     "email": "blacklogic.dev@gmail.com"
   },
   "files": [
-    "lib/**/*.{d.ts,eot,gif,html,py,jpg,js,js.map,json,png,svg,woff2,ttf,otf}",
+    "lib/**/*.{d.ts,css,eot,gif,html,py,jpg,js,js.map,json,png,svg,woff2,ttf,otf}",
     "style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf,otf}"
   ],
   "main": "lib/index.js",
diff --git a/jupyternotebook/build.jupyternotebook.sh b/jupyternotebook/build.jupyternotebook.sh
@@ -8,9 +8,8 @@
 #    Date            : 2023. 02. 08
 #    Change Date     :
 #
-export VP_ORG_VER=2.2.12
-export VP_NEW_VER=2.2.13
-export CH_DT=`date "+%Y.%m.%d"`
+VP_ORG_VER=2.2.12
+VP_NEW_VER=2.2.13
 
 # update version info
 grep -REil ${VP_ORG_VER//\./\\.} setup.py visualpython/* | xargs sed -i --follow-symlinks "s/${VP_ORG_VER//\./\\.}/${VP_NEW_VER}/g"
diff --git a/visualpython/js/MainFrame.js b/visualpython/js/MainFrame.js
@@ -540,7 +540,8 @@ define([
                     that.boardFrame.hideLoadingBar();
                     that.boardFrame.reloadBlockList();
                 } else {
-                    require(loadMenuList, function() {
+                    let customRequire = eval('require');
+                    customRequire(loadMenuList, function() {
                         let parentBlock = null;
                         let prevBlock = null;
                         loadStateList.forEach(obj => {

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-dist/`
	`1`	`+dist/`
	`2`	`+jupyterlab/lib/visualpython`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`#`
`11`	`11`
`12`	`12`	`# set visualpython version`
`13`		`-export VP_ORG_VER=2.2.12`
`14`		`-export VP_NEW_VER=2.2.13`
	`13`	`+VP_ORG_VER=2.2.12`
	`14`	`+VP_NEW_VER=2.2.13`
`15`	`15`
`16`	`16`	`# make directories to save build output`
`17`	`17`	`mkdir -p ../dist/colab`