From babd293210ba3ac9808285ec43dfa673d53f12f6 Mon Sep 17 00:00:00 2001 From: Yufei Huang Date: Tue, 20 Jun 2023 10:48:43 +0800 Subject: [PATCH] fix: wrong jquery in default template --- templates/default/src/docfx.vendor.js | 4 ++-- templates/package-lock.json | 25 +++++++------------------ templates/package.json | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/templates/default/src/docfx.vendor.js b/templates/default/src/docfx.vendor.js index 5a39cb38042..a89312c58cd 100644 --- a/templates/default/src/docfx.vendor.js +++ b/templates/default/src/docfx.vendor.js @@ -4,11 +4,11 @@ require('@default/bootstrap/dist/css/bootstrap.css') require('@default/highlight.js/styles/github.css') -window.$ = window.jQuery = require('@default/jquery') +window.$ = window.jQuery = require('jquery') require('@default/bootstrap') require('@default/twbs-pagination') -require('@default/mark.js/src/jquery.js') +require('@default/mark.js/src/jquery') const AnchorJS = require('@default/anchor-js') window.anchors = new AnchorJS() diff --git a/templates/package-lock.json b/templates/package-lock.json index 25272976ca4..77d58d7ef59 100644 --- a/templates/package-lock.json +++ b/templates/package-lock.json @@ -12,7 +12,6 @@ "@default/anchor-js": "npm:anchor-js@5.0.0", "@default/bootstrap": "npm:bootstrap@3.4.1", "@default/highlight.js": "npm:highlight.js@11.7.0", - "@default/jquery": "npm:jquery@3.6.3", "@default/lunr": "npm:lunr@2.3.9", "@default/mark.js": "npm:mark.js@8.11.1", "@default/twbs-pagination": "josecebe/twbs-pagination#1.3.1", @@ -22,6 +21,7 @@ "bootstrap": "^5.3.0", "bootstrap-icons": "^1.10.5", "highlight.js": "^11.8.0", + "jquery": "3.6.3", "lit-html": "^2.7.4", "lunr": "2.3.9", "mathjax": "^3.2.2", @@ -824,12 +824,6 @@ "node": ">=12.0.0" } }, - "node_modules/@default/jquery": { - "name": "jquery", - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", - "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" - }, "node_modules/@default/lunr": { "name": "lunr", "version": "2.3.9", @@ -6616,9 +6610,9 @@ } }, "node_modules/jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "node_modules/js-tokens": { "version": "4.0.0", @@ -10780,11 +10774,6 @@ "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-11.7.0.tgz", "integrity": "sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ==" }, - "@default/jquery": { - "version": "npm:jquery@3.6.3", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", - "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" - }, "@default/lunr": { "version": "npm:lunr@2.3.9", "resolved": "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz", @@ -14991,9 +14980,9 @@ } }, "jquery": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.4.tgz", - "integrity": "sha512-v28EW9DWDFpzcD9O5iyJXg3R3+q+mET5JhnjJzQUZMHOv67bpSIHq81GEYpPNZHG+XXHsfSme3nxp/hndKEcsQ==" + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.3.tgz", + "integrity": "sha512-bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg==" }, "js-tokens": { "version": "4.0.0", diff --git a/templates/package.json b/templates/package.json index f523fcc5e89..f8c71f0dcf9 100644 --- a/templates/package.json +++ b/templates/package.json @@ -21,7 +21,6 @@ "@default/anchor-js": "npm:anchor-js@5.0.0", "@default/bootstrap": "npm:bootstrap@3.4.1", "@default/highlight.js": "npm:highlight.js@11.7.0", - "@default/jquery": "npm:jquery@3.6.3", "@default/lunr": "npm:lunr@2.3.9", "@default/mark.js": "npm:mark.js@8.11.1", "@default/twbs-pagination": "josecebe/twbs-pagination#1.3.1", @@ -31,6 +30,7 @@ "bootstrap": "^5.3.0", "bootstrap-icons": "^1.10.5", "highlight.js": "^11.8.0", + "jquery": "3.6.3", "lit-html": "^2.7.4", "lunr": "2.3.9", "mathjax": "^3.2.2",