Cleanup: Make dynamic imports from default exports one-liners.

thet · thet · commit 8d2b8574f5f5 · 2021-04-07T15:37:09.000+02:00
diff --git a/src/core/push_kit.js b/src/core/push_kit.js
@@ -31,9 +31,6 @@
 import "regenerator-runtime/runtime"; // needed for ``await`` support
 import $ from "jquery";
 
-// Lazy loading modules.
-let StompJS;
-
 const push_kit = {
     async init() {
         const push_url = $("meta[name=patterns-push-server-url]").attr("content"); // prettier-ignore
@@ -47,7 +44,7 @@ const push_kit = {
         const push_login = $("meta[name=patterns-push-login]").attr("content"); // prettier-ignore
         const push_pass = $("meta[name=patterns-push-password]").attr("content"); // prettier-ignore
 
-        StompJS = await import("@stomp/stompjs");
+        const StompJS = await import("@stomp/stompjs");
         const client = new StompJS.Client({
             brokerURL: push_url,
             connectHeaders: {
diff --git a/src/pat/calendar/calendar.js b/src/pat/calendar/calendar.js
@@ -101,18 +101,12 @@ export default Base.extend({
     async init($el, opts) {
         const el = this.el;
 
-        let Calendar = await import("@fullcalendar/core");
-        Calendar = Calendar.Calendar;
-        let fcDayGrid = await import("@fullcalendar/daygrid");
-        let fcInteraction = await import("@fullcalendar/interaction");
-        let fcList = await import("@fullcalendar/list");
-        let fcLuxon = await import("@fullcalendar/luxon");
-        let fcTimeGrid = await import("@fullcalendar/timegrid");
-        fcDayGrid = fcDayGrid.default;
-        fcInteraction = fcInteraction.default;
-        fcList = fcList.default;
-        fcLuxon = fcLuxon.default;
-        fcTimeGrid = fcTimeGrid.default;
+        const Calendar = (await import("@fullcalendar/core")).Calendar;
+        const fcDayGrid = (await import("@fullcalendar/daygrid")).default;
+        const fcInteraction = (await import("@fullcalendar/interaction")).default; // prettier-ignore
+        const fcList = (await import("@fullcalendar/list")).default;
+        const fcLuxon = (await import("@fullcalendar/luxon")).default;
+        const fcTimeGrid = (await import("@fullcalendar/timegrid")).default;
 
         // Save some UI elements for reuse.
         this.el_jump_next = el.querySelector(".jump-next");
diff --git a/src/pat/date-picker/date-picker.js b/src/pat/date-picker/date-picker.js
@@ -5,9 +5,6 @@ import Base from "../../core/base";
 import Parser from "../../core/parser";
 import utils from "../../core/utils";
 
-// Lazy loading modules.
-let Pikaday;
-
 export const parser = new Parser("date-picker");
 parser.addArgument("behavior", "styled", ["native", "styled"]);
 parser.addArgument("week-numbers", [], ["show", "hide"]);
@@ -67,8 +64,7 @@ export default Base.extend({
             return;
         }
 
-        Pikaday = await import("pikaday");
-        Pikaday = Pikaday.default;
+        const Pikaday = (await import("pikaday")).default;
         if (window.__patternslib_import_styles) {
             await import("pikaday/scss/pikaday.scss");
         }
diff --git a/src/pat/datetime-picker/datetime-picker.js b/src/pat/datetime-picker/datetime-picker.js
@@ -33,8 +33,7 @@ export default Base.extend({
             return;
         }
 
-        let DatePicker = await import("../date-picker/date-picker");
-        DatePicker = DatePicker.default;
+        const DatePicker = (await import("../date-picker/date-picker")).default;
         if (window.__patternslib_import_styles) {
             await import("./_datetime-picker.scss");
         }
diff --git a/src/pat/depends/depends.js b/src/pat/depends/depends.js
@@ -4,9 +4,6 @@ import utils from "../../core/utils";
 import logging from "../../core/logging";
 import Parser from "../../core/parser";
 
-// Lazy loading modules.
-let DependsHandler;
-
 const log = logging.getLogger("depends");
 
 export const parser = new Parser("depends");
@@ -22,8 +19,7 @@ export default Base.extend({
     jquery_plugin: true,
 
     async init($el, opts) {
-        DependsHandler = await import("../../lib/dependshandler");
-        DependsHandler = DependsHandler.default;
+        const DependsHandler = (await import("../../lib/dependshandler")).default; // prettier-ignore
 
         const dependent = this.$el[0];
         const options = parser.parse(this.$el, opts);
diff --git a/src/pat/display-time/display-time.js b/src/pat/display-time/display-time.js
@@ -23,8 +23,7 @@ export default Base.extend({
     trigger: ".pat-display-time",
 
     async init() {
-        Moment = await import("moment");
-        Moment = Moment.default;
+        Moment = (await import("moment")).default;
 
         this.options = parser.parse(this.$el);
 
diff --git a/src/pat/equaliser/equaliser.js b/src/pat/equaliser/equaliser.js
@@ -9,9 +9,6 @@ import registry from "../../core/registry";
 import Parser from "../../core/parser";
 import utils from "../../core/utils";
 
-// Lazy loading modules.
-let ImagesLoaded;
-
 export const parser = new Parser("equaliser");
 parser.addArgument("transition", "none", ["none", "grow"]);
 parser.addArgument("effect-duration", "fast");
@@ -22,8 +19,7 @@ var equaliser = {
     trigger: ".pat-equaliser, .pat-equalizer",
 
     async init($el, opts) {
-        ImagesLoaded = await import("imagesloaded");
-        ImagesLoaded = ImagesLoaded.default;
+        const ImagesLoaded = (await import("imagesloaded")).default;
 
         return $el.each(function () {
             var $container = $(this),
diff --git a/src/pat/fullscreen/fullscreen-close.js b/src/pat/fullscreen/fullscreen-close.js
@@ -1,15 +1,11 @@
 import "regenerator-runtime/runtime"; // needed for ``await`` support
 import Base from "../../core/base";
 
-// Lazy loading modules.
-let Screenfull;
-
 export default Base.extend({
     name: "fullscreen-close",
     trigger: ".close-fullscreen",
     async init() {
-        Screenfull = await import("screenfull");
-        Screenfull = Screenfull.default;
+        const Screenfull = (await import("screenfull")).default;
 
         this.$el[0].addEventListener("click", function () {
             // no prevent-default nor stop propagation to let
diff --git a/src/pat/fullscreen/fullscreen.js b/src/pat/fullscreen/fullscreen.js
@@ -23,8 +23,7 @@ export default Base.extend({
     trigger: ".pat-fullscreen",
 
     async init($el, opts) {
-        Screenfull = await import("screenfull");
-        Screenfull = Screenfull.default;
+        Screenfull = (await import("screenfull")).default;
 
         this.options = parser.parse(this.$el, opts);
         //const el = this.$el[0];
diff --git a/src/pat/gallery/gallery.js b/src/pat/gallery/gallery.js
@@ -9,11 +9,6 @@ import _ from "underscore";
 import Base from "../../core/base";
 import Parser from "../../core/parser";
 
-// Lazy loading modules.
-let Template;
-let PhotoSwipe;
-let PhotoSwipeUI;
-
 export const parser = new Parser("gallery");
 parser.addArgument("item-selector", "a"); // selector for anchor element, which is added to the gallery.
 parser.addArgument("loop", true);
@@ -27,15 +22,12 @@ export default Base.extend({
     origBodyOverflow: "auto",
 
     async init($el, opts) {
-        PhotoSwipe = await import("photoswipe");
-        PhotoSwipe = PhotoSwipe.default;
-        PhotoSwipeUI = await import("photoswipe/dist/photoswipe-ui-default");
-        PhotoSwipeUI = PhotoSwipeUI.default;
+        const PhotoSwipe = (await import("photoswipe")).default;
+        const PhotoSwipeUI = (await import("photoswipe/dist/photoswipe-ui-default")).default; // prettier-ignore
 
         this.options = parser.parse(this.$el, opts);
         if ($("#photoswipe-template").length === 0) {
-            Template = await import("./template.html");
-            Template = Template.default;
+            const Template = (await import("./template.html")).default;
             $("body").append(_.template(Template)());
         }
 
diff --git a/src/pat/markdown/markdown.js b/src/pat/markdown/markdown.js
@@ -5,9 +5,6 @@ import utils from "../../core/utils";
 import Base from "../../core/base";
 import inject from "../inject/inject";
 
-// Lazy loading modules.
-let Showdown;
-
 var log = logging.getLogger("pat.markdown");
 var is_markdown_resource = /\.md$/;
 
@@ -30,8 +27,7 @@ var Markdown = Base.extend({
     },
 
     async render(text) {
-        Showdown = await import("showdown");
-        Showdown = Showdown.default;
+        const Showdown = (await import("showdown")).default;
 
         // Add support for syntax highlighting via pat-syntax-highlight
         Showdown.extensions.prettify = function () {
diff --git a/src/pat/masonry/masonry.js b/src/pat/masonry/masonry.js
@@ -10,7 +10,6 @@ import Base from "../../core/base";
 import utils from "../../core/utils";
 
 // Lazy loading modules.
-let ImagesLoaded;
 let Masonry;
 
 const log = logging.getLogger("pat.masonry");
@@ -44,10 +43,8 @@ export default Base.extend({
     trigger: ".pat-masonry",
 
     async init($el, opts) {
-        Masonry = await import("masonry-layout");
-        Masonry = Masonry.default;
-        ImagesLoaded = await import("imagesloaded");
-        ImagesLoaded = ImagesLoaded.default;
+        Masonry = (await import("masonry-layout")).default;
+        const ImagesLoaded = (await import("imagesloaded")).default;
 
         this.options = parser.parse(this.$el, opts);
         // Initialize
diff --git a/src/pat/scroll/scroll.js b/src/pat/scroll/scroll.js
@@ -6,9 +6,6 @@ import Base from "../../core/base";
 import Parser from "../../core/parser";
 import utils from "../../core/utils";
 
-// Lazy loading modules.
-let ImagesLoaded;
-
 export const parser = new Parser("scroll");
 parser.addArgument("trigger", "click", ["click", "auto"]);
 parser.addArgument("direction", "top", ["top", "left"]);
@@ -23,10 +20,9 @@ export default Base.extend({
     async init($el, opts) {
         this.options = parser.parse(this.$el, opts);
         if (this.options.trigger == "auto") {
-            ImagesLoaded = await import("imagesloaded");
-            ImagesLoaded = ImagesLoaded.default;
+            const ImagesLoaded = (await import("imagesloaded")).default;
             // Only calculate the offset when all images are loaded
-            ImagesLoaded($("body"), () => this.smoothScroll());
+            ImagesLoaded(document.body, () => this.smoothScroll());
         }
         this.el.addEventListener("click", this.onClick.bind(this));
         this.$el.on("pat-update", this.onPatternsUpdate.bind(this));
diff --git a/src/pat/sticky/sticky.js b/src/pat/sticky/sticky.js
@@ -15,8 +15,7 @@ export default Base.extend({
     name: "sticky",
     trigger: ".pat-sticky",
     async init() {
-        Stickyfill = await import("stickyfilljs");
-        Stickyfill = Stickyfill.default;
+        Stickyfill = (await import("stickyfilljs")).default;
         this.options = parser.parse(this.$el);
         this.makeSticky();
         $("body").on(
diff --git a/src/pat/syntax-highlight/syntax-highlight.js b/src/pat/syntax-highlight/syntax-highlight.js
@@ -2,17 +2,12 @@ import "regenerator-runtime/runtime"; // needed for ``await`` support
 import Base from "../../core/base";
 import utils from "../../core/utils";
 
-// Lazy loading modules.
-let Prettify;
-
 export default Base.extend({
     name: "syntax-highlight",
     trigger: ".pat-syntax-highlight",
 
     async init() {
-        Prettify = await import("google-code-prettify/src/prettify");
-        Prettify = Prettify.default;
-
+        const Prettify = (await import("google-code-prettify/src/prettify")).default; // prettier-ignore
         this.$el.addClass("prettyprint");
         utils.debounce(Prettify.prettyPrint, 50)();
     },
diff --git a/src/pat/tooltip/tooltip.js b/src/pat/tooltip/tooltip.js
@@ -6,9 +6,6 @@ import Parser from "../../core/parser";
 import registry from "../../core/registry";
 import utils from "../../core/utils";
 
-// Lazy loading modules.
-let Tippy;
-
 const log = logging.getLogger("pat-tooltip");
 
 export const parser = new Parser("tooltip");
@@ -54,8 +51,7 @@ export default Base.extend({
     async init($el, opts) {
         const el = this.el;
 
-        Tippy = await import("tippy.js");
-        Tippy = Tippy.default;
+        const Tippy = (await import("tippy.js")).default;
 
         if (window.__patternslib_import_styles) {
             await import("tippy.js/dist/tippy.css");
diff --git a/src/pat/validation/validation.js b/src/pat/validation/validation.js
@@ -53,10 +53,8 @@ export default Base.extend({
     trigger: "form.pat-validation",
 
     async init($el, opts) {
-        Validate = await import("validate.js");
-        Validate = Validate.default;
-        Moment = await import("moment");
-        Moment = Moment.default;
+        Validate = (await import("validate.js")).default;
+        Moment = (await import("moment")).default;
 
         this.extend_validate();
 

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ export default Base.extend({`
`33`	`33`	`return;`
`34`	`34`	`}`
`35`	`35`
`36`		`- let DatePicker = await import("../date-picker/date-picker");`
`37`		`- DatePicker = DatePicker.default;`
	`36`	`+ const DatePicker = (await import("../date-picker/date-picker")).default;`
`38`	`37`	`if (window.__patternslib_import_styles) {`
`39`	`38`	`await import("./_datetime-picker.scss");`
`40`	`39`	`}`