diff --git a/frontend_tests/node_tests/compose.js b/frontend_tests/node_tests/compose.js index 278dbfba51..b81d08cab6 100644 --- a/frontend_tests/node_tests/compose.js +++ b/frontend_tests/node_tests/compose.js @@ -3,7 +3,7 @@ const {JSDOM} = require("jsdom"); const rewiremock = require("rewiremock/node"); -const events = require("./lib/events.js"); +const events = require("./lib/events"); set_global("bridge", false); @@ -12,7 +12,7 @@ const noop = function () {}; set_global("$", global.make_zjquery()); set_global("DOMParser", new JSDOM().window.DOMParser); -const LazySet = zrequire("lazy_set.js").LazySet; +const LazySet = zrequire("lazy_set").LazySet; const _navigator = { platform: "", diff --git a/frontend_tests/node_tests/dispatch.js b/frontend_tests/node_tests/dispatch.js index 31e4023421..71e86ae072 100644 --- a/frontend_tests/node_tests/dispatch.js +++ b/frontend_tests/node_tests/dispatch.js @@ -2,7 +2,7 @@ const noop = function () {}; -const events = require("./lib/events.js"); +const events = require("./lib/events"); const event_fixtures = events.fixtures; const test_message = events.test_message; diff --git a/frontend_tests/node_tests/dispatch_subs.js b/frontend_tests/node_tests/dispatch_subs.js index 36b3b9f4a8..41b927bbb2 100644 --- a/frontend_tests/node_tests/dispatch_subs.js +++ b/frontend_tests/node_tests/dispatch_subs.js @@ -1,6 +1,6 @@ "use strict"; -const events = require("./lib/events.js"); +const events = require("./lib/events"); const event_fixtures = events.fixtures; const test_user = events.test_user; diff --git a/frontend_tests/node_tests/emoji.js b/frontend_tests/node_tests/emoji.js index 2f4eb2c9db..55ae29baae 100644 --- a/frontend_tests/node_tests/emoji.js +++ b/frontend_tests/node_tests/emoji.js @@ -2,7 +2,7 @@ const emoji_codes = zrequire("emoji_codes", "generated/emoji/emoji_codes.json"); -const events = require("./lib/events.js"); +const events = require("./lib/events"); const emoji = zrequire("emoji", "shared/js/emoji"); diff --git a/frontend_tests/node_tests/stream_edit.js b/frontend_tests/node_tests/stream_edit.js index 7aa7a64c3c..32cf248b89 100644 --- a/frontend_tests/node_tests/stream_edit.js +++ b/frontend_tests/node_tests/stream_edit.js @@ -1,6 +1,6 @@ "use strict"; -const LazySet = zrequire("lazy_set.js").LazySet; +const LazySet = zrequire("lazy_set").LazySet; const noop = () => {}; global.stub_templates(() => noop); diff --git a/frontend_tests/node_tests/typeahead_helper.js b/frontend_tests/node_tests/typeahead_helper.js index 5627e475f4..3f47dacf08 100644 --- a/frontend_tests/node_tests/typeahead_helper.js +++ b/frontend_tests/node_tests/typeahead_helper.js @@ -19,7 +19,7 @@ const pygments_data = zrequire("pygments_data", "generated/pygments_data.json"); const actual_pygments_data = Object.assign({}, pygments_data); const ct = zrequire("composebox_typeahead"); const th = zrequire("typeahead_helper"); -const LazySet = zrequire("lazy_set.js").LazySet; +const LazySet = zrequire("lazy_set").LazySet; let next_id = 0; diff --git a/frontend_tests/puppeteer_lib/common.js b/frontend_tests/puppeteer_lib/common.js index 009d265f12..7da9744142 100644 --- a/frontend_tests/puppeteer_lib/common.js +++ b/frontend_tests/puppeteer_lib/common.js @@ -5,7 +5,7 @@ const path = require("path"); const puppeteer = require("puppeteer"); -const test_credentials = require("../../var/puppeteer/test_credentials.js").test_credentials; +const test_credentials = require("../../var/puppeteer/test_credentials").test_credentials; const root_dir = path.resolve(__dirname, "../../"); const puppeteer_dir = path.join(root_dir, "var/puppeteer"); diff --git a/frontend_tests/puppeteer_tests/01-login.js b/frontend_tests/puppeteer_tests/01-login.js index 18c2967fcc..def31568c1 100644 --- a/frontend_tests/puppeteer_tests/01-login.js +++ b/frontend_tests/puppeteer_tests/01-login.js @@ -1,6 +1,6 @@ "use strict"; -const test_credentials = require("../../var/puppeteer/test_credentials.js").test_credentials; +const test_credentials = require("../../var/puppeteer/test_credentials").test_credentials; const common = require("../puppeteer_lib/common"); async function login_tests(page) { diff --git a/frontend_tests/puppeteer_tests/16-settings.js b/frontend_tests/puppeteer_tests/16-settings.js index 8388d732f8..7463995a9d 100644 --- a/frontend_tests/puppeteer_tests/16-settings.js +++ b/frontend_tests/puppeteer_tests/16-settings.js @@ -2,7 +2,7 @@ const assert = require("assert").strict; -const test_credentials = require("../../var/puppeteer/test_credentials.js").test_credentials; +const test_credentials = require("../../var/puppeteer/test_credentials").test_credentials; const common = require("../puppeteer_lib/common"); const OUTGOING_WEBHOOK_BOT_TYPE = "3"; diff --git a/frontend_tests/zjsunit/index.js b/frontend_tests/zjsunit/index.js index 15c68f688d..e5133712e8 100644 --- a/frontend_tests/zjsunit/index.js +++ b/frontend_tests/zjsunit/index.js @@ -7,13 +7,13 @@ const path = require("path"); const Handlebars = require("handlebars/runtime"); const _ = require("lodash"); -const finder = require("./finder.js"); -const handlebars = require("./handlebars.js"); -const stub_i18n = require("./i18n.js"); -const namespace = require("./namespace.js"); -const stub = require("./stub.js"); -const make_blueslip = require("./zblueslip.js").make_zblueslip; -const zjquery = require("./zjquery.js"); +const finder = require("./finder"); +const handlebars = require("./handlebars"); +const stub_i18n = require("./i18n"); +const namespace = require("./namespace"); +const stub = require("./stub"); +const make_blueslip = require("./zblueslip").make_zblueslip; +const zjquery = require("./zjquery"); require("@babel/register")({ extensions: [".es6", ".es", ".jsx", ".js", ".mjs", ".ts"], @@ -94,7 +94,7 @@ function short_tb(tb) { } // Set up Markdown comparison helper -global.markdown_assert = require("./markdown_assert.js"); +global.markdown_assert = require("./markdown_assert"); let current_file_name; diff --git a/frontend_tests/zjsunit/markdown_assert.js b/frontend_tests/zjsunit/markdown_assert.js index e6f6e7648e..75c5afb423 100644 --- a/frontend_tests/zjsunit/markdown_assert.js +++ b/frontend_tests/zjsunit/markdown_assert.js @@ -25,7 +25,7 @@ const {JSDOM} = require("jsdom"); const _ = require("lodash"); -const mdiff = require("./mdiff.js"); +const mdiff = require("./mdiff"); // Module-level global instance of MarkdownComparer, initialized when needed let _markdownComparerInstance = null; diff --git a/static/js/bundles/app.js b/static/js/bundles/app.js index d05609c2be..9d6039bb34 100644 --- a/static/js/bundles/app.js +++ b/static/js/bundles/app.js @@ -1,199 +1,199 @@ -import "./common.js"; +import "./common"; // Import Third party libraries -import "../../third/bootstrap-notify/js/bootstrap-notify.js"; -import "../../third/bootstrap-typeahead/typeahead.js"; -import "../../third/bootstrap-tooltip/tooltip.js"; +import "../../third/bootstrap-notify/js/bootstrap-notify"; +import "../../third/bootstrap-typeahead/typeahead"; +import "../../third/bootstrap-tooltip/tooltip"; import "../../third/bootstrap-tooltip/tooltip.css"; -import "jquery-caret-plugin/src/jquery.caret.js"; -import "../../third/jquery-idle/jquery.idle.js"; +import "jquery-caret-plugin/dist/jquery.caret"; +import "../../third/jquery-idle/jquery.idle"; import "spectrum-colorpicker"; -import "jquery-validation/dist/jquery.validate.js"; -import "flatpickr/dist/flatpickr.js"; -import "flatpickr/dist/plugins/confirmDate/confirmDate.js"; +import "jquery-validation"; +import "flatpickr"; +import "flatpickr/dist/plugins/confirmDate/confirmDate"; // Import App JS -import "../i18n.js"; -import "../feature_flags.js"; -import "../loading.js"; -import "../schema.js"; -import "../vdom.js"; -import "../search_util.js"; -import "../keydown_util.js"; -import "../lightbox_canvas.js"; -import "../rtl.js"; -import "../rendered_markdown.js"; -import "../lazy_set.js"; -import "../fold_dict.ts"; -import "../scroll_util.js"; -import "../components.js"; -import "../feedback_widget.js"; -import "../localstorage.js"; -import "../drafts.js"; -import "../input_pill.js"; -import "../user_pill.js"; -import "../stream_pill.js"; -import "../compose_pm_pill.js"; -import "../channel.js"; -import "../setup.js"; -import "../unread_ui.js"; -import "../unread_ops.js"; -import "../muting.js"; -import "../muting_ui.js"; -import "../message_viewport.js"; -import "../rows.js"; -import "../people.js"; -import "../user_groups.js"; -import "../unread.js"; -import "../topic_list_data.js"; -import "../topic_list.js"; -import "../pm_list_dom.js"; -import "../pm_list.js"; -import "../pm_conversations.js"; -import "../recent_senders.js"; -import "../stream_sort.js"; -import "../topic_generator.js"; -import "../top_left_corner.js"; -import "../stream_list.js"; -import "../topic_zoom.js"; -import "../filter.js"; -import "../poll_widget.js"; -import "../todo_widget.js"; -import "../tictactoe_widget.js"; -import "../zform.js"; -import "../widgetize.js"; -import "../submessage.js"; -import "../fetch_status.js"; -import "../message_list_data.js"; -import "../message_list_view.js"; -import "../message_list.js"; -import "../message_live_update.js"; -import "../narrow_state.js"; -import "../narrow.js"; -import "../reload_state.js"; -import "../reload.js"; -import "../compose_fade.js"; -import "../markdown.js"; -import "../local_message.js"; -import "../echo.js"; -import "../sent_messages.js"; -import "../compose_state.js"; -import "../compose_actions.js"; -import "../transmit.js"; -import "../zcommand.js"; -import "../compose.js"; -import "../upload.js"; -import "../color_data.js"; -import "../stream_color.js"; -import "../stream_data.js"; -import "../stream_topic_history.js"; -import "../stream_muting.js"; -import "../stream_events.js"; -import "../stream_create.js"; -import "../stream_edit.js"; -import "../subs.js"; -import "../message_edit.js"; -import "../message_edit_history.js"; -import "../condense.js"; -import "../resize.js"; -import "../list_render.js"; -import "../floating_recipient_bar.js"; -import "../lightbox.js"; -import "../ui_report.js"; -import "../message_scroll.js"; -import "../info_overlay.js"; -import "../ui.js"; -import "../night_mode.js"; -import "../ui_util.js"; -import "../click_handlers.js"; -import "../settings_panel_menu.js"; -import "../settings_toggle.js"; -import "../scroll_bar.js"; -import "../gear_menu.js"; -import "../copy_and_paste.js"; -import "../stream_popover.js"; -import "../popovers.js"; -import "../overlays.js"; -import "../typeahead_helper.js"; -import "../search_suggestion.js"; -import "../search.js"; -import "../composebox_typeahead.js"; -import "../pill_typeahead.js"; -import "../navigate.js"; -import "../list_util.js"; -import "../hotkey.js"; -import "../favicon.js"; -import "../notifications.js"; -import "../hash_util.js"; -import "../hashchange.js"; -import "../invite.js"; -import "../message_flags.js"; -import "../starred_messages.js"; -import "../alert_words.js"; -import "../alert_words_ui.js"; -import "../attachments_ui.js"; -import "../message_store.js"; -import "../message_util.js"; -import "../message_events.js"; -import "../message_fetch.js"; -import "../server_events.js"; -import "../server_events_dispatch.js"; -import "../zulip.js"; -import "../presence.js"; -import "../user_search.js"; -import "../user_status.js"; -import "../user_status_ui.js"; -import "../buddy_data.js"; -import "../padded_widget.js"; -import "../buddy_list.js"; -import "../list_cursor.js"; -import "../activity.js"; -import "../user_events.js"; -import "../colorspace.js"; -import "../timerender.js"; -import "../tutorial.js"; -import "../hotspots.js"; -import "../templates.js"; -import "../upload_widget.js"; -import "../avatar.js"; -import "../realm_icon.js"; -import "../realm_logo.js"; -import "../reminder.js"; -import "../confirm_dialog.js"; -import "../dropdown_list_widget.js"; -import "../settings_account.js"; -import "../settings_display.js"; -import "../settings_notifications.js"; -import "../settings_bots.js"; -import "../settings_muting.js"; -import "../settings_sections.js"; -import "../settings_emoji.js"; -import "../settings_exports.js"; -import "../settings_org.js"; -import "../settings_users.js"; -import "../settings_streams.js"; -import "../settings_linkifiers.js"; -import "../settings_invites.js"; -import "../settings_user_groups.js"; -import "../settings_profile_fields.js"; -import "../settings.js"; -import "../admin.js"; -import "../message_view_header.js"; -import "../bot_data.js"; -import "../reactions.js"; -import "../typing.js"; -import "../typing_data.js"; -import "../typing_events.js"; -import "../ui_init.js"; -import "../emoji_picker.js"; -import "../compose_ui.js"; -import "../panels.js"; -import "../recent_topics.js"; -import "../settings_ui.js"; -import "../search_pill.js"; -import "../search_pill_widget.js"; -import "../stream_ui_updates.js"; -import "../spoilers.js"; +import "../i18n"; +import "../feature_flags"; +import "../loading"; +import "../schema"; +import "../vdom"; +import "../search_util"; +import "../keydown_util"; +import "../lightbox_canvas"; +import "../rtl"; +import "../rendered_markdown"; +import "../lazy_set"; +import "../fold_dict"; +import "../scroll_util"; +import "../components"; +import "../feedback_widget"; +import "../localstorage"; +import "../drafts"; +import "../input_pill"; +import "../user_pill"; +import "../stream_pill"; +import "../compose_pm_pill"; +import "../channel"; +import "../setup"; +import "../unread_ui"; +import "../unread_ops"; +import "../muting"; +import "../muting_ui"; +import "../message_viewport"; +import "../rows"; +import "../people"; +import "../user_groups"; +import "../unread"; +import "../topic_list_data"; +import "../topic_list"; +import "../pm_list_dom"; +import "../pm_list"; +import "../pm_conversations"; +import "../recent_senders"; +import "../stream_sort"; +import "../topic_generator"; +import "../top_left_corner"; +import "../stream_list"; +import "../topic_zoom"; +import "../filter"; +import "../poll_widget"; +import "../todo_widget"; +import "../tictactoe_widget"; +import "../zform"; +import "../widgetize"; +import "../submessage"; +import "../fetch_status"; +import "../message_list_data"; +import "../message_list_view"; +import "../message_list"; +import "../message_live_update"; +import "../narrow_state"; +import "../narrow"; +import "../reload_state"; +import "../reload"; +import "../compose_fade"; +import "../markdown"; +import "../local_message"; +import "../echo"; +import "../sent_messages"; +import "../compose_state"; +import "../compose_actions"; +import "../transmit"; +import "../zcommand"; +import "../compose"; +import "../upload"; +import "../color_data"; +import "../stream_color"; +import "../stream_data"; +import "../stream_topic_history"; +import "../stream_muting"; +import "../stream_events"; +import "../stream_create"; +import "../stream_edit"; +import "../subs"; +import "../message_edit"; +import "../message_edit_history"; +import "../condense"; +import "../resize"; +import "../list_render"; +import "../floating_recipient_bar"; +import "../lightbox"; +import "../ui_report"; +import "../message_scroll"; +import "../info_overlay"; +import "../ui"; +import "../night_mode"; +import "../ui_util"; +import "../click_handlers"; +import "../settings_panel_menu"; +import "../settings_toggle"; +import "../scroll_bar"; +import "../gear_menu"; +import "../copy_and_paste"; +import "../stream_popover"; +import "../popovers"; +import "../overlays"; +import "../typeahead_helper"; +import "../search_suggestion"; +import "../search"; +import "../composebox_typeahead"; +import "../pill_typeahead"; +import "../navigate"; +import "../list_util"; +import "../hotkey"; +import "../favicon"; +import "../notifications"; +import "../hash_util"; +import "../hashchange"; +import "../invite"; +import "../message_flags"; +import "../starred_messages"; +import "../alert_words"; +import "../alert_words_ui"; +import "../attachments_ui"; +import "../message_store"; +import "../message_util"; +import "../message_events"; +import "../message_fetch"; +import "../server_events"; +import "../server_events_dispatch"; +import "../zulip"; +import "../presence"; +import "../user_search"; +import "../user_status"; +import "../user_status_ui"; +import "../buddy_data"; +import "../padded_widget"; +import "../buddy_list"; +import "../list_cursor"; +import "../activity"; +import "../user_events"; +import "../colorspace"; +import "../timerender"; +import "../tutorial"; +import "../hotspots"; +import "../templates"; +import "../upload_widget"; +import "../avatar"; +import "../realm_icon"; +import "../realm_logo"; +import "../reminder"; +import "../confirm_dialog"; +import "../dropdown_list_widget"; +import "../settings_account"; +import "../settings_display"; +import "../settings_notifications"; +import "../settings_bots"; +import "../settings_muting"; +import "../settings_sections"; +import "../settings_emoji"; +import "../settings_exports"; +import "../settings_org"; +import "../settings_users"; +import "../settings_streams"; +import "../settings_linkifiers"; +import "../settings_invites"; +import "../settings_user_groups"; +import "../settings_profile_fields"; +import "../settings"; +import "../admin"; +import "../message_view_header"; +import "../bot_data"; +import "../reactions"; +import "../typing"; +import "../typing_data"; +import "../typing_events"; +import "../ui_init"; +import "../emoji_picker"; +import "../compose_ui"; +import "../panels"; +import "../recent_topics"; +import "../settings_ui"; +import "../search_pill"; +import "../search_pill_widget"; +import "../stream_ui_updates"; +import "../spoilers"; // Import Styles @@ -229,4 +229,4 @@ import "../../styles/user_status.scss"; import "../../styles/widgets.scss"; // This should be last. -import "../ready.js"; +import "../ready"; diff --git a/static/js/bundles/common.js b/static/js/bundles/common.js index 871d373b87..314d5e4860 100644 --- a/static/js/bundles/common.js +++ b/static/js/bundles/common.js @@ -2,16 +2,16 @@ import "core-js/features/promise"; import "core-js/features/symbol"; import "../../../tools/debug-require"; import "jquery"; -import "../page_params.js"; -import "../csrf.js"; -import "../blueslip.js"; -import "../../third/bootstrap/js/bootstrap.js"; -import "../common.js"; +import "../page_params"; +import "../csrf"; +import "../blueslip"; +import "../../third/bootstrap/js/bootstrap"; +import "../common"; import "../../third/bootstrap/css/bootstrap.css"; import "../../third/bootstrap/css/bootstrap-btn.css"; import "simplebar/dist/simplebar.css"; import "font-awesome/css/font-awesome.css"; -import "../../assets/icons/zulip-icons.font.js"; +import "../../assets/icons/zulip-icons.font"; import "source-sans-pro/source-sans-pro.css"; import "../../styles/pygments.scss"; import "@uppy/core/dist/style.css"; diff --git a/static/js/bundles/portico.js b/static/js/bundles/portico.js index 6ad8775819..8bac10259b 100644 --- a/static/js/bundles/portico.js +++ b/static/js/bundles/portico.js @@ -1,5 +1,5 @@ -import "./common.js"; -import "../i18n.js"; -import "../portico/header.js"; -import "../portico/google-analytics.js"; +import "./common"; +import "../i18n"; +import "../portico/header"; +import "../portico/google-analytics"; import "../../styles/portico/portico-styles.scss"; diff --git a/static/js/composebox_typeahead.js b/static/js/composebox_typeahead.js index b212863a1f..a0aebaa09e 100644 --- a/static/js/composebox_typeahead.js +++ b/static/js/composebox_typeahead.js @@ -1,7 +1,7 @@ "use strict"; const autosize = require("autosize"); -const confirmDatePlugin = require("flatpickr/dist/plugins/confirmDate/confirmDate.js"); +const confirmDatePlugin = require("flatpickr/dist/plugins/confirmDate/confirmDate"); const moment = require("moment"); const pygments_data = require("../generated/pygments_data.json"); diff --git a/static/js/copy_and_paste.js b/static/js/copy_and_paste.js index 991c03babc..c5d3d0f701 100644 --- a/static/js/copy_and_paste.js +++ b/static/js/copy_and_paste.js @@ -1,6 +1,6 @@ "use strict"; -const TurndownService = require("turndown/lib/turndown.cjs.js"); +const TurndownService = require("turndown/lib/turndown.cjs"); function find_boundary_tr(initial_tr, iterate_row) { let j; diff --git a/static/js/popovers.js b/static/js/popovers.js index 2cd45aed79..1433d5c4f6 100644 --- a/static/js/popovers.js +++ b/static/js/popovers.js @@ -1,7 +1,7 @@ "use strict"; const ClipboardJS = require("clipboard"); -const confirmDatePlugin = require("flatpickr/dist/plugins/confirmDate/confirmDate.js"); +const confirmDatePlugin = require("flatpickr/dist/plugins/confirmDate/confirmDate"); const moment = require("moment"); const render_actions_popover_content = require("../templates/actions_popover_content.hbs"); diff --git a/static/js/portico/help.js b/static/js/portico/help.js index 879e8eb22e..fbdeb2d3d4 100644 --- a/static/js/portico/help.js +++ b/static/js/portico/help.js @@ -1,7 +1,7 @@ import SimpleBar from "simplebar"; -import * as google_analytics from "./google-analytics.js"; -import {activate_correct_tab} from "./tabbed-instructions.js"; +import * as google_analytics from "./google-analytics"; +import {activate_correct_tab} from "./tabbed-instructions"; function registerCodeSection($codeSection) { const $li = $codeSection.find("ul.nav li"); diff --git a/static/js/portico/integrations.js b/static/js/portico/integrations.js index 0961297f4c..6c6a7927d0 100644 --- a/static/js/portico/integrations.js +++ b/static/js/portico/integrations.js @@ -1,7 +1,7 @@ import _ from "lodash"; import blueslip from "./../blueslip"; -import * as google_analytics from "./google-analytics.js"; +import * as google_analytics from "./google-analytics"; import {path_parts} from "./landing-page"; // these constants are populated immediately with data from the DOM on page load diff --git a/static/js/portico/landing-page.js b/static/js/portico/landing-page.js index e98c112d67..7198d1c7e0 100644 --- a/static/js/portico/landing-page.js +++ b/static/js/portico/landing-page.js @@ -1,6 +1,6 @@ -import * as google_analytics from "./google-analytics.js"; -import {detect_user_os} from "./tabbed-instructions.js"; -import render_tabs from "./team.js"; +import * as google_analytics from "./google-analytics"; +import {detect_user_os} from "./tabbed-instructions"; +import render_tabs from "./team"; export function path_parts() { return window.location.pathname.split("/").filter((chunk) => chunk !== ""); diff --git a/static/js/settings_display.js b/static/js/settings_display.js index edcdc500d1..fa3066a6e8 100644 --- a/static/js/settings_display.js +++ b/static/js/settings_display.js @@ -1,6 +1,6 @@ "use strict"; -const emojisets = require("./emojisets.js"); +const emojisets = require("./emojisets"); const settings_config = require("./settings_config"); const meta = { diff --git a/static/js/ui.js b/static/js/ui.js index 15a27b9749..a20d80981f 100644 --- a/static/js/ui.js +++ b/static/js/ui.js @@ -1,6 +1,6 @@ "use strict"; -const SimpleBar = require("simplebar/dist/simplebar.js"); +const SimpleBar = require("simplebar/dist/simplebar"); // What, if anything, obscures the home tab? diff --git a/tools/node_lib/dump_fixtures.js b/tools/node_lib/dump_fixtures.js index 69329a2d87..9f620036bd 100644 --- a/tools/node_lib/dump_fixtures.js +++ b/tools/node_lib/dump_fixtures.js @@ -1,5 +1,5 @@ "use strict"; -const events = require("../../frontend_tests/node_tests/lib/events.js"); +const events = require("../../frontend_tests/node_tests/lib/events"); console.info(JSON.stringify(events.fixtures, null, 4)); diff --git a/tools/webpack.assets.json b/tools/webpack.assets.json index 03cf1e96ad..17442e0407 100644 --- a/tools/webpack.assets.json +++ b/tools/webpack.assets.json @@ -1,19 +1,19 @@ { "activity": [ - "./static/js/bundles/common.js", - "sorttable/sorttable.js", - "./static/js/analytics/activity.js", + "./static/js/bundles/common", + "sorttable", + "./static/js/analytics/activity", "./static/styles/portico/activity.scss" ], "archive": [ - "./static/js/bundles/portico.js", - "./static/js/archive.js", - "./static/js/colorspace.js", - "./static/js/floating_recipient_bar.js", - "./static/js/timerender.js", - "./static/js/templates.js", - "./static/js/stream_color.js", - "./static/js/scroll_bar.js", + "./static/js/bundles/portico", + "./static/js/archive", + "./static/js/colorspace", + "./static/js/floating_recipient_bar", + "./static/js/timerender", + "./static/js/templates", + "./static/js/stream_color", + "./static/js/scroll_bar", "katex/dist/katex.css", "./static/styles/rendered_markdown.scss", "./static/styles/zulip.scss", @@ -21,96 +21,93 @@ "./static/generated/emoji-styles/google-sprite.css" ], "billing": [ - "./static/js/bundles/portico.js", - "./static/js/portico/landing-page.js", + "./static/js/bundles/portico", + "./static/js/portico/landing-page", "./static/styles/portico/landing-page.scss", - "./static/js/billing/helpers.js", - "./static/js/billing/billing.js", - "./static/js/templates.js", - "./static/js/loading.js", + "./static/js/billing/helpers", + "./static/js/billing/billing", + "./static/js/templates", + "./static/js/loading", "./static/styles/portico/billing.scss" ], "upgrade": [ - "./static/js/bundles/portico.js", - "./static/js/portico/landing-page.js", + "./static/js/bundles/portico", + "./static/js/portico/landing-page", "./static/styles/portico/landing-page.scss", - "./static/js/billing/helpers.js", - "./static/js/billing/upgrade.js", - "./static/js/templates.js", - "./static/js/loading.js", + "./static/js/billing/helpers", + "./static/js/billing/upgrade", + "./static/js/templates", + "./static/js/loading", "./static/styles/portico/billing.scss" ], - "portico": ["./static/js/bundles/portico.js"], + "portico": ["./static/js/bundles/portico"], "error-styles": [ "./static/third/bootstrap/css/bootstrap.css", "./static/styles/portico/portico-styles.scss" ], - "common": ["./static/js/bundles/common.js"], + "common": ["./static/js/bundles/common"], "help": [ - "./static/js/bundles/portico.js", + "./static/js/bundles/portico", "simplebar/dist/simplebar.css", - "simplebar/dist/simplebar.js", - "./static/js/portico/help.js", - "./static/js/portico/tabbed-instructions.js" + "simplebar/dist/simplebar", + "./static/js/portico/help", + "./static/js/portico/tabbed-instructions" ], "landing-page": [ - "./static/js/bundles/portico.js", - "./static/js/portico/landing-page.js", + "./static/js/bundles/portico", + "./static/js/portico/landing-page", "./static/styles/portico/landing-page.scss" ], "integrations": [ - "./static/js/bundles/portico.js", - "./static/js/portico/integrations.js", + "./static/js/bundles/portico", + "./static/js/portico/integrations", "./static/styles/portico/landing-page.scss", "./static/styles/portico/integrations.scss" ], "signup": [ - "./static/js/bundles/portico.js", - "jquery-validation/dist/jquery.validate.min.js", - "./static/js/portico/signup.js" + "./static/js/bundles/portico", + "jquery-validation/dist/jquery.validate.min", + "./static/js/portico/signup" ], "register": [ - "./static/js/bundles/portico.js", - "jquery-validation/dist/jquery.validate.min.js", - "./static/js/portico/signup.js", - "zxcvbn/dist/zxcvbn.js" + "./static/js/bundles/portico", + "jquery-validation/dist/jquery.validate.min", + "./static/js/portico/signup", + "zxcvbn/dist/zxcvbn" ], "confirm-preregistrationuser": [ - "./static/js/bundles/common.js", - "./static/js/portico/confirm-preregistrationuser.js" + "./static/js/bundles/common", + "./static/js/portico/confirm-preregistrationuser" ], "support": [ - "./static/js/bundles/common.js", - "sorttable/sorttable.js", - "./static/js/analytics/activity.js", + "./static/js/bundles/common", + "sorttable", + "./static/js/analytics/activity", "./static/styles/portico/activity.scss", - "./static/js/analytics/support.js", + "./static/js/analytics/support", "./static/styles/app_components.scss" ], - "dev-login": ["./static/js/bundles/portico.js", "./static/js/portico/dev-login.js"], - "desktop-login": ["./static/js/bundles/portico.js", "./static/js/portico/desktop-login.js"], - "desktop-redirect": [ - "./static/js/bundles/portico.js", - "./static/js/portico/desktop-redirect.js" - ], + "dev-login": ["./static/js/bundles/portico", "./static/js/portico/dev-login"], + "desktop-login": ["./static/js/bundles/portico", "./static/js/portico/desktop-login"], + "desktop-redirect": ["./static/js/bundles/portico", "./static/js/portico/desktop-redirect"], "integrations-dev-panel": [ - "./static/js/bundles/portico.js", - "./static/js/portico/integrations_dev_panel.js", + "./static/js/bundles/portico", + "./static/js/portico/integrations_dev_panel", "./static/styles/portico/integrations_dev_panel.css", - "./static/js/reload_state.js", - "./static/js/channel.js" + "./static/js/reload_state", + "./static/js/channel" ], "email-log": [ - "./static/js/bundles/common.js", - "./static/js/portico/email_log.js", - "./static/js/reload_state.js", - "./static/js/channel.js" + "./static/js/bundles/common", + "./static/js/portico/email_log", + "./static/js/reload_state", + "./static/js/channel" ], "stats": [ - "./static/js/bundles/portico.js", + "./static/js/bundles/portico", "./static/styles/portico/stats.scss", - "./static/js/stats/stats.js" + "./static/js/stats/stats" ], - "app": ["./static/js/bundles/app.js"], - "digest": ["./static/js/bundles/portico.js"] + "app": ["./static/js/bundles/app"], + "digest": ["./static/js/bundles/portico"] }