Skip to content

Commit b1cd3b8

Browse files
committed
chore: move daterangepicker and moment to be managed in client/
This commit includes: - Removed the libs from the old scripts/yarn workflow - Removed js.cookie.js.license file. - Removed the old scripts of moment and daterangepicker from base.html - And they are now included automatically by main.js Related: WeblateOrg#12172
1 parent 9137fca commit b1cd3b8

14 files changed

+24
-7304
lines changed

client/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
"dependencies": {
1010
"@sentry/browser": "8.37.1",
1111
"@tarekraafat/autocomplete.js": "10.2.9",
12-
"autosize": "^6.0.1",
12+
"autosize": "6.0.1",
13+
"daterangepicker": "3.1.0",
1314
"jquery": "3.7.1",
15+
"moment": "2.30.1",
1416
"tributejs": "5.1.3"
1517
},
1618
"devDependencies": {

client/src/main.js

+4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,12 @@
1111
*/
1212

1313
// Imports
14+
import datarangepicker from "daterangepicker";
1415
import jQuery from "jquery";
16+
import moment from "moment";
1517

1618
// Definitions in global scope
1719
window.$ = jQuery;
1820
window.jQuery = jQuery;
21+
window.moment = moment;
22+
window.daterangepicker = datarangepicker;

client/yarn.lock

+14-1
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,14 @@ cross-spawn@^7.0.3:
390390
shebang-command "^2.0.0"
391391
which "^2.0.1"
392392

393+
daterangepicker@^3.1.0:
394+
version "3.1.0"
395+
resolved "https://registry.yarnpkg.com/daterangepicker/-/daterangepicker-3.1.0.tgz#718d606614331df3e774c9aba82ccd8838d45da1"
396+
integrity sha512-DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw==
397+
dependencies:
398+
jquery ">=1.10"
399+
moment "^2.9.0"
400+
393401
electron-to-chromium@^1.5.41:
394402
version "1.5.51"
395403
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.51.tgz#bb99216fed4892d131a8585a8593b00739310163"
@@ -556,7 +564,7 @@ jest-worker@^27.4.5:
556564
merge-stream "^2.0.0"
557565
supports-color "^8.0.0"
558566

559-
jquery@3.7.1:
567+
jquery@3.7.1, jquery@>=1.10:
560568
version "3.7.1"
561569
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
562570
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
@@ -610,6 +618,11 @@ mime-types@^2.1.27:
610618
dependencies:
611619
mime-db "1.52.0"
612620

621+
moment@^2.30.1, moment@^2.9.0:
622+
version "2.30.1"
623+
resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
624+
integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
625+
613626
needle@^3.2.0:
614627
version "3.3.1"
615628
resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049"

scripts/yarn-update

-5
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,6 @@ cp node_modules/multi.js/src/multi.css ../../weblate/static/vendor/
3131
# Slugify
3232
cp node_modules/slugify/slugify.js ../../weblate/static/vendor/slugify.js
3333

34-
# Date Range Picker
35-
cp node_modules/daterangepicker/daterangepicker.js ../../weblate/static/vendor/
36-
# Skip the copying of the default CSS file to avoid the Weblate style customization being overwritten
37-
# cp node_modules/daterangepicker/daterangepicker.css ../../weblate/static/vendor/
38-
3934
# Moment.js
4035
cp node_modules/moment/moment.js ../../weblate/static/vendor/
4136

scripts/yarn/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"main": "index.js",
55
"license": "GPL-3.0+",
66
"dependencies": {
7-
"daterangepicker": "^3.1.0",
87
"mousetrap": "1.6.5",
98
"mousetrap-global-bind": "1.1.0",
109
"multi.js": "0.5.3",

scripts/yarn/yarn.lock

-18
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@
22
# yarn lockfile v1
33

44

5-
daterangepicker@^3.1.0:
6-
version "3.1.0"
7-
resolved "https://registry.yarnpkg.com/daterangepicker/-/daterangepicker-3.1.0.tgz#718d606614331df3e774c9aba82ccd8838d45da1"
8-
integrity sha512-DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw==
9-
dependencies:
10-
jquery ">=1.10"
11-
moment "^2.9.0"
12-
13-
jquery@>=1.10:
14-
version "3.7.1"
15-
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de"
16-
integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==
17-
18-
moment@^2.9.0:
19-
version "2.30.1"
20-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
21-
integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
22-
235
mousetrap-global-bind@1.1.0:
246
version "1.1.0"
257
resolved "https://registry.yarnpkg.com/mousetrap-global-bind/-/mousetrap-global-bind-1.1.0.tgz#cd7de9222bd0646fa2e010d54c84a74c26a88edd"

weblate/static/js/vendor/main.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Copyright (c) JS Foundation and other contributors
2+
Copyright Dan Grossman <dan@dangrossman.info> (http://www.dangrossman.info)
13
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
24

35
SPDX-License-Identifier: MIT

0 commit comments

Comments
 (0)