From 37cb97679191bae0c5d4697bded664033cf884de Mon Sep 17 00:00:00 2001 From: Harald Schilly Date: Wed, 16 Oct 2024 16:51:41 +0200 Subject: [PATCH 1/2] static/webpack/npm: get rid of html-minify-loader --- src/packages/pnpm-lock.yaml | 397 +++++++++--------------- src/packages/static/package.json | 1 - src/packages/static/src/module-rules.ts | 10 +- 3 files changed, 148 insertions(+), 260 deletions(-) diff --git a/src/packages/pnpm-lock.yaml b/src/packages/pnpm-lock.yaml index ad8c2564e9..e77c0c0cad 100644 --- a/src/packages/pnpm-lock.yaml +++ b/src/packages/pnpm-lock.yaml @@ -26,10 +26,10 @@ importers: version: 29.5.13 jest: specifier: ^29.7.0 - version: 29.7.0(@types/node@18.19.50) + version: 29.7.0(@types/node@18.19.55) ts-jest: specifier: ^29.2.3 - version: 29.2.5(@babel/core@7.25.8)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.8))(jest@29.7.0(@types/node@18.19.50))(typescript@5.6.3) + version: 29.2.5(@babel/core@7.25.8)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.8))(jest@29.7.0(@types/node@18.19.55))(typescript@5.6.3) typescript: specifier: ^5.6.3 version: 5.6.3 @@ -1683,9 +1683,6 @@ importers: html-loader: specifier: ^2.1.2 version: 2.1.2(webpack@5.95.0(@swc/core@1.3.3)) - html-minify-loader: - specifier: ^1.4.0 - version: 1.4.0 html-webpack-plugin: specifier: ^5.5.3 version: 5.6.0(@rspack/core@1.0.10(@swc/helpers@0.5.13))(webpack@5.95.0(@swc/core@1.3.3)) @@ -4625,10 +4622,6 @@ packages: engines: {'0': node >= 0.8.0} hasBin: true - ansi-regex@2.1.1: - resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==} - engines: {node: '>=0.10.0'} - ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} @@ -4682,9 +4675,6 @@ packages: engines: {node: '>=10'} deprecated: This package is no longer supported. - argh@0.1.4: - resolution: {integrity: sha512-sQN85FUGbEUBLyQiSJp4v8yAHTST2ao1WVXb/L8jkVqQTsypZuJQD0gMVeOLoSZBz21p22izF6HsBQP16QKQtg==} - argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -5237,9 +5227,6 @@ packages: peerDependencies: webpack: '>=4.0.0 <6.0.0' - cli-color@1.1.0: - resolution: {integrity: sha512-SzsTUTopL62kJOMbLqBUkaLVbkyw0qKB3uMRFxgy9LrEQ5tdFO9dT8oUhqszpJB9FMpVTIQnZMjb6zn0abilvQ==} - cli-cursor@3.1.0: resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==} engines: {node: '>=8'} @@ -5318,9 +5305,6 @@ packages: color-alpha@1.0.4: resolution: {integrity: sha512-lr8/t5NPozTSqli+duAN+x+no/2WaKTeWvxhHGN+aXT6AJ8vPlzLa7UriyjWak0pSC2jHol9JgjBYnnHsGha9A==} - color-convert@0.5.3: - resolution: {integrity: sha512-RwBeO/B/vZR3dfKL1ye/vx8MHZ40ugzpyfeVG5GsiuGnrlMWe2o8wxBbLCpw9CsxV+wHuzYlCiWnybrIA0ling==} - color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} @@ -5355,9 +5339,6 @@ packages: color-space@1.16.0: resolution: {integrity: sha512-A6WMiFzunQ8KEPFmj02OnnoUnqhmSaHaZ/0LVFcPTdlvm8+3aMJ5x1HRHy3bDHPkovkf4sS0f4wsVvwk71fKkg==} - color-string@0.3.0: - resolution: {integrity: sha512-sz29j1bmSDfoAxKIEU6zwoIZXN6BrFbAMIhfYCNyiZXBDuU/aiHlN84lp/xDzL2ubyFhLDobHIlU1X70XRrMDA==} - color-string@1.9.1: resolution: {integrity: sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==} @@ -5365,9 +5346,6 @@ packages: resolution: {integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==} hasBin: true - color@0.8.0: - resolution: {integrity: sha512-tKmPx2t+2N4pxZT+P4jXaT3qHMkYqE1ZHe5z6TpRVR/wSONGwHDracgkv//oRsFZ3T1QO6ZBxAxjpDIeNqEQyw==} - color@3.2.1: resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==} @@ -5381,15 +5359,9 @@ packages: colorette@2.0.20: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} - colornames@0.0.2: - resolution: {integrity: sha512-aeaoTql364CeoC6VHeRJd8uUiOVZDDtCyTP2dwXPD3WIt8UuPcXzmBB5gEhLDLaJS3MW152O7DfYm1a2HQv11g==} - colornames@1.1.1: resolution: {integrity: sha512-/pyV40IrsdulWv+wFPmERh9k/mjsPZ64yUMDmWrtj/k1nmgrzzIENWKdaVKyBbvFdQWqkcaRxr+polCo3VMe7A==} - colorspace@1.0.1: - resolution: {integrity: sha512-rCnzSo6lkArg8rgeLdPQgxC5avqkyFGSpg3Roqn+rGRZfaHSBKgeDMr1YJZ9XTNZAeVoR4KxLjq9SUQ6hMvFlQ==} - colorspace@1.1.4: resolution: {integrity: sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==} @@ -5831,9 +5803,6 @@ packages: resolution: {integrity: sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==} engines: {node: '>=12'} - d@0.1.1: - resolution: {integrity: sha512-0SdM9V9pd/OXJHoWmTfNPTAeD+lw6ZqHg+isPyBFuJsZLSE0Ygg1cYZ/0l6DrKQXMOqGOu1oWupMoOfoRfMZrQ==} - d@1.0.2: resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==} engines: {node: '>=0.12'} @@ -6031,9 +6000,6 @@ packages: dezalgo@1.0.4: resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==} - diagnostics@1.0.1: - resolution: {integrity: sha512-CRx2wYrfE/5+CpLdQY0Oat5A14C/ntU7BCVeczr4S8WtCDAkhiNAgf7sDy19eIg2byEEJ8UIOPo8frUdQdO/0Q==} - diagnostics@1.1.1: resolution: {integrity: sha512-8wn1PmdunLJ9Tqbx+Fx/ZEuHfJf4NKSN2ZBj7SJC/OWRWha843+WsTjqMe1B5E3p28jqBlp+mJ2fPVxPyNgYKQ==} @@ -6090,9 +6056,6 @@ packages: dom-scroll-into-view@1.2.1: resolution: {integrity: sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ==} - dom-serializer@0.2.2: - resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==} - dom-serializer@1.4.1: resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==} @@ -6102,15 +6065,9 @@ packages: dom-walk@0.1.2: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} - domelementtype@1.3.1: - resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==} - domelementtype@2.3.0: resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==} - domhandler@2.4.2: - resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==} - domhandler@4.3.1: resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==} engines: {node: '>= 4'} @@ -6122,9 +6079,6 @@ packages: dompurify@3.1.6: resolution: {integrity: sha512-cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==} - domutils@1.7.0: - resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==} - domutils@2.8.0: resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==} @@ -6252,9 +6206,6 @@ packages: resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==} engines: {node: '>=10.13.0'} - entities@1.1.2: - resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==} - entities@2.2.0: resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==} @@ -6323,25 +6274,16 @@ packages: es6-error@4.1.1: resolution: {integrity: sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==} - es6-iterator@0.1.3: - resolution: {integrity: sha512-6TOmbFM6OPWkTe+bQ3ZuUkvqcWUjAnYjKUCLdbvRsAUz2Pr+fYIibwNXNkLNtIK9PPFbNMZZddaRNkyJhlGJhA==} - es6-iterator@2.0.3: resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==} es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} - es6-symbol@2.0.1: - resolution: {integrity: sha512-wjobO4zO8726HVU7mI2OA/B6QszqwHJuKab7gKHVx+uRfVVYGcWJkCIFxV2Madqb9/RUSrhJ/r6hPfG7FsWtow==} - es6-symbol@3.1.4: resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==} engines: {node: '>=0.12'} - es6-weak-map@0.1.4: - resolution: {integrity: sha512-P+N5Cd2TXeb7G59euFiM7snORspgbInS29Nbf3KNO2JQp/DyhvMCDWd58nsVAXwYJ6W3Bx7qDdy6QQ3PCJ7jKQ==} - es6-weak-map@2.0.3: resolution: {integrity: sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==} @@ -7174,9 +7116,6 @@ packages: engines: {node: '>=12'} hasBin: true - html-minify-loader@1.4.0: - resolution: {integrity: sha512-uBm4Lvy/edUOgFEEpIPYalGZuq1OW+vpcts5VFYXe9sGzAuyrvaqif+mK4A+0kKTq2oVuxq5AZxcPNGXft3P3A==} - html-react-parser@1.4.14: resolution: {integrity: sha512-pxhNWGie8Y+DGDpSh8cTa0k3g8PsDcwlfolA+XxYo1AGDeB6e2rdlyv4ptU9bOTiZ2i3fID+6kyqs86MN0FYZQ==} peerDependencies: @@ -7197,9 +7136,6 @@ packages: webpack: optional: true - htmlparser2@3.9.2: - resolution: {integrity: sha512-RSOwLNCnCLDRB9XpSfCzsLzzX8COezhJ3D4kRBNWh0NC/facp1hAMmM8zD7kC01My8vD6lGEbPMlbRW/EwGK5w==} - htmlparser2@6.1.0: resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==} @@ -8129,9 +8065,6 @@ packages: resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==} engines: {node: '>=6'} - kuler@0.0.0: - resolution: {integrity: sha512-5h7OEDPSHedoxB6alJXF4FtFB95QA2OTXGCFaLCutHdkh0VrcSSy/OwH9UHtYqsG2KTrdN7gVEc9KgCBNah/yA==} - kuler@1.0.1: resolution: {integrity: sha512-J9nVUucG1p/skKul6DU3PUZrhs0LPulNaeUOox0IyXDi8S4CztTHs1gQphhuZmzXG7VOQSf6NJfKuzteQLv9gQ==} @@ -8491,9 +8424,6 @@ packages: resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==} engines: {node: '>=12'} - lru-queue@0.1.0: - resolution: {integrity: sha512-BpdYkt9EvGl8OfWHDQPISVpcl5xZthb+XPsbELj5AQXxIC8IriDZIQYjBJPEm5rS420sjZ0TLEzRcq5KdBhYrQ==} - lz4@0.6.5: resolution: {integrity: sha512-KSZcJU49QZOlJSItaeIU3p8WoAvkTmD9fJqeahQXNu1iQ/kR0/mQLdbrK8JY9MY8f6AhJoMrihp1nu1xDbscSQ==} engines: {node: '>= 0.10'} @@ -8580,9 +8510,6 @@ packages: memoize-one@5.2.1: resolution: {integrity: sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==} - memoizee@0.3.10: - resolution: {integrity: sha512-LLzVUuWwGBKK188spgOK/ukrp5zvd9JGsiLDH41pH9vt5jvhZfsu5pxDuAnYAMG8YEGce72KO07sSBy9KkvOfw==} - meow@6.1.1: resolution: {integrity: sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==} engines: {node: '>=8'} @@ -8751,10 +8678,6 @@ packages: minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} - minimize@1.8.1: - resolution: {integrity: sha512-vMXaO5/HgxKi06udiQ4MibwOb0mwxzcpX4DDf6G9k2h6fKNoY1xt8Wrzp82qBm4oZ5aQRP2ry1NzbwEuWBx9Ig==} - hasBin: true - minipass@3.3.6: resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} engines: {node: '>=8'} @@ -8919,9 +8842,6 @@ packages: resolution: {integrity: sha512-cwgkM6QH/wF9V78dPs0w4Sxh1XQ3d9U/UIV7Kk6sfAIz5NNiCBs5cpaWEC29CkgYGokPkGFLK7l39Kj0FfycRg==} hasBin: true - next-tick@0.2.2: - resolution: {integrity: sha512-f7h4svPtl+QidoBv4taKXUjJ70G2asaZ8G28nS0OkqaalX8dwwrtWtyxEDPK62AC00ur/+/E0pUwBwY5EPn15Q==} - next-tick@1.1.0: resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==} @@ -11138,9 +11058,6 @@ packages: text-decoder@1.2.0: resolution: {integrity: sha512-n1yg1mOj9DNpk3NeZOx7T6jchTbyJS3i3cucbNN6FcdPriMZx7NsgrGpWWdWZZGxD7ES1XB+3uoqHMgOKaN+fg==} - text-hex@0.0.0: - resolution: {integrity: sha512-RpZDSt2VIQnsPVDiOySPfi/RTRBbPyJj2fikmH5O2H5Zc/MC6ZPVcc4GYGcnbTS/j2v1HZOmy6F4CimfiLPMRg==} - text-hex@1.0.0: resolution: {integrity: sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==} @@ -11187,9 +11104,6 @@ packages: resolution: {integrity: sha512-G7r3AhovYtr5YKOWQkta8RKAPb+J9IsO4uVmzjl8AZwfhs8UcUwTiD6gcJYSgOtzyjvQKrKYn41syHbUWMkafA==} engines: {node: '>=0.10.0'} - timers-ext@0.1.7: - resolution: {integrity: sha512-b85NUNzTSdodShTIbky6ZF02e8STtVVfD+fu4aXXShEELpozH+bCpJLYMPZbsABN2wDH7fJpqIoXxJpzbf0NqQ==} - tiny-warning@1.0.3: resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==} @@ -12191,7 +12105,7 @@ snapshots: '@babel/traverse': 7.25.7 '@babel/types': 7.25.8 convert-source-map: 2.0.0 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -12556,7 +12470,7 @@ snapshots: '@babel/parser': 7.25.8 '@babel/template': 7.25.7 '@babel/types': 7.25.8 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -12657,7 +12571,7 @@ snapshots: '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -12834,7 +12748,7 @@ snapshots: '@humanwhocodes/config-array@0.13.0': dependencies: '@humanwhocodes/object-schema': 2.0.3 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -12871,7 +12785,7 @@ snapshots: '@jest/console@29.7.0': dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 chalk: 4.1.2 jest-message-util: 29.7.0 jest-util: 29.7.0 @@ -12884,14 +12798,14 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.9.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 29.7.0 - jest-config: 29.7.0(@types/node@18.19.50) + jest-config: 29.7.0(@types/node@18.19.55) jest-haste-map: 29.7.0 jest-message-util: 29.7.0 jest-regex-util: 29.6.3 @@ -12916,7 +12830,7 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 jest-mock: 29.7.0 '@jest/expect-utils@29.7.0': @@ -12934,7 +12848,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 18.19.50 + '@types/node': 18.19.55 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -12956,7 +12870,7 @@ snapshots: '@jest/transform': 29.7.0 '@jest/types': 29.6.3 '@jridgewell/trace-mapping': 0.3.25 - '@types/node': 18.19.50 + '@types/node': 18.19.55 chalk: 4.1.2 collect-v8-coverage: 1.0.2 exit: 0.1.2 @@ -14282,7 +14196,7 @@ snapshots: '@types/bonjour@3.5.13': dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/caseless@0.12.5': {} @@ -14295,7 +14209,7 @@ snapshots: '@types/connect-history-api-fallback@1.5.4': dependencies: '@types/express-serve-static-core': 4.19.0 - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/connect@3.4.35': dependencies: @@ -14369,7 +14283,7 @@ snapshots: '@types/graceful-fs@4.1.9': dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/hast@2.3.10': dependencies: @@ -14477,7 +14391,7 @@ snapshots: '@types/node-forge@1.3.11': dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/node-zendesk@2.0.15': dependencies: @@ -14604,14 +14518,14 @@ snapshots: '@types/serve-static@1.15.7': dependencies: '@types/http-errors': 2.0.4 - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/send': 0.17.4 '@types/sizzle@2.3.3': {} '@types/sockjs@0.3.36': dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/stack-utils@2.0.3': {} @@ -14642,7 +14556,7 @@ snapshots: '@types/ws@8.5.12': dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 '@types/xml-crypto@1.4.6': dependencies: @@ -14675,7 +14589,7 @@ snapshots: '@typescript-eslint/type-utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3) '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 eslint: 8.57.1 graphemer: 1.4.0 ignore: 5.3.1 @@ -14693,7 +14607,7 @@ snapshots: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3) '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 eslint: 8.57.1 optionalDependencies: typescript: 5.6.3 @@ -14709,7 +14623,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 6.21.0(typescript@5.6.3) '@typescript-eslint/utils': 6.21.0(eslint@8.57.1)(typescript@5.6.3) - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 eslint: 8.57.1 ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: @@ -14723,7 +14637,7 @@ snapshots: dependencies: '@typescript-eslint/types': 6.21.0 '@typescript-eslint/visitor-keys': 6.21.0 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.3 @@ -14982,8 +14896,6 @@ snapshots: ansi-html-community@0.0.8: {} - ansi-regex@2.1.1: {} - ansi-regex@5.0.1: {} ansi-regex@6.1.0: {} @@ -15086,8 +14998,6 @@ snapshots: readable-stream: 3.6.2 optional: true - argh@0.1.4: {} - argparse@1.0.10: dependencies: sprintf-js: 1.0.3 @@ -15472,7 +15382,7 @@ snapshots: browserslist@4.24.0: dependencies: - caniuse-lite: 1.0.30001667 + caniuse-lite: 1.0.30001668 electron-to-chromium: 1.5.32 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.0) @@ -15709,15 +15619,6 @@ snapshots: del: 4.1.1 webpack: 5.95.0(@swc/core@1.3.3) - cli-color@1.1.0: - dependencies: - ansi-regex: 2.1.1 - d: 0.1.1 - es5-ext: 0.10.64 - es6-iterator: 2.0.3 - memoizee: 0.3.10 - timers-ext: 0.1.7 - cli-cursor@3.1.0: dependencies: restore-cursor: 3.1.0 @@ -15795,8 +15696,6 @@ snapshots: dependencies: color-parse: 1.4.3 - color-convert@0.5.3: {} - color-convert@1.9.3: dependencies: color-name: 1.1.3 @@ -15840,10 +15739,6 @@ snapshots: hsluv: 0.0.3 mumath: 3.3.4 - color-string@0.3.0: - dependencies: - color-name: 1.1.4 - color-string@1.9.1: dependencies: color-name: 1.1.4 @@ -15852,11 +15747,6 @@ snapshots: color-support@1.1.3: optional: true - color@0.8.0: - dependencies: - color-convert: 0.5.3 - color-string: 0.3.0 - color@3.2.1: dependencies: color-convert: 1.9.3 @@ -15871,15 +15761,8 @@ snapshots: colorette@2.0.20: {} - colornames@0.0.2: {} - colornames@1.1.1: {} - colorspace@1.0.1: - dependencies: - color: 0.8.0 - text-hex: 0.0.0 - colorspace@1.1.4: dependencies: color: 3.2.1 @@ -16038,6 +15921,21 @@ snapshots: - supports-color - ts-node + create-jest@29.7.0(@types/node@18.19.55): + dependencies: + '@jest/types': 29.6.3 + chalk: 4.1.2 + exit: 0.1.2 + graceful-fs: 4.2.11 + jest-config: 29.7.0(@types/node@18.19.55) + jest-util: 29.7.0 + prompts: 2.4.2 + transitivePeerDependencies: + - '@types/node' + - babel-plugin-macros + - supports-color + - ts-node + create-react-class@15.7.0: dependencies: loose-envify: 1.4.0 @@ -16369,10 +16267,6 @@ snapshots: d3-transition: 3.0.1(d3-selection@3.0.0) d3-zoom: 3.0.0 - d@0.1.1: - dependencies: - es5-ext: 0.10.64 - d@1.0.2: dependencies: es5-ext: 0.10.64 @@ -16424,6 +16318,10 @@ snapshots: dependencies: ms: 2.1.2 + debug@4.3.7: + dependencies: + ms: 2.1.3 + debug@4.3.7(supports-color@8.1.1): dependencies: ms: 2.1.3 @@ -16558,12 +16456,6 @@ snapshots: asap: 2.0.6 wrappy: 1.0.2 - diagnostics@1.0.1: - dependencies: - colorspace: 1.0.1 - enabled: 1.0.2 - kuler: 0.0.0 - diagnostics@1.1.1: dependencies: colorspace: 1.1.4 @@ -16620,11 +16512,6 @@ snapshots: dom-scroll-into-view@1.2.1: {} - dom-serializer@0.2.2: - dependencies: - domelementtype: 2.3.0 - entities: 2.2.0 - dom-serializer@1.4.1: dependencies: domelementtype: 2.3.0 @@ -16639,14 +16526,8 @@ snapshots: dom-walk@0.1.2: {} - domelementtype@1.3.1: {} - domelementtype@2.3.0: {} - domhandler@2.4.2: - dependencies: - domelementtype: 1.3.1 - domhandler@4.3.1: dependencies: domelementtype: 2.3.0 @@ -16657,11 +16538,6 @@ snapshots: dompurify@3.1.6: {} - domutils@1.7.0: - dependencies: - dom-serializer: 0.2.2 - domelementtype: 1.3.1 - domutils@2.8.0: dependencies: dom-serializer: 1.4.1 @@ -16790,8 +16666,6 @@ snapshots: graceful-fs: 4.2.11 tapable: 2.2.1 - entities@1.1.2: {} - entities@2.2.0: {} entities@3.0.1: {} @@ -16918,12 +16792,6 @@ snapshots: es6-error@4.1.1: {} - es6-iterator@0.1.3: - dependencies: - d: 0.1.1 - es5-ext: 0.10.64 - es6-symbol: 2.0.1 - es6-iterator@2.0.3: dependencies: d: 1.0.2 @@ -16932,23 +16800,11 @@ snapshots: es6-promise@4.2.8: {} - es6-symbol@2.0.1: - dependencies: - d: 0.1.1 - es5-ext: 0.10.64 - es6-symbol@3.1.4: dependencies: d: 1.0.2 ext: 1.7.0 - es6-weak-map@0.1.4: - dependencies: - d: 0.1.1 - es5-ext: 0.10.64 - es6-iterator: 0.1.3 - es6-symbol: 2.0.1 - es6-weak-map@2.0.3: dependencies: d: 1.0.2 @@ -17056,7 +16912,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -17410,6 +17266,8 @@ snapshots: transitivePeerDependencies: - encoding + follow-redirects@1.15.6: {} + follow-redirects@1.15.6(debug@4.3.7): optionalDependencies: debug: 4.3.7(supports-color@8.1.1) @@ -18084,11 +17942,6 @@ snapshots: relateurl: 0.2.7 terser: 5.19.2 - html-minify-loader@1.4.0: - dependencies: - loader-utils: 1.4.2 - minimize: 1.8.1 - html-react-parser@1.4.14(react@18.3.1): dependencies: domhandler: 4.3.1 @@ -18110,15 +17963,6 @@ snapshots: '@rspack/core': 1.0.10(@swc/helpers@0.5.13) webpack: 5.95.0(@swc/core@1.3.3) - htmlparser2@3.9.2: - dependencies: - domelementtype: 1.3.1 - domhandler: 2.4.2 - domutils: 1.7.0 - entities: 1.1.2 - inherits: 2.0.4 - readable-stream: 2.3.8 - htmlparser2@6.1.0: dependencies: domelementtype: 2.3.0 @@ -18179,7 +18023,7 @@ snapshots: http-proxy-middleware@2.0.7(@types/express@4.17.21): dependencies: '@types/http-proxy': 1.17.15 - http-proxy: 1.18.1(debug@4.3.7) + http-proxy: 1.18.1 is-glob: 4.0.3 is-plain-obj: 3.0.0 micromatch: 4.0.8 @@ -18188,6 +18032,14 @@ snapshots: transitivePeerDependencies: - debug + http-proxy@1.18.1: + dependencies: + eventemitter3: 4.0.7 + follow-redirects: 1.15.6 + requires-port: 1.0.0 + transitivePeerDependencies: + - debug + http-proxy@1.18.1(debug@4.3.7): dependencies: eventemitter3: 4.0.7 @@ -18642,7 +18494,7 @@ snapshots: istanbul-lib-source-maps@4.0.1: dependencies: - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -18696,7 +18548,7 @@ snapshots: '@jest/expect': 29.7.0 '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 chalk: 4.1.2 co: 4.6.0 dedent: 1.5.3 @@ -18735,6 +18587,25 @@ snapshots: - supports-color - ts-node + jest-cli@29.7.0(@types/node@18.19.55): + dependencies: + '@jest/core': 29.7.0 + '@jest/test-result': 29.7.0 + '@jest/types': 29.6.3 + chalk: 4.1.2 + create-jest: 29.7.0(@types/node@18.19.55) + exit: 0.1.2 + import-local: 3.2.0 + jest-config: 29.7.0(@types/node@18.19.55) + jest-util: 29.7.0 + jest-validate: 29.7.0 + yargs: 17.7.2 + transitivePeerDependencies: + - '@types/node' + - babel-plugin-macros + - supports-color + - ts-node + jest-config@29.7.0(@types/node@18.19.50): dependencies: '@babel/core': 7.25.8 @@ -18765,6 +18636,36 @@ snapshots: - babel-plugin-macros - supports-color + jest-config@29.7.0(@types/node@18.19.55): + dependencies: + '@babel/core': 7.25.8 + '@jest/test-sequencer': 29.7.0 + '@jest/types': 29.6.3 + babel-jest: 29.7.0(@babel/core@7.25.8) + chalk: 4.1.2 + ci-info: 3.9.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 29.7.0 + jest-environment-node: 29.7.0 + jest-get-type: 29.6.3 + jest-regex-util: 29.6.3 + jest-resolve: 29.7.0 + jest-runner: 29.7.0 + jest-util: 29.7.0 + jest-validate: 29.7.0 + micromatch: 4.0.8 + parse-json: 5.2.0 + pretty-format: 29.7.0 + slash: 3.0.0 + strip-json-comments: 3.1.1 + optionalDependencies: + '@types/node': 18.19.55 + transitivePeerDependencies: + - babel-plugin-macros + - supports-color + jest-diff@26.6.2: dependencies: chalk: 4.1.2 @@ -18796,7 +18697,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -18808,7 +18709,7 @@ snapshots: dependencies: '@jest/types': 29.6.3 '@types/graceful-fs': 4.1.9 - '@types/node': 18.19.50 + '@types/node': 18.19.55 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -18866,7 +18767,7 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 jest-util: 29.7.0 jest-pnp-resolver@1.2.3(jest-resolve@29.7.0): @@ -18903,7 +18804,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 chalk: 4.1.2 emittery: 0.13.1 graceful-fs: 4.2.11 @@ -18931,7 +18832,7 @@ snapshots: '@jest/test-result': 29.7.0 '@jest/transform': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 chalk: 4.1.2 cjs-module-lexer: 1.2.3 collect-v8-coverage: 1.0.2 @@ -18996,7 +18897,7 @@ snapshots: dependencies: '@jest/test-result': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.50 + '@types/node': 18.19.55 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.13.1 @@ -19011,7 +18912,7 @@ snapshots: jest-worker@29.7.0: dependencies: - '@types/node': 18.19.50 + '@types/node': 18.19.55 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -19028,6 +18929,18 @@ snapshots: - supports-color - ts-node + jest@29.7.0(@types/node@18.19.55): + dependencies: + '@jest/core': 29.7.0 + '@jest/types': 29.6.3 + import-local: 3.2.0 + jest-cli: 29.7.0(@types/node@18.19.55) + transitivePeerDependencies: + - '@types/node' + - babel-plugin-macros + - supports-color + - ts-node + jmp@2.0.0: dependencies: uuid: 3.4.0 @@ -19233,10 +19146,6 @@ snapshots: kleur@4.1.5: {} - kuler@0.0.0: - dependencies: - colornames: 0.0.2 - kuler@1.0.1: dependencies: colornames: 1.1.1 @@ -19484,10 +19393,6 @@ snapshots: lru-cache@7.18.3: {} - lru-queue@0.1.0: - dependencies: - es5-ext: 0.10.64 - lz4@0.6.5: dependencies: buffer: 5.7.1 @@ -19643,16 +19548,6 @@ snapshots: memoize-one@5.2.1: {} - memoizee@0.3.10: - dependencies: - d: 0.1.1 - es5-ext: 0.10.64 - es6-weak-map: 0.1.4 - event-emitter: 0.3.5 - lru-queue: 0.1.0 - next-tick: 0.2.2 - timers-ext: 0.1.7 - meow@6.1.1: dependencies: '@types/minimist': 1.2.2 @@ -19912,16 +19807,6 @@ snapshots: minimist@1.2.8: {} - minimize@1.8.1: - dependencies: - argh: 0.1.4 - async: 1.5.2 - cli-color: 1.1.0 - diagnostics: 1.0.1 - emits: 3.0.0 - htmlparser2: 3.9.2 - node-uuid: 1.4.8 - minipass@3.3.6: dependencies: yallist: 4.0.0 @@ -20104,8 +19989,6 @@ snapshots: transitivePeerDependencies: - zod - next-tick@0.2.2: {} - next-tick@1.1.0: {} next@14.2.15(@babel/core@7.25.2)(@opentelemetry/api@1.9.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(sass@1.79.5): @@ -22465,7 +22348,7 @@ snapshots: spdy-transport@3.0.0: dependencies: - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -22476,7 +22359,7 @@ snapshots: spdy@4.0.2: dependencies: - debug: 4.3.7(supports-color@8.1.1) + debug: 4.3.7 handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -22870,8 +22753,6 @@ snapshots: dependencies: b4a: 1.6.6 - text-hex@0.0.0: {} - text-hex@1.0.0: {} text-table@0.2.0: {} @@ -22911,11 +22792,6 @@ snapshots: timed-out@4.0.1: {} - timers-ext@0.1.7: - dependencies: - es5-ext: 0.10.64 - next-tick: 1.1.0 - tiny-warning@1.0.3: {} tinycolor2@1.5.2: {} @@ -22991,6 +22867,25 @@ snapshots: '@jest/types': 29.6.3 babel-jest: 29.7.0(@babel/core@7.25.8) + ts-jest@29.2.5(@babel/core@7.25.8)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.25.8))(jest@29.7.0(@types/node@18.19.55))(typescript@5.6.3): + dependencies: + bs-logger: 0.2.6 + ejs: 3.1.10 + fast-json-stable-stringify: 2.1.0 + jest: 29.7.0(@types/node@18.19.55) + jest-util: 29.7.0 + json5: 2.2.3 + lodash.memoize: 4.1.2 + make-error: 1.3.6 + semver: 7.6.3 + typescript: 5.6.3 + yargs-parser: 21.1.1 + optionalDependencies: + '@babel/core': 7.25.8 + '@jest/transform': 29.7.0 + '@jest/types': 29.6.3 + babel-jest: 29.7.0(@babel/core@7.25.8) + tsd@0.22.0: dependencies: '@tsd/typescript': 4.7.4 diff --git a/src/packages/static/package.json b/src/packages/static/package.json index 50cc113292..7c5a9a1fa2 100644 --- a/src/packages/static/package.json +++ b/src/packages/static/package.json @@ -82,7 +82,6 @@ "handlebars": "^4.7.7", "handlebars-loader": "^1.7.1", "html-loader": "^2.1.2", - "html-minify-loader": "^1.4.0", "html-webpack-plugin": "^5.5.3", "identity-obj-proxy": "^3.0.0", "imports-loader": "^3.0.0", diff --git a/src/packages/static/src/module-rules.ts b/src/packages/static/src/module-rules.ts index ae5d780112..61166a64b2 100644 --- a/src/packages/static/src/module-rules.ts +++ b/src/packages/static/src/module-rules.ts @@ -104,14 +104,8 @@ export default function moduleRules(devServer?: boolean) { type: "asset/resource", }, { - test: /\.html$/, - use: [ - { loader: "raw-loader" }, - { - loader: "html-minify-loader", - options: { conservativeCollapse: true }, - }, - ], + test: /\.html$/i, + type: "asset/resource", }, { test: /\.hbs$/, loader: "handlebars-loader" }, { From d90b2ee8f369d396e719edf03f9a5d643aac1d76 Mon Sep 17 00:00:00 2001 From: Harald Schilly Date: Mon, 21 Oct 2024 15:07:33 +0200 Subject: [PATCH 2/2] frontend/static: hardcoding all html template files, deleting all (unusued) other html files --- src/packages/frontend/account.html | 6 - src/packages/frontend/console.html | 94 ------ .../{editor.html => editor-templates.ts} | 270 +++++++++++++++++- src/packages/frontend/editor.coffee | 10 +- src/packages/frontend/jupyter.html | 163 ----------- src/packages/frontend/sagews/3d.html | 19 -- src/packages/frontend/sagews/d3.html | 9 - src/packages/frontend/sagews/interact.html | 141 --------- 8 files changed, 269 insertions(+), 443 deletions(-) delete mode 100644 src/packages/frontend/account.html delete mode 100644 src/packages/frontend/console.html rename src/packages/frontend/{editor.html => editor-templates.ts} (82%) delete mode 100644 src/packages/frontend/jupyter.html delete mode 100644 src/packages/frontend/sagews/3d.html delete mode 100644 src/packages/frontend/sagews/d3.html delete mode 100644 src/packages/frontend/sagews/interact.html diff --git a/src/packages/frontend/account.html b/src/packages/frontend/account.html deleted file mode 100644 index 5b5d11ec78..0000000000 --- a/src/packages/frontend/account.html +++ /dev/null @@ -1,6 +0,0 @@ - - -
diff --git a/src/packages/frontend/console.html b/src/packages/frontend/console.html deleted file mode 100644 index 82db599b02..0000000000 --- a/src/packages/frontend/console.html +++ /dev/null @@ -1,94 +0,0 @@ - - -
-
- - - -
-
- -
- -    - -
- - - - - - - -
- -
-    -
- WARNING: Large burst of output! (May try to interrupt.) -
- -
- - - - esc - return - submit - ctrl-b - ctrl-c - tab - - - - - -
- - - -
- - - -
- -
-
-
-
-
-
-
-
-
diff --git a/src/packages/frontend/editor.html b/src/packages/frontend/editor-templates.ts similarity index 82% rename from src/packages/frontend/editor.html rename to src/packages/frontend/editor-templates.ts index abab94fbe5..447a90ed61 100644 --- a/src/packages/frontend/editor.html +++ b/src/packages/frontend/editor-templates.ts @@ -1,8 +1,102 @@ - +/* + * This file is part of CoCalc: Copyright © 2024 Sagemath, Inc. + * License: MS-RSL – see LICENSE.md for details + */ +const console = ` +
+
+ + + +
+
+ +
+ +    + +
+ + + + + + + +
+ +
+    +
+ WARNING: Large burst of output! (May try to interrupt.) +
+ +
+ + + + esc + return + submit + ctrl-b + ctrl-c + tab + + + + + +
+ + + +
+ + + +
+ +
+
+
+
+
+
+
+
+
+ +`; + +const editor = `
@@ -1555,3 +1649,171 @@

Goto Line

+ +`; + +const sagews_interact = ` +
+ + +
+
+ + +
+
+
+ +
+
+ + + + Submit +

+ +
+
+
+ + + +
+
+
+ +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+ +
+
+    +
+
+
+ + +
+
+
+ +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ +
+
+ + +
+
+
+ +
+`; + +const sagews_3d = ` +
+ + + Loading 3D scene... + + + + Evaluate to see 3d plot. + + + + canvas + +
+`; + +const sagews_d3 = ` +
+ + +
+`; + +export const TEMPLATES_HTML = + console + editor + sagews_interact + sagews_3d + sagews_d3; diff --git a/src/packages/frontend/editor.coffee b/src/packages/frontend/editor.coffee index 92809e3664..dc830599da 100644 --- a/src/packages/frontend/editor.coffee +++ b/src/packages/frontend/editor.coffee @@ -7,13 +7,9 @@ $ = window.$ # Do this first, before any templates are initialized (e.g., elsewhere too). -templates_html = \ - require("./console.html").default + - require("./editor.html").default + - require("./sagews/interact.html").default + - require("./sagews/3d.html").default + - require("./sagews/d3.html").default; -$("body").append(templates_html); +{TEMPLATES_HTML} = require("./editor-templates") + +$("body").append(TEMPLATES_HTML); templates = $("#webapp-editor-templates") diff --git a/src/packages/frontend/jupyter.html b/src/packages/frontend/jupyter.html deleted file mode 100644 index c9c366ecd1..0000000000 --- a/src/packages/frontend/jupyter.html +++ /dev/null @@ -1,163 +0,0 @@ - - -
- 
   

-
-    

-        
-        
-
-        

-            
-                
-                  
-                  
-                  Save
-                
-                  Publish
-                  About
-            
-            
-                 
-                    Run
-                
-                 
-                    Stop
-                
-                 
-                    Tab
-                
-            
-        

-
-        
Opening...

-        

-    

-
-
-    
-    

-        

-            
-                 Copy Jupyter Notebook to your Project...
-            
-            
-                 Download
-            
-        

-        

-            
-        

-    

-
-
-    
-
-
-
-
-

diff --git a/src/packages/frontend/sagews/3d.html b/src/packages/frontend/sagews/3d.html
deleted file mode 100644
index 3da6fc7425..0000000000
--- a/src/packages/frontend/sagews/3d.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-

-    
-        
-        Loading 3D scene...
-    
-    
-        
-            Evaluate to see 3d plot.
-        
-        
-        
-        canvas
-    
-

diff --git a/src/packages/frontend/sagews/d3.html b/src/packages/frontend/sagews/d3.html
deleted file mode 100644
index b1b7cdea65..0000000000
--- a/src/packages/frontend/sagews/d3.html
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-

-    
-    
-

diff --git a/src/packages/frontend/sagews/interact.html b/src/packages/frontend/sagews/interact.html
deleted file mode 100644
index dc627cd2d7..0000000000
--- a/src/packages/frontend/sagews/interact.html
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-

-
-    
-    

-    

-
-    
-    

-        

-            

-                
-            

-            

-                
-                
-                
-                    Submit
-                    


-                
-            

-        

-    

-
-
-    
-    

-        

-            

-                
-            

-            

-                
-            

-        

-    

-
-    
-    

-        

-            

-                
-            

-            

-                

-            

-        

-    

-
-    
-    

-        

-            

-                
-            

-            

-                   
-            

-        

-    

-
-    
-    

-        

-            

-                
-            

-            

-                
-            

-        

-    

-
-    
-    

-        

-            

-                
-            

-            

-                

-                    
-                    
-                

-            

-        

-    

-
-    
-    

-        

-            

-                

-                    

-                

-                

-                    

-                

-                

-                    

-                

-            

-        

-    

-
-
-    
-    

-        

-            

-                

-                    

-                

-                

-                    

-                

-                

-                    

-                

-            

-        

-    

-
-    
-    

-        

-            

-                
-            

-            

-                
-                 
-            

-        

-    

-
-