Bump htmx to 2.0.0 (#31413)

Tested Subscribe, Follow, Star, Watch, and System Status.

---------

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
Yarden Shoham 2024-06-20 23:04:09 +03:00 committed by GitHub
parent c60ef946b1
commit a5a9885f72
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 13 additions and 14 deletions

View File

@ -33,6 +33,7 @@ overrides:
- files: ["web_src/**/*"] - files: ["web_src/**/*"]
globals: globals:
__webpack_public_path__: true __webpack_public_path__: true
htmx: true
process: false # https://github.com/webpack/webpack/issues/15833 process: false # https://github.com/webpack/webpack/issues/15833
- files: ["web_src/**/*", "docs/**/*"] - files: ["web_src/**/*", "docs/**/*"]
env: env:

8
package-lock.json generated
View File

@ -29,7 +29,7 @@
"esbuild-loader": "4.2.0", "esbuild-loader": "4.2.0",
"escape-goat": "4.0.0", "escape-goat": "4.0.0",
"fast-glob": "3.3.2", "fast-glob": "3.3.2",
"htmx.org": "1.9.12", "htmx.org": "2.0.0",
"idiomorph": "0.3.0", "idiomorph": "0.3.0",
"jquery": "3.7.1", "jquery": "3.7.1",
"katex": "0.16.10", "katex": "0.16.10",
@ -6891,9 +6891,9 @@
} }
}, },
"node_modules/htmx.org": { "node_modules/htmx.org": {
"version": "1.9.12", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.9.12.tgz", "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-2.0.0.tgz",
"integrity": "sha512-VZAohXyF7xPGS52IM8d1T1283y+X4D+Owf3qY1NZ9RuBypyu9l8cGsxUMAG5fEAb/DhT7rDoJ9Hpu5/HxFD3cw==" "integrity": "sha512-N0r1VjrqeCpig0mTi2/sooDZBeQlp1RBohnWQ/ufqc7ICaI0yjs04fNGhawm6+/HWhJFlcXn8MqOjWI9QGG2lQ=="
}, },
"node_modules/human-signals": { "node_modules/human-signals": {
"version": "5.0.0", "version": "5.0.0",

View File

@ -28,7 +28,7 @@
"esbuild-loader": "4.2.0", "esbuild-loader": "4.2.0",
"escape-goat": "4.0.0", "escape-goat": "4.0.0",
"fast-glob": "3.3.2", "fast-glob": "3.3.2",
"htmx.org": "1.9.12", "htmx.org": "2.0.0",
"idiomorph": "0.3.0", "idiomorph": "0.3.0",
"jquery": "3.7.1", "jquery": "3.7.1",
"katex": "0.16.10", "katex": "0.16.10",

View File

@ -11,7 +11,6 @@ import {showTemporaryTooltip} from '../modules/tippy.js';
import {confirmModal} from './comp/ConfirmModal.js'; import {confirmModal} from './comp/ConfirmModal.js';
import {showErrorToast} from '../modules/toast.js'; import {showErrorToast} from '../modules/toast.js';
import {request, POST, GET} from '../modules/fetch.js'; import {request, POST, GET} from '../modules/fetch.js';
import '../htmx.js';
const {appUrl, appSubUrl, csrfToken, i18n} = window.config; const {appUrl, appSubUrl, csrfToken, i18n} = window.config;

5
web_src/js/globals.js Normal file
View File

@ -0,0 +1,5 @@
import jquery from 'jquery';
import htmx from 'htmx.org/dist/htmx.esm.js';
window.$ = window.jQuery = jquery;
window.htmx = htmx;

View File

@ -1,4 +1,3 @@
import * as htmx from 'htmx.org';
import {showErrorToast} from './modules/toast.js'; import {showErrorToast} from './modules/toast.js';
// https://github.com/bigskysoftware/idiomorph#htmx // https://github.com/bigskysoftware/idiomorph#htmx

View File

@ -1,5 +1,6 @@
// bootstrap module must be the first one to be imported, it handles webpack lazy-loading and global errors // bootstrap module must be the first one to be imported, it handles webpack lazy-loading and global errors
import './bootstrap.js'; import './bootstrap.js';
import './htmx.js';
import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue'; import {initRepoActivityTopAuthorsChart} from './components/RepoActivityTopAuthors.vue';
import {initScopedAccessTokenCategories} from './components/ScopedAccessTokenSelector.vue'; import {initScopedAccessTokenCategories} from './components/ScopedAccessTokenSelector.vue';

View File

@ -1,3 +0,0 @@
import $ from 'jquery';
window.$ = window.jQuery = $; // eslint-disable-line no-jquery/variable-pattern

View File

@ -76,7 +76,7 @@ export default {
mode: isProduction ? 'production' : 'development', mode: isProduction ? 'production' : 'development',
entry: { entry: {
index: [ index: [
fileURLToPath(new URL('web_src/js/jquery.js', import.meta.url)), fileURLToPath(new URL('web_src/js/globals.js', import.meta.url)),
fileURLToPath(new URL('web_src/fomantic/build/semantic.js', import.meta.url)), fileURLToPath(new URL('web_src/fomantic/build/semantic.js', import.meta.url)),
fileURLToPath(new URL('web_src/js/index.js', import.meta.url)), fileURLToPath(new URL('web_src/js/index.js', import.meta.url)),
fileURLToPath(new URL('node_modules/easymde/dist/easymde.min.css', import.meta.url)), fileURLToPath(new URL('node_modules/easymde/dist/easymde.min.css', import.meta.url)),
@ -195,9 +195,6 @@ export default {
], ],
}, },
plugins: [ plugins: [
new webpack.ProvidePlugin({ // for htmx extensions
htmx: 'htmx.org',
}),
new DefinePlugin({ new DefinePlugin({
__VUE_OPTIONS_API__: true, // at the moment, many Vue components still use the Vue Options API __VUE_OPTIONS_API__: true, // at the moment, many Vue components still use the Vue Options API
__VUE_PROD_DEVTOOLS__: false, // do not enable devtools support in production __VUE_PROD_DEVTOOLS__: false, // do not enable devtools support in production