diff --git a/eslint.config.ts b/eslint.config.ts index 36c3b8d1e5b..0a327e333df 100644 --- a/eslint.config.ts +++ b/eslint.config.ts @@ -574,7 +574,6 @@ export default defineConfig([ 'no-restricted-properties': [2, ...restrictedProperties], 'no-restricted-imports': [2, {paths: [ {name: 'jquery', message: 'Use the global $ instead', allowTypeImports: true}, - {name: 'htmx.org', message: 'Use the global htmx instead', allowTypeImports: true}, ]}], 'no-restricted-syntax': [2, 'WithStatement', 'ForInStatement', 'LabeledStatement', 'SequenceExpression'], 'no-return-assign': [0], @@ -1021,6 +1020,6 @@ export default defineConfig([ }, { files: ['web_src/**/*'], - languageOptions: {globals: {...globals.browser, ...globals.jquery, htmx: false}}, + languageOptions: {globals: {...globals.browser, ...globals.jquery}}, }, ]); diff --git a/package.json b/package.json index 316f8702044..5c9bd5eb0fe 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,6 @@ "dropzone": "6.0.0-beta.2", "easymde": "2.20.0", "esbuild": "0.28.0", - "htmx.org": "2.0.8", "idiomorph": "0.7.4", "jquery": "4.0.0", "js-yaml": "4.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 88f1c4ebf5e..bc0c57751c0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -157,9 +157,6 @@ importers: esbuild: specifier: 0.28.0 version: 0.28.0 - htmx.org: - specifier: 2.0.8 - version: 2.0.8 idiomorph: specifier: 0.7.4 version: 0.7.4 @@ -2768,9 +2765,6 @@ packages: htmlparser2@8.0.2: resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==} - htmx.org@2.0.8: - resolution: {integrity: sha512-fm297iru0iWsNJlBrjvtN7V9zjaxd+69Oqjh4F/Vq9Wwi2kFisLcrLCiv5oBX0KLfOX/zG8AUo9ROMU5XUB44Q==} - iconv-lite@0.6.3: resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} engines: {node: '>=0.10.0'} @@ -6789,8 +6783,6 @@ snapshots: domutils: 3.2.2 entities: 4.5.0 - htmx.org@2.0.8: {} - iconv-lite@0.6.3: dependencies: safer-buffer: '@nolyfill/safer-buffer@1.0.44' diff --git a/routers/common/markup.go b/routers/common/markup.go index 56b588332ff..35b1b21f6a1 100644 --- a/routers/common/markup.go +++ b/routers/common/markup.go @@ -26,6 +26,8 @@ func RenderMarkup(ctx *context.Base, ctxRepo *context.Repository, mode, text, ur // filePath is the path of the file to render if the end user is trying to preview a repo file (mode == "file") // filePath will be used as RenderContext.RelativePath + // TODO: MARKUP-RENDER-CONTEXT: this logic is unnecessarily complicated. + // Ideally: the "file path" should not appear in the "url path context", but it needs a lot of refactoring to achieve that // for example, when previewing file "/gitea/owner/repo/src/branch/features/feat-123/doc/CHANGE.md", then filePath is "doc/CHANGE.md" // and the urlPathContext is "/gitea/owner/repo/src/branch/features/feat-123/doc" diff --git a/templates/repo/actions/workflow_dispatch_inputs.tmpl b/templates/repo/actions/workflow_dispatch_inputs.tmpl index 10badeb6177..47caa9bac42 100644 --- a/templates/repo/actions/workflow_dispatch_inputs.tmpl +++ b/templates/repo/actions/workflow_dispatch_inputs.tmpl @@ -12,14 +12,12 @@
{{if eq .Type "choice"}} - {{/* htmx won't initialize the fomantic dropdown, so it is a standard "select" input */}} {{else if eq .Type "boolean"}} - {{/* htmx doesn't trigger our JS code to attach fomantic label to checkbox, so here we use standard checkbox */}}