Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@
#
# SPDX-License-Identifier: AGPL-3.0-or-later

exclude: |
(?x)(
^(
\.vscode/launch\.json
|manage\.py
|opal/static/thirdparty/.*/.*
)
)

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v6.0.0
Expand All @@ -19,13 +10,19 @@ repos:
- id: check-merge-conflict
- id: check-shebang-scripts-are-executable
- id: check-json
exclude:
glob:
- .vscode/launch.json
- id: check-toml
- id: check-yaml
args: ['--unsafe']
- id: name-tests-test
args: ['--django']
- id: double-quote-string-fixer
- id: end-of-file-fixer
exclude:
glob:
- opal/static/thirdparty/**/*
- id: trailing-whitespace

- repo: https://github.com/abravalheri/validate-pyproject
Expand Down Expand Up @@ -77,6 +74,9 @@ repos:
rev: v1.45.1
hooks:
- id: typos
exclude:
glob:
- opal/static/thirdparty/**/*

# use local virtual env for flake8 and mypy to reuse the same configuration (and dependencies)
- repo: local
Expand Down
2 changes: 2 additions & 0 deletions REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@ SPDX-License-Identifier = "MIT"
path = [
"opal/static/thirdparty/unpoly/css/unpoly-bootstrap5.min.css",
"opal/static/thirdparty/unpoly/css/unpoly.min.css",
"opal/static/thirdparty/unpoly/css/unpoly.min.css.map",
"opal/static/thirdparty/unpoly/js/unpoly-bootstrap5.min.js",
"opal/static/thirdparty/unpoly/js/unpoly.min.js",
"opal/static/thirdparty/unpoly/js/unpoly.min.js.map",
]
precedence = "override"
SPDX-FileCopyrightText = "Copyright (c) 2014-2021 Henning Koch"
Expand Down
3 changes: 3 additions & 0 deletions opal/static/js/global.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
See: https://getbootstrap.com/docs/5.3/components/tooltips/#enable-tooltips
*/

// https://unpoly.com/script-security
up.script.config.scriptElementPolicy = 'block'

up.compiler('[data-bs-toggle="tooltip"]', (element) => {
let tooltip = new bootstrap.Tooltip(element)

Expand Down
2 changes: 2 additions & 0 deletions opal/static/thirdparty/copy_distribution_files.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ dependencies.set('@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2', 'f
dependencies.set('@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2', 'fontawesomefree/webfonts/fa-regular-400.woff2')
// Unpoly
dependencies.set('unpoly/unpoly.min.css', 'unpoly/css/unpoly.min.css')
dependencies.set('unpoly/unpoly.min.css.map', 'unpoly/css/unpoly.min.css.map')
dependencies.set('unpoly/unpoly-bootstrap5.min.css', 'unpoly/css/unpoly-bootstrap5.min.css')
dependencies.set('unpoly/unpoly.min.js', 'unpoly/js/unpoly.min.js')
dependencies.set('unpoly/unpoly.min.js.map', 'unpoly/js/unpoly.min.js.map')
dependencies.set('unpoly/unpoly-bootstrap5.min.js', 'unpoly/js/unpoly-bootstrap5.min.js')

const modules_directory = path.join(process.cwd(), 'node_modules')
Expand Down
8 changes: 4 additions & 4 deletions opal/static/thirdparty/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion opal/static/thirdparty/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "7.2.0",
"bootstrap": "5.3.8",
"unpoly": "3.12.1"
"unpoly": "3.14.2"
},
"scripts": {
"postinstall": "node copy_distribution_files.js"
Expand Down
4 changes: 2 additions & 2 deletions opal/static/thirdparty/unpoly/css/unpoly-bootstrap5.min.css
Git LFS file not shown
4 changes: 2 additions & 2 deletions opal/static/thirdparty/unpoly/css/unpoly.min.css
Git LFS file not shown
3 changes: 3 additions & 0 deletions opal/static/thirdparty/unpoly/css/unpoly.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions opal/static/thirdparty/unpoly/js/unpoly-bootstrap5.min.js
Git LFS file not shown
4 changes: 2 additions & 2 deletions opal/static/thirdparty/unpoly/js/unpoly.min.js
Git LFS file not shown
3 changes: 3 additions & 0 deletions opal/static/thirdparty/unpoly/js/unpoly.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.