diff --git a/tests/sandbox/Makefile b/tests/sandbox/Makefile index af15558e..429706f3 100644 --- a/tests/sandbox/Makefile +++ b/tests/sandbox/Makefile @@ -4,7 +4,12 @@ testSandbox: python3 -m http.server --directory ./ www: - mkdir -p www/pyodide www/xterm/ www/xterm-addon-fit www/codemirror www/codemirror/theme www/codemirror/modes www/fontawesome www/w2ui www/webfonts www/fonts/nerdfonts + mkdir -p \ + www/pyodide \ + www/xterm/ www/xterm/addon-fit \ + www/codemirror www/codemirror/theme www/codemirror/modes \ + www/fontawesome www/webfonts www/fonts/nerdfonts \ + www/w2ui wget -P www/pyodide/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/pyodide/pyodide.js wget -P www/pyodide/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/pyodide/python_stdlib.zip @@ -16,10 +21,10 @@ www: wget -P www/xterm/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm/xterm.js wget -P www/xterm/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm/xterm.js.map - wget -P www/xterm-addon-fit/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm-addon-fit/xterm-addon-fit.js - wget -P www/xterm-addon-fit/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm-addon-fit/xterm-addon-fit.js.map + wget -P www/xterm/addon-fit/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm/addon-fit/addon-fit.js + wget -P www/xterm/addon-fit/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm/addon-fit/addon-fit.js.map - wget -P www/xterm-addon-unicode11/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm-addon-unicode11/xterm-addon-unicode11.js + wget -P www/xterm/addon-unicode11/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/xterm/addon-unicode11/addon-unicode11.js wget -P www/fontawesome/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/fontawesome/regular.min.css wget -P www/fontawesome/ https://ceccopierangiolieugenio.github.io/binaryRepo/pyTermTk/www/fontawesome/fontawesome.min.css @@ -40,23 +45,24 @@ www: updateXterm: www rm -rf node_modules package.json package-lock.json - npm install xterm - npm install xterm-addon-fit - npm install xterm-addon-unicode11 - npm install xterm-addon-canvas - cp node_modules/xterm/css/xterm.css \ - node_modules/xterm/lib/xterm.js \ - node_modules/xterm/lib/xterm.js.map \ + mkdir -p www/xterm/ www/xterm/addon-unicode11 www/xterm/addon-fit www/xterm/addon-canvas + npm install @xterm/xterm + npm install @xterm/addon-fit + npm install @xterm/addon-unicode11 + npm install @xterm/addon-canvas + cp node_modules/@xterm/xterm/css/xterm.css \ + node_modules/@xterm/xterm/lib/xterm.js \ + node_modules/@xterm/xterm/lib/xterm.js.map \ www/xterm/ - cp node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js \ - node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js.map \ - www/xterm-addon-unicode11/ - cp node_modules/xterm-addon-fit/lib/xterm-addon-fit.js \ - node_modules/xterm-addon-fit/lib/xterm-addon-fit.js.map \ - www/xterm-addon-fit/ - cp node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js \ - node_modules/xterm-addon-canvas/lib/xterm-addon-canvas.js.map \ - www/xterm-addon-fit/ + cp node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js \ + node_modules/@xterm/addon-unicode11/lib/addon-unicode11.js.map \ + www/xterm/addon-unicode11/ + cp node_modules/@xterm/addon-fit/lib/addon-fit.js \ + node_modules/@xterm/addon-fit/lib/addon-fit.js.map \ + www/xterm/addon-fit/ + cp node_modules/@xterm/addon-canvas/lib/addon-canvas.js \ + node_modules/@xterm/addon-canvas/lib/addon-canvas.js.map \ + www/xterm/addon-canvas/ rm -rf node_modules package.json package-lock.json buildSandbox: www diff --git a/tests/sandbox/sandbox.NerdFont.html b/tests/sandbox/sandbox.NerdFont.html index 438af693..23282b4a 100644 --- a/tests/sandbox/sandbox.NerdFont.html +++ b/tests/sandbox/sandbox.NerdFont.html @@ -9,8 +9,8 @@ - - + + @@ -178,9 +178,9 @@ allowProposedApi: true, fontFamily: 'NerdFont'}); - /* https://www.npmjs.com/package/xterm-addon-fit */ + /* https://www.npmjs.com/package/@xterm/addon-fit */ const fitAddon = new FitAddon.FitAddon(); - /* https://www.npmjs.com/package/xterm-addon-unicode11 */ + /* https://www.npmjs.com/package/@xterm/addon-unicode11 */ const unicode11Addon = new Unicode11Addon.Unicode11Addon(); term.loadAddon(fitAddon); diff --git a/tests/sandbox/sandbox.base.html b/tests/sandbox/sandbox.base.html index 5748eb7c..164506cb 100644 --- a/tests/sandbox/sandbox.base.html +++ b/tests/sandbox/sandbox.base.html @@ -9,8 +9,8 @@ - - + + @@ -77,9 +77,9 @@ - - + + @@ -76,9 +76,9 @@ - - + + - + @@ -110,9 +110,9 @@ // fontFamily: 'FreeSerif Regular'}); fontFamily: 'pyTermTkFont'}); - /* https://www.npmjs.com/package/xterm-addon-fit */ + /* https://www.npmjs.com/package/@xterm/addon-fit */ const fitAddon = new FitAddon.FitAddon(); - /* https://www.npmjs.com/package/xterm-addon-unicode11 */ + /* https://www.npmjs.com/package/@xterm/addon-unicode11 */ const unicode11Addon = new Unicode11Addon.Unicode11Addon(); term.loadAddon(fitAddon); diff --git a/tools/webExporter/js/ttkproxy.js b/tools/webExporter/js/ttkproxy.js index fa9fd325..f8e1a6be 100644 --- a/tools/webExporter/js/ttkproxy.js +++ b/tools/webExporter/js/ttkproxy.js @@ -173,6 +173,7 @@ class TTkProxy { this.pyodide = await loadPyodide(); this.ttk_timer = (i) => console.log("ttk_timer unimplemented") this.term.write('Pyodide ('+this.pyodide.version+') - Loaded\n\r') + console.log('Pyodide ('+this.pyodide.version+') - Loaded\n\r' ) this.pyodide.registerJsModule("pyodideProxy", this.pyodideProxy); this.term.write('Pyodide Proxy - Loaded\n\r') diff --git a/tools/webExporterInit.sh b/tools/webExporterInit.sh index 68cfad7a..2e06c4ba 100755 --- a/tools/webExporterInit.sh +++ b/tools/webExporterInit.sh @@ -47,9 +47,9 @@ ${_TOOLS_BASE_PATH}/prepareBuild.sh release mkdir -p ${_TMP_PATH}/bin \ ${_TMP_PATH}/www/pyodide \ ${_TMP_PATH}/www/xterm/ \ - ${_TMP_PATH}/www/xterm-addon-fit \ - ${_TMP_PATH}/www/xterm-addon-canvas \ - ${_TMP_PATH}/www/xterm-addon-unicode11 \ + ${_TMP_PATH}/www/xterm/addon-fit \ + ${_TMP_PATH}/www/xterm/addon-canvas \ + ${_TMP_PATH}/www/xterm/addon-unicode11 \ ${_TMP_PATH}/www/file-saver\ ${_TMP_PATH}/www/webfonts \ ${_TMP_PATH}/www/fonts/nerdfonts \ @@ -72,21 +72,21 @@ _download ${_TMP_PATH}/www/pyodide/ www/pyodide/python_stdlib.zip _download ${_TMP_PATH}/www/pyodide/ www/pyodide/pyodide.asm.js # _download ${_TMP_PATH}/www/pyodide/ www/pyodide/repodata.json _download ${_TMP_PATH}/www/pyodide/ www/pyodide/pyodide.asm.wasm -_download ${_TMP_PATH}/www/pyodide/ www/pyodide/Pillow-10.0.0-cp311-cp311-emscripten_3_1_46_wasm32.whl -_download ${_TMP_PATH}/www/pyodide/ www/pyodide/Pillow-10.0.0-cp311-cp311-emscripten_3_1_46_wasm32.whl.metadata +_download ${_TMP_PATH}/www/pyodide/ www/pyodide/pillow-10.2.0-cp312-cp312-pyodide_2024_0_wasm32.whl +_download ${_TMP_PATH}/www/pyodide/ www/pyodide/pillow-10.2.0-cp312-cp312-pyodide_2024_0_wasm32.whl.metadata _download ${_TMP_PATH}/www/xterm/ www/xterm/xterm.css _download ${_TMP_PATH}/www/xterm/ www/xterm/xterm.js _download ${_TMP_PATH}/www/xterm/ www/xterm/xterm.js.map -_download ${_TMP_PATH}/www/xterm-addon-fit/ www/xterm-addon-fit/xterm-addon-fit.js -_download ${_TMP_PATH}/www/xterm-addon-fit/ www/xterm-addon-fit/xterm-addon-fit.js.map +_download ${_TMP_PATH}/www/xterm/addon-fit/ www/xterm/addon-fit/addon-fit.js +_download ${_TMP_PATH}/www/xterm/addon-fit/ www/xterm/addon-fit/addon-fit.js.map -_download ${_TMP_PATH}/www/xterm-addon-canvas/ www/xterm-addon-canvas/xterm-addon-canvas.js -_download ${_TMP_PATH}/www/xterm-addon-canvas/ www/xterm-addon-canvas/xterm-addon-canvas.js.map +_download ${_TMP_PATH}/www/xterm/addon-canvas/ www/xterm/addon-canvas/addon-canvas.js +_download ${_TMP_PATH}/www/xterm/addon-canvas/ www/xterm/addon-canvas/addon-canvas.js.map -_download ${_TMP_PATH}/www/xterm-addon-unicode11/ www/xterm-addon-unicode11/xterm-addon-unicode11.js -_download ${_TMP_PATH}/www/xterm-addon-unicode11/ www/xterm-addon-unicode11/xterm-addon-unicode11.js.map +_download ${_TMP_PATH}/www/xterm/addon-unicode11/ www/xterm/addon-unicode11/addon-unicode11.js +_download ${_TMP_PATH}/www/xterm/addon-unicode11/ www/xterm/addon-unicode11/addon-unicode11.js.map _download ${_TMP_PATH}/www/file-saver/ www/file-saver/FileSaver.js