From 689558755d3a43889de6f156250514f6e7d01060 Mon Sep 17 00:00:00 2001 From: Pierluigi Lenoci Date: Wed, 17 Jun 2026 16:55:03 +0200 Subject: [PATCH] feat: add prettier-plugin-bootstrap for consistent Bootstrap class ordering Add prettier-plugin-bootstrap@^0.3.1 to devDependencies and .prettierrc.cjs to enforce consistent Bootstrap class ordering. Signed-off-by: Pierluigi Lenoci --- .prettierrc.cjs | 1 + package.json | 3 +- .../djangoApp/home/templates/index.html | 10 +- .../workspace5/flaskApp/templates/index.html | 10 +- .../webview-side/data-explorer/index.html | 667 +++++++++--------- .../dataframe-renderer/DataframeRenderer.tsx | 14 +- src/webviews/webview-side/plot/index.html | 667 +++++++++--------- .../webview-side/variable-view/index.html | 667 +++++++++--------- 8 files changed, 1020 insertions(+), 1019 deletions(-) diff --git a/.prettierrc.cjs b/.prettierrc.cjs index 3e7a4c6ad5..e3f7705c4c 100644 --- a/.prettierrc.cjs +++ b/.prettierrc.cjs @@ -4,6 +4,7 @@ module.exports = { tabWidth: 4, endOfLine: 'auto', trailingComma: 'none', + plugins: ['prettier-plugin-bootstrap'], overrides: [ { files: ['*.yml', '*.yaml'], diff --git a/package.json b/package.json index c5e57d2725..2317f6446f 100644 --- a/package.json +++ b/package.json @@ -2910,7 +2910,8 @@ "typescript": "^5.8.3", "unicode-properties": "^1.3.1", "utf-8-validate": "^5.0.8", - "util": "^0.12.4" + "util": "^0.12.4", + "prettier-plugin-bootstrap": "^0.3.1" }, "lint-staged": { "src/**/*.{ts,tsx}": [ diff --git a/src/test/testMultiRootWkspc/workspace5/djangoApp/home/templates/index.html b/src/test/testMultiRootWkspc/workspace5/djangoApp/home/templates/index.html index 6ca5107d23..00c96940c5 100644 --- a/src/test/testMultiRootWkspc/workspace5/djangoApp/home/templates/index.html +++ b/src/test/testMultiRootWkspc/workspace5/djangoApp/home/templates/index.html @@ -1,9 +1,7 @@ - - -

Hello {{ value_from_server }}!

-

Hello {{ another_value_from_server }}!

- - + +

Hello {{ value_from_server }}!

+

Hello {{ another_value_from_server }}!

+ diff --git a/src/test/testMultiRootWkspc/workspace5/flaskApp/templates/index.html b/src/test/testMultiRootWkspc/workspace5/flaskApp/templates/index.html index 6ca5107d23..00c96940c5 100644 --- a/src/test/testMultiRootWkspc/workspace5/flaskApp/templates/index.html +++ b/src/test/testMultiRootWkspc/workspace5/flaskApp/templates/index.html @@ -1,9 +1,7 @@ - - -

Hello {{ value_from_server }}!

-

Hello {{ another_value_from_server }}!

- - + +

Hello {{ value_from_server }}!

+

Hello {{ another_value_from_server }}!

+ diff --git a/src/webviews/webview-side/data-explorer/index.html b/src/webviews/webview-side/data-explorer/index.html index 867d643170..a66dc248a2 100644 --- a/src/webviews/webview-side/data-explorer/index.html +++ b/src/webviews/webview-side/data-explorer/index.html @@ -1,355 +1,356 @@ - - - + + + React App - - -
- + return '<%= htmlWebpackPlugin.options.imageBaseUrl %>' + relativePath; + } + function getInitialSettings() { + return { extraSettings: { editorCursor: 'block', editorCursorBlink: 'blink' } }; + } + diff --git a/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx b/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx index 4831ba874a..697ed17995 100644 --- a/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx +++ b/src/webviews/webview-side/dataframe-renderer/DataframeRenderer.tsx @@ -138,14 +138,14 @@ export const DataframeRenderer = memo(function DataframeRenderer({ return (
-
-
+
+
{filteredColumns.map((column) => { const rows = data.rows.map((row) => row[column.name]); return (
-
+
{column.name}
{column.dtype}
@@ -168,8 +168,8 @@ export const DataframeRenderer = memo(function DataframeRenderer({ })}
-
-
+
+
{getLocString('dataframeRowsColumns', `{0} rows, {1} columns`) .replace('{0}', String(numberOfRows)) @@ -187,7 +187,7 @@ export const DataframeRenderer = memo(function DataframeRenderer({
-
+
-
+
- - - + + + Jupyter Extension Plot Viewer - - -
- + return '<%= htmlWebpackPlugin.options.imageBaseUrl %>' + relativePath; + } + function getInitialSettings() { + return { extraSettings: { editorCursor: 'block', editorCursorBlink: 'blink' } }; + } + diff --git a/src/webviews/webview-side/variable-view/index.html b/src/webviews/webview-side/variable-view/index.html index 7d3aecaf19..6ed59fec77 100644 --- a/src/webviews/webview-side/variable-view/index.html +++ b/src/webviews/webview-side/variable-view/index.html @@ -1,355 +1,356 @@ - - - + + + Jupyter Extension Variable Viewer - - -
- + return '<%= htmlWebpackPlugin.options.imageBaseUrl %>' + relativePath; + } + function getInitialSettings() { + return { extraSettings: { editorCursor: 'block', editorCursorBlink: 'blink' } }; + } +