Rewrite in TypeScript and drop jQuery

.github/workflows/onPROnDevelop.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Install dependencies
         run: npm install

.github/workflows/release.yml

@@ -39,49 +39,53 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '24'
 
       - name: Install deps
         run: npm install
 
       - name: Build Blapy2
         run: npm run build
 
-      - name: Commit built file
+      - name: Commit built files
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-          git add dist/blapy2.js -f
-          git add dist/Blapymotion.js -f
-          git add dist/BlapySocket.js -f
-          git commit -m "chore: build dist/blapy2.js [skip ci]" || echo "no changes"
+          git add -f dist/blapy.umd.js dist/blapy.mjs dist/BlapyMotion.js dist/BlapySocket.js
+          git commit -m "chore: build dist [skip ci]" || echo "no changes"
           git push
 
       - name: Install jq (for reading version from package.json)
         run: sudo apt-get update && sudo apt-get install -y jq
 
-      - name: Bump version + tag
+      - name: Create tag from package.json version
         id: version
         run: |
-          LAST_VERSION=$(git tag --sort=-v:refname | tail -n 1)
-          if [[ "$LAST_VERSION" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
-            MAJOR=${BASH_REMATCH[1]}
-            MINOR=${BASH_REMATCH[2]}
-            PATCH=${BASH_REMATCH[3]}
-            NEW_VERSION="v$(jq -r .version package.json)"
-          else
-            NEW_VERSION="v0.0.1"
-          fi
-          echo "New version: $NEW_VERSION"
+          VERSION=$(jq -r .version package.json)
+          NEW_VERSION="v$VERSION"
+
           echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT
-          git tag $NEW_VERSION
-          git push origin $NEW_VERSION
+
+          if git tag -l | grep -qx "$NEW_VERSION"; then
+            echo "Tag already exists: $NEW_VERSION"
+            echo "tag_created=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          git tag "$NEW_VERSION"
+          git push origin "$NEW_VERSION"
+          echo "tag_created=true" >> $GITHUB_OUTPUT
 
       - name: Create GitHub Release
+        if: steps.version.outputs.tag_created == 'true'
         uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ steps.version.outputs.new_version }}
           name: Release ${{ steps.version.outputs.new_version }}
-          files: dist/blapy2.js
+          files: |
+            dist/blapy.umd.js
+            dist/blapy.mjs
+            dist/BlapyMotion.js
+            dist/BlapySocket.js
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,9 +1,11 @@
 old/**
 node_modules/**
-docker-compose.yml
 .idea/**
 dist/**
 test-results/**
 CLAUDE.md
 **/node_modules/
-dist/blapy2.js
+dist/blapy2.js
+bun.lockb
+src/old
+/Blapy2/

.prettierrc

@@ -1,6 +1,6 @@
 {
   "endOfLine": "lf",
-  "semi": false,
+  "semi": true,
   "singleQuote": true,
   "tabWidth": 2,
   "trailingComma": "es5"

LICENSE

@@ -7,7 +7,7 @@
  * Abstract : transform your standard website into a web app
  * Remark :
  * -----------------------------------------------------------------------------------------
- * @copyright : Intersel 2015-2025
+ * @copyright : Intersel 2015-2026
  * @contributors : 
  *    - Emmanuel Podvin - github@intersel.fr
  * -----------------------------------------------------------------------------------------

demos/bootstrap-four-column-gallery/index.html

@@ -96,20 +96,17 @@ <h1>Blapy Demo - Bootstrap Four Column Gallery</h1>
 </div>
 
 <!-- Scripts -->
-<script src="../../lib/navigo/index.js"></script>
-<script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-<script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-<script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-<script src="../../lib/iFSM/iFSM.js"></script>
-<script src="assets/js/bootstrap.min.js"></script>
 
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 
 <script>
   document.addEventListener("DOMContentLoaded", () => {
     const blapyContainer = document.querySelector("#myBlapy");
 
     blapyContainer.Blapy({
+      enableRouter: true,
+      debug: true,
+      logLevel: 3
     });
 
     blapyContainer.addEventListener("Blapy_ErrorOnPageChange", (event, error) => {

demos/demo-json-append/index.html

@@ -5,15 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Blapy2 - JSON Append Example</title>
 
-    <!-- Required libraries -->
-    <script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-    <script src="../../lib/mustache/mustache.js"></script>
-    <script src="../../lib/navigo/index.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-    <script src="../../lib/json5/index.min.js"></script>
-    <script src="../../lib/iFSM/iFSM.js"></script>
-    <script src="../../lib/json2html/json2html.js"></script>
+    <!-- Blapy2 modern build: mustache, navigo, json5, json2html are bundled in -->
 
     <style>
       body {
@@ -126,7 +118,7 @@ <h1>📝 My Task List</h1>
     </div>
   </body>
 
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
     const blapy = document
       .querySelector('#myBlapy')

demos/demo1/index.html

@@ -2,11 +2,6 @@
 <!-- To run the current sample code in your own environment, copy this to an html page. -->
 <html>
   <head>
-    <script src="../../lib/navigo/index.js"></script>
-    <script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-    <script src="../../lib/iFSM/iFSM.js"></script>
   </head>
   <body id="myApplication">
     <h1>This is test1.html file</h1>
@@ -57,13 +52,14 @@ <h1>This is test1.html file</h1>
       <p>This is a nice footer for "footer" container</p>
     </div>
 
-    <script src="../../dist/blapy2.js"></script>
+    <script src="../../dist/blapy.umd.js"></script>
     <script>
       document.addEventListener("DOMContentLoaded", () => {
 
 		document.querySelector("#myApplication").Blapy({
           enableRouter: true,
           debug: true,
+          logLevel: 3
         });
       });
     </script>

demos/demo1/test2.html

@@ -2,11 +2,6 @@
 <!-- To run the current sample code in your own environment, copy this to an html page. -->
 <html>
 <head>
-  <script src="../../lib/navigo/index.js"></script>
-  <script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-  <script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-  <script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-  <script src="../../lib/iFSM/iFSM.js"></script>
 </head>
 <body id="myApplication">
 
@@ -33,7 +28,7 @@ <h1>This is test2.html file</h1>
   <p>This is a nice footer for "footer" container</p>
 </div>
 
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
 
   document.addEventListener('DOMContentLoaded', () => {

demos/demo1/test3.html

@@ -2,11 +2,6 @@
 <!-- To run the current sample code in your own environment, copy this to an html page. -->
 <html>
 <head>
-  <script src="../../lib/navigo/index.js"></script>
-  <script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-  <script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-  <script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-  <script src="../../lib/iFSM/iFSM.js"></script>
 </head>
 <body id="myApplication">
 
@@ -35,7 +30,7 @@ <h1>This is test3.html file</h1>
 <div id="message">
 </div>
 
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
 
   document.addEventListener('DOMContentLoaded', () => {

demos/demo2/footer.php

@@ -1,4 +1,4 @@
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
 
   document.addEventListener('DOMContentLoaded', () => {

demos/demo2/header.php

@@ -5,11 +5,7 @@
 <head>
 	<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
 	<link rel="stylesheet" href="main.css" />
-
-	<script src="../../lib/navigo/index.js"></script>
-	<script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-	<script src="../../lib/iFSM/iFSM.js"></script>
+
+	<!-- Blapy2 modern build: navigo/mustache/json5/json2html are bundled in, no jQuery needed -->
 
 </head>

demos/demo2b/footer.php

@@ -1,4 +1,4 @@
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
 
   document.addEventListener('DOMContentLoaded', () => {

demos/demo2b/header.php

@@ -4,9 +4,5 @@
 <head>
 	<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
 	<link rel="stylesheet" href="main.css" />
-	<script src="../../lib/navigo/index.js"></script>
-	<script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-	<script src="../../lib/iFSM/iFSM.js"></script>
+	<!-- Blapy2 modern build: navigo/mustache/json5/json2html are bundled in, no jQuery needed -->
 </head>

demos/demo2b/index.php

@@ -114,19 +114,19 @@
 ?>
 
 		</div>
-		<button onclick="$('#myBlapyApp1').trigger('loadUrl',{aUrl:'index.php?More=1',params:{action:'update'}})">Get more content...</button>
-		<button onclick="$('#myBlapyApp1').trigger('loadUrl',{aUrl:'index.php?More=-1',params:{action:'update'}})">Prepend new content...</button>
-		<button onclick="$('#myBlapyApp1').trigger('loadUrl',{aUrl:'index.php?More=0',params:{action:'update'}})">Forced update of content...</button>
-		<button onclick="$('#myBlapyApp1').trigger('loadUrl',{aUrl:'index.php?ChangeBlapyBlock=1',params:{action:'update'}})">Change Blapy Block with two others blocks...</button>
-		<button onclick="$('#myBlapyApp1').trigger('loadUrl',{aUrl:'index.php?ChangeBlapyBlock=-1',params:{action:'update'}})">Reinitialize the Blapy Block...</button>
+		<button onclick="document.getElementById('myBlapyApp1').Blapy().myFSM.trigger('loadUrl',{aUrl:'index.php?More=1',params:{action:'update'}})">Get more content...</button>
+		<button onclick="document.getElementById('myBlapyApp1').Blapy().myFSM.trigger('loadUrl',{aUrl:'index.php?More=-1',params:{action:'update'}})">Prepend new content...</button>
+		<button onclick="document.getElementById('myBlapyApp1').Blapy().myFSM.trigger('loadUrl',{aUrl:'index.php?More=0',params:{action:'update'}})">Forced update of content...</button>
+		<button onclick="document.getElementById('myBlapyApp1').Blapy().myFSM.trigger('loadUrl',{aUrl:'index.php?ChangeBlapyBlock=1',params:{action:'update'}})">Change Blapy Block with two others blocks...</button>
+		<button onclick="document.getElementById('myBlapyApp1').Blapy().myFSM.trigger('loadUrl',{aUrl:'index.php?ChangeBlapyBlock=-1',params:{action:'update'}})">Reinitialize the Blapy Block...</button>
 	</div>
 	<div style="border:solid 1px green;margin:20px;padding:0px 20px 20px;" id="myBlapyApp3">
 		<h4>"myBlapyApp3" Blapy blocks</h4>
 
 		<ul>
 			<li><a href="content1_all_app.php" data-blapy-link>Content 1 for any Application with a "mainContainerApp3" block</a></li>
 			<li><a href="content2_app3.php" data-blapy-link>Content 2 only for "mainContainerApp3" block of 'myBlapyApp3' application</a></li>
-			<li><a href="content3_app1.php" onclick="$('#myBlapyApp4').trigger('loadUrl',{aUrl:$(this).attr('href')});return false;">Content 3 only for "mainContainerApp3" block of 'myBlapyApp1' application</a></li>
+			<li><a href="content3_app1.php" onclick="document.getElementById('myBlapyApp4').Blapy().myFSM.trigger('loadUrl',{aUrl:this.getAttribute('href')});return false;">Content 3 only for "mainContainerApp3" block of 'myBlapyApp1' application</a></li>
 		</ul>
 		<div style="width:100%;">
 			<div style="padding:20px;border:solid 1px green;width:40%;float:left;">

demos/demo3-posted-input/footer.php

@@ -1,4 +1,4 @@
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
 
   document.addEventListener('DOMContentLoaded', () => {

demos/demo3-posted-input/header.php

@@ -6,10 +6,5 @@
 	<title><?php echo $defaultTitle ?></title>
 	<meta content='text/html; charset=UTF-8' http-equiv='Content-Type'>
 	<link rel="stylesheet" href="main.css" />
-	<script src="../../lib/navigo/index.js"></script>
-	<script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-	<script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-	<script src="../../lib/iFSM/iFSM.js"></script>
-	<script type="text/javascript" src="../../lib/json2html/json2html.js"></script>
+	<!-- Blapy2 modern build: navigo/mustache/json5/json2html are bundled in, no jQuery needed -->
 </head>

demos/demo_json_init/index-jsonfromform.html

@@ -61,16 +61,9 @@ <h1>Blapy Block results in a Table</h1>
 	</div>
 </body>
 
-    <script src="../../lib/jquery/jquery-3.7.1.min.js"></script>
-    <script src="../../lib/mustache/mustache.js"></script>
-    <script src="../../lib/navigo/index.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.attrchange.js"></script>
-    <script src="../../lib/iFSM/extlib/jquery.dotimeout.js"></script>
-    <script src="../../lib/json5/index.min.js"></script>
-    <script src="../../lib/iFSM/iFSM.js"></script>
-    <script type="text/javascript" src="../../lib/json2html/json2html.js"></script>
+    <!-- Blapy2 modern build: mustache/navigo/json5/json2html are bundled in, no jQuery needed -->
 
-<script src="../../dist/blapy2.js"></script>
+<script src="../../dist/blapy.umd.js"></script>
 <script>
         document.addEventListener("DOMContentLoaded", () => {
 			let blapy = document.querySelector("#myBlapy");