Node.js based forum software built for the modern web
fix: load zxcvbn lazily so password forms keep working when the chunk fails to load (#14791)
palmoni51478c95f7347
diff --git a/public/src/client/account/edit/password.js b/public/src/client/account/edit/password.jsindex 78612a282e..9d7d5be62d 100644--- a/public/src/client/account/edit/password.js+++ b/public/src/client/account/edit/password.js@@ -1,12 +1,16 @@'use strict';define('forum/account/edit/password', [- 'forum/account/header', 'translator', 'zxcvbn', 'api', 'alerts',-], function (header, translator, zxcvbn, api, alerts) {+ 'forum/account/header', 'translator', 'api', 'alerts',+], function (header, translator, api, alerts) {const AccountEditPassword = {};+ let zxcvbn = null;AccountEditPassword.init = function () {header.init();+ import('zxcvbn').then((module) => {+ zxcvbn = module.default || module;+ }).catch(() => {});handlePasswordChange();};diff --git a/public/src/client/register.js b/public/src/client/register.jsindex 550e6ab003..2bdf36fe1d 100644--- a/public/src/client/register.js+++ b/public/src/client/register.js@@ -2,13 +2,17 @@define('forum/register', [- 'translator', 'slugify', 'api', 'modals', 'forum/login', 'zxcvbn', 'jquery-form',-], function (translator, slugify, api, modals, Login, zxcvbn) {+ 'translator', 'slugify', 'api', 'modals', 'forum/login', 'jquery-form',+], function (translator, slugify, api, modals, Login) {const Register = {};let validationError = false;const successIcon = '';+ let zxcvbn = null;Register.init = function () {+ import('zxcvbn').then((module) => {+ zxcvbn = module.default || module;+ }).catch(() => {});const username = $('#username');const password = $('#password');const password_confirm = $('#password-confirm');diff --git a/public/src/client/reset_code.js b/public/src/client/reset_code.jsindex 4a4cdc63ca..4f057fa926 100644--- a/public/src/client/reset_code.js+++ b/public/src/client/reset_code.js@@ -1,11 +1,15 @@'use strict';-define('forum/reset_code', ['alerts', 'zxcvbn'], function (alerts, zxcvbn) {+define('forum/reset_code', ['alerts'], function (alerts) {const ResetCode = {};+ let zxcvbn = null;ResetCode.init = function () {const reset_code = ajaxify.data.code;+ import('zxcvbn').then((module) => {+ zxcvbn = module.default || module;+ }).catch(() => {});const resetEl = $('#reset');const password = $('#password');diff --git a/public/src/utils.js b/public/src/utils.jsindex cd5b7689d0..dc06fb2ea7 100644--- a/public/src/utils.js+++ b/public/src/utils.js@@ -68,6 +68,9 @@ utils.assertPasswordValidity = (password, zxcvbn) => {throw new Error('[[error:password-too-long]]');}+ if (typeof zxcvbn !== 'function') {+ return;+ }const passwordStrength = zxcvbn(password);if (passwordStrength.score < ajaxify.data.minimumPasswordStrength) {throw new Error('[[user:weak-password]]');