Bugfix remove uri encoding for txt generation

v-pitrasch · v-pitrasch · commit 57f92d51f967 · 2025-10-09T15:02:14.000+02:00
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -34,11 +34,11 @@ jobs:
       with:
         name: build-artifact
         path: dist/*
-        
+
   release:
     runs-on: ubuntu-latest
     needs: build
-    
+
     steps:
       - name: Download Build Artifacts
         uses: actions/download-artifact@v5
@@ -61,15 +61,15 @@ jobs:
             Changes in this Release
             - First Change
             - Second Change
-          draft: false
+          draft: true
           prerelease: false
       - name: Upload bookmarklet
         id: upload-bookmarklet
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }} 
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./bookmarklet.txt
           asset_name: bookmarklet.txt
           asset_content_type: text/plain
diff --git a/esbuild.mjs b/esbuild.mjs
@@ -33,13 +33,13 @@ const bookmarkletPlugin = options => ({
             if (!outputFiles) return;
 
             for (const file of outputFiles) {
-                const outputBuffer = file.contents;
                 const utf8Decoder = new TextDecoder();
-                const outputContent = utf8Decoder.decode(outputBuffer);
-                file.contents = Buffer.concat([
-                    Buffer.from('javascript:', 'utf8'),
-                    Buffer.from(encodeURI(outputContent), 'utf8'),
-                ]);
+                const outputContent = utf8Decoder.decode(file.contents);
+                const compactCode = outputContent
+                    .replace(/\s+/g, ' ')
+                    .replace(/\s*([{}();,:])\s*/g, '$1');
+                const bookmarklet = 'javascript:(function(){' + compactCode + '})();';
+                file.contents = Buffer.from(bookmarklet, 'utf8');
             }
         });
     }
@@ -65,6 +65,9 @@ await esbuild.build({
         fs.writeFileSync(file.path, file.contents);
         bookmarkletCode = file.contents.toString();
     }
+    const encodedBookmarklet = 'javascript:' + encodeURI(
+        bookmarkletCode.replace(/^javascript:/, '')
+    );
 
     const htmlContent = `
         <!DOCTYPE html>
@@ -80,7 +83,7 @@ await esbuild.build({
                 <h2>Bookmark Color Contrast Calculation Tool</h2>
                 <ol>
                     <li>Activate the bookmark toolbar in your browser (if not active yet). Most Browsers allow this by pressing Ctrl+Shift+B.</li>
-                    <li>Drag & drop the link <a href="${bookmarkletCode}">CAAT Contrast Checker</a> to the bookmark toolbar.</li>
+                    <li>Drag & drop the link <a href="${encodedBookmarklet}">CAAT Contrast Checker</a> to the bookmark toolbar.</li>
                     <li>Activate the bookmarklet on any page.</li>
                     <li>Use the pipette to transfer color values or enter them manually into the fields to determine the color contrast.</li>
                 </ol>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "color-contrast-bookmarklet",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "color contrast checker bookmarklet",
   "main": "dist/bookmarklet.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "color-contrast-bookmarklet",`
`3`		`- "version": "0.2.1",`
	`3`	`+ "version": "0.2.2",`
`4`	`4`	`"description": "color contrast checker bookmarklet",`
`5`	`5`	`"main": "dist/bookmarklet.js",`
`6`	`6`	`"scripts": {`