From d60cb6c6e57e93de9ca90fbf3590bbe5d6bd6ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 17 Feb 2022 16:35:42 -0500 Subject: [PATCH] refactor: add aliases --- Gruntfile.js | 2 ++ public/src/admin/advanced/errors.js | 2 +- public/src/admin/dashboard.js | 2 +- public/src/admin/extend/plugins.js | 2 +- public/src/admin/extend/widgets.js | 8 ++++---- public/src/admin/manage/categories.js | 2 +- public/src/admin/manage/category-analytics.js | 2 +- public/src/admin/modules/dashboard-line-graph.js | 2 +- public/src/admin/modules/selectable.js | 2 +- public/src/admin/settings/navigation.js | 6 +++--- public/src/app.js | 10 +++++----- public/src/client/flags/list.js | 2 +- public/src/client/ip-blacklist.js | 2 +- public/src/modules/pictureCropper.js | 7 ++++--- public/src/modules/settings/sorted-list.js | 2 +- public/src/modules/topicThumbs.js | 2 +- webpack.common.js | 3 +++ 17 files changed, 32 insertions(+), 26 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 10b52367ae..f3b15bc4b8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -91,6 +91,8 @@ module.exports = function (grunt) { }, clientUpdated: { files: [ + // 'public/src/modules/**/*.js', + // 'public/vendor/**/*.js', ...clientUpdated, 'node_modules/benchpressjs/build/benchpress.js', ], diff --git a/public/src/admin/advanced/errors.js b/public/src/admin/advanced/errors.js index 9f904e2e14..b64f110b2a 100644 --- a/public/src/admin/advanced/errors.js +++ b/public/src/admin/advanced/errors.js @@ -1,7 +1,7 @@ 'use strict'; -define('admin/advanced/errors', ['bootbox', 'alerts', 'chart.js'], function (bootbox, alerts, Chart) { +define('admin/advanced/errors', ['bootbox', 'alerts', 'Chart'], function (bootbox, alerts, Chart) { const Errors = {}; Errors.init = function () { diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index 026aba91e6..dc20cb9c41 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -2,7 +2,7 @@ define('admin/dashboard', [ - 'chart.js', 'translator', 'benchpress', 'bootbox', 'alerts', + 'Chart', 'translator', 'benchpress', 'bootbox', 'alerts', ], function (Chart, translator, Benchpress, bootbox, alerts) { const Admin = {}; const intervals = { diff --git a/public/src/admin/extend/plugins.js b/public/src/admin/extend/plugins.js index cd91dc0fb3..142323c870 100644 --- a/public/src/admin/extend/plugins.js +++ b/public/src/admin/extend/plugins.js @@ -6,7 +6,7 @@ define('admin/extend/plugins', [ 'benchpress', 'bootbox', 'alerts', - 'jquery-ui/ui/widgets/sortable', + 'jquery-ui/widgets/sortable', ], function (translator, Benchpress, bootbox, alerts) { const Plugins = {}; Plugins.init = function () { diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 76d73d4d95..029bdc4a85 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -4,10 +4,10 @@ define('admin/extend/widgets', [ 'bootbox', 'alerts', - 'jquery-ui/ui/widgets/sortable', - 'jquery-ui/ui/widgets/draggable', - 'jquery-ui/ui/widgets/droppable', - 'jquery-ui/ui/widgets/datepicker', + 'jquery-ui/widgets/sortable', + 'jquery-ui/widgets/draggable', + 'jquery-ui/widgets/droppable', + 'jquery-ui/widgets/datepicker', ], function (bootbox, alerts) { const Widgets = {}; diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index d678a89edd..3125f796bb 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -5,7 +5,7 @@ define('admin/manage/categories', [ 'benchpress', 'categorySelector', 'api', - 'sortablejs', + 'Sortable', 'bootbox', 'alerts', ], function (translator, Benchpress, categorySelector, api, Sortable, bootbox, alerts) { diff --git a/public/src/admin/manage/category-analytics.js b/public/src/admin/manage/category-analytics.js index 1768feabee..a4366d07d1 100644 --- a/public/src/admin/manage/category-analytics.js +++ b/public/src/admin/manage/category-analytics.js @@ -1,7 +1,7 @@ 'use strict'; -define('admin/manage/category-analytics', ['chart.js'], function (Chart) { +define('admin/manage/category-analytics', ['Chart'], function (Chart) { const CategoryAnalytics = {}; CategoryAnalytics.init = function () { diff --git a/public/src/admin/modules/dashboard-line-graph.js b/public/src/admin/modules/dashboard-line-graph.js index dcfa1db80a..1e11b82e5b 100644 --- a/public/src/admin/modules/dashboard-line-graph.js +++ b/public/src/admin/modules/dashboard-line-graph.js @@ -1,6 +1,6 @@ 'use strict'; -define('admin/modules/dashboard-line-graph', ['chart.js', 'translator', 'benchpress', 'api', 'hooks', 'bootbox'], function (Chart, translator, Benchpress, api, hooks, bootbox) { +define('admin/modules/dashboard-line-graph', ['Chart', 'translator', 'benchpress', 'api', 'hooks', 'bootbox'], function (Chart, translator, Benchpress, api, hooks, bootbox) { const Graph = { _current: null, }; diff --git a/public/src/admin/modules/selectable.js b/public/src/admin/modules/selectable.js index 22dee352bc..470462d558 100644 --- a/public/src/admin/modules/selectable.js +++ b/public/src/admin/modules/selectable.js @@ -2,7 +2,7 @@ define('admin/modules/selectable', [ - 'jquery-ui/ui/widgets/selectable', + 'jquery-ui/widgets/selectable', ], function () { const selectable = {}; diff --git a/public/src/admin/settings/navigation.js b/public/src/admin/settings/navigation.js index aca3d530a8..bcd2bccc0d 100644 --- a/public/src/admin/settings/navigation.js +++ b/public/src/admin/settings/navigation.js @@ -6,9 +6,9 @@ define('admin/settings/navigation', [ 'iconSelect', 'benchpress', 'alerts', - 'jquery-ui/ui/widgets/draggable', - 'jquery-ui/ui/widgets/droppable', - 'jquery-ui/ui/widgets/sortable', + 'jquery-ui/widgets/draggable', + 'jquery-ui/widgets/droppable', + 'jquery-ui/widgets/sortable', ], function (translator, iconSelect, Benchpress, alerts) { const navigation = {}; let available; diff --git a/public/src/app.js b/public/src/app.js index 8789d3927d..912940c4f9 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -352,11 +352,11 @@ app.flags = {}; return callback(); } require([ - 'jquery-ui/ui/widgets/datepicker', - 'jquery-ui/ui/widgets/autocomplete', - 'jquery-ui/ui/widgets/sortable', - 'jquery-ui/ui/widgets/resizable', - 'jquery-ui/ui/widgets/draggable', + 'jquery-ui/widgets/datepicker', + 'jquery-ui/widgets/autocomplete', + 'jquery-ui/widgets/sortable', + 'jquery-ui/widgets/resizable', + 'jquery-ui/widgets/draggable', ], function () { callback(); }); diff --git a/public/src/client/flags/list.js b/public/src/client/flags/list.js index 5633a8df0f..f2e15cedab 100644 --- a/public/src/client/flags/list.js +++ b/public/src/client/flags/list.js @@ -1,7 +1,7 @@ 'use strict'; define('forum/flags/list', [ - 'components', 'chart.js', 'categoryFilter', 'autocomplete', 'api', 'alerts', + 'components', 'Chart', 'categoryFilter', 'autocomplete', 'api', 'alerts', ], function (components, Chart, categoryFilter, autocomplete, api, alerts) { const Flags = {}; diff --git a/public/src/client/ip-blacklist.js b/public/src/client/ip-blacklist.js index 6eb95fed74..5fccd07a32 100644 --- a/public/src/client/ip-blacklist.js +++ b/public/src/client/ip-blacklist.js @@ -1,7 +1,7 @@ 'use strict'; -define('forum/ip-blacklist', ['chart.js', 'benchpress', 'bootbox', 'alerts'], function (Chart, Benchpress, bootbox, alerts) { +define('forum/ip-blacklist', ['Chart', 'benchpress', 'bootbox', 'alerts'], function (Chart, Benchpress, bootbox, alerts) { const Blacklist = {}; Blacklist.init = function () { diff --git a/public/src/modules/pictureCropper.js b/public/src/modules/pictureCropper.js index 1d55d38bf5..cb1201ba29 100644 --- a/public/src/modules/pictureCropper.js +++ b/public/src/modules/pictureCropper.js @@ -45,7 +45,7 @@ define('pictureCropper', ['alerts'], function (alerts) { const cropBoxHeight = parseInt($(window).height() / 2, 10); const img = document.getElementById('cropped-image'); $(img).css('max-height', cropBoxHeight); - const Cropper = await import(/* webpackChunkName: "cropperjs" */ 'cropperjs'); + const Cropper = (await import(/* webpackChunkName: "cropperjs" */ 'cropperjs')).default; let cropperTool = new Cropper(img, { aspectRatio: data.aspectRatio, @@ -127,10 +127,11 @@ define('pictureCropper', ['alerts'], function (alerts) { }); }); - cropperModal.find('.upload-btn').on('click', function () { + + cropperModal.find('.upload-btn').on('click', async function () { $(this).addClass('disabled'); cropperTool.destroy(); - + const Cropper = (await import(/* webpackChunkName: "cropperjs" */ 'cropperjs')).default; cropperTool = new Cropper(img, { viewMode: 1, autoCropArea: 1, diff --git a/public/src/modules/settings/sorted-list.js b/public/src/modules/settings/sorted-list.js index fa3d4e4c81..dba5da9bc0 100644 --- a/public/src/modules/settings/sorted-list.js +++ b/public/src/modules/settings/sorted-list.js @@ -4,7 +4,7 @@ define('settings/sorted-list', [ 'benchpress', 'bootbox', 'hooks', - 'jquery-ui/ui/widgets/sortable', + 'jquery-ui/widgets/sortable', ], function (benchpress, bootbox, hooks) { let Settings; diff --git a/public/src/modules/topicThumbs.js b/public/src/modules/topicThumbs.js index 55b84ec92a..904a366d52 100644 --- a/public/src/modules/topicThumbs.js +++ b/public/src/modules/topicThumbs.js @@ -1,7 +1,7 @@ 'use strict'; define('topicThumbs', [ - 'api', 'bootbox', 'alerts', 'uploader', 'benchpress', 'translator', 'jquery-ui/ui/widgets/sortable', + 'api', 'bootbox', 'alerts', 'uploader', 'benchpress', 'translator', 'jquery-ui/widgets/sortable', ], function (api, bootbox, alerts, uploader, Benchpress, translator) { const Thumbs = {}; diff --git a/webpack.common.js b/webpack.common.js index d8de1e75d0..1acc79df9e 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -51,6 +51,9 @@ module.exports = { admin: path.resolve(__dirname, 'public/src/admin'), vendor: path.resolve(__dirname, 'public/vendor'), benchpress: path.resolve(__dirname, 'node_modules/benchpressjs'), + Chart: path.resolve(__dirname, 'node_modules/chart.js'), + Sortable: path.resolve(__dirname, 'node_modules/sortablejs'), + 'jquery-ui/widgets': path.resolve(__dirname, 'node_modules/jquery-ui/ui/widgets'), }, }, };