paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

webpack: Elide node_modules when importing JS modules.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-06-20 18:16:48 -07:00
committed by Tim Abbott
parent c6fcf36c8d
commit 23cd064c86
16 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/copy_and_paste.js
View File

@@ -11,7 +11,7 @@ const { document } = window;
global.document = document; global.document = document;
global.$ = require('jquery')(window); global.$ = require('jquery')(window);
zrequire('toMarkdown', 'node_modules/to-markdown/dist/to-markdown.js'); zrequire('toMarkdown', 'to-markdown/dist/to-markdown.js');
var copy_and_paste = zrequire('copy_and_paste'); var copy_and_paste = zrequire('copy_and_paste');
// Super stripped down version of the code in the drag-mock library // Super stripped down version of the code in the drag-mock library

2
frontend_tests/node_tests/markdown.js
View File

@@ -1,6 +1,6 @@
/*global Dict */ /*global Dict */
zrequire('hash_util'); zrequire('hash_util');
zrequire('katex', 'node_modules/katex/dist/katex.min.js'); zrequire('katex', 'katex/dist/katex.min.js');
zrequire('marked', 'third/marked/lib/marked'); zrequire('marked', 'third/marked/lib/marked');
zrequire('util'); zrequire('util');
zrequire('fenced_code'); zrequire('fenced_code');

2
frontend_tests/node_tests/message_edit.js
View File

@@ -3,7 +3,7 @@ set_global('page_params', {});
global.stub_out_jquery(); global.stub_out_jquery();
zrequire('XDate', 'node_modules/xdate/src/xdate'); zrequire('XDate', 'xdate/src/xdate');
zrequire('message_edit'); zrequire('message_edit');
var get_editability = message_edit.get_editability; var get_editability = message_edit.get_editability;

2
frontend_tests/node_tests/message_list_view.js
View File

@@ -2,7 +2,7 @@ set_global('$', global.make_zjquery());
set_global('document', 'document-stub'); set_global('document', 'document-stub');
zrequire('util'); zrequire('util');
zrequire('XDate', 'node_modules/xdate/src/xdate'); zrequire('XDate', 'xdate/src/xdate');
zrequire('Filter', 'js/filter'); zrequire('Filter', 'js/filter');
zrequire('FetchStatus', 'js/fetch_status'); zrequire('FetchStatus', 'js/fetch_status');
zrequire('MessageListData', 'js/message_list_data'); zrequire('MessageListData', 'js/message_list_data');

2
frontend_tests/node_tests/password.js
View File

@@ -1,4 +1,4 @@
zrequire('zxcvbn', 'node_modules/zxcvbn/dist/zxcvbn'); zrequire('zxcvbn', 'zxcvbn/dist/zxcvbn');
zrequire('common'); zrequire('common');
set_global('i18n', global.stub_i18n); set_global('i18n', global.stub_i18n);

2
frontend_tests/zjsunit/finder.js
View File

@@ -2,7 +2,7 @@ var finder = (function () {
var exports = {}; var exports = {};
var _ = require('node_modules/underscore/underscore.js'); var _ = require('underscore/underscore.js');
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');

4
frontend_tests/zjsunit/index.js
View File

@@ -12,9 +12,9 @@ var path = require('path');
var fs = require('fs'); var fs = require('fs');
global.assert = require('assert'); global.assert = require('assert');
require('node_modules/string.prototype.codepointat/codepointat.js'); require('string.prototype.codepointat/codepointat.js');
global._ = require('node_modules/underscore/underscore.js'); global._ = require('underscore/underscore.js');
var _ = global._; var _ = global._;
const windowObj = { const windowObj = {
location: { location: {

2
frontend_tests/zjsunit/namespace.js
View File

@@ -1,6 +1,6 @@
var namespace = (function () { var namespace = (function () {
var _ = require('node_modules/underscore/underscore.js'); var _ = require('underscore/underscore.js');
var exports = {}; var exports = {};
var dependencies = []; var dependencies = [];

2
frontend_tests/zjsunit/render.js
View File

@@ -3,7 +3,7 @@ var render = (function () {
var exports = {}; var exports = {};
var fs = require('fs'); var fs = require('fs');
var _ = require('node_modules/underscore/underscore.js'); var _ = require('underscore/underscore.js');
var Handlebars = require('handlebars'); var Handlebars = require('handlebars');
function template_dir() { function template_dir() {

2
frontend_tests/zjsunit/stub.js
View File

@@ -1,6 +1,6 @@
var stub = (function () { var stub = (function () {
var _ = require('node_modules/underscore/underscore.js'); var _ = require('underscore/underscore.js');
var exports = {}; var exports = {};
// Stubs don't do any magical modifications to your namespace. They // Stubs don't do any magical modifications to your namespace. They

30
static/js/bundles/app.js
View File

@@ -10,18 +10,18 @@ import "third/jquery-autosize/jquery.autosize.js";
import "third/spectrum/spectrum.js"; import "third/spectrum/spectrum.js";
import "third/sockjs/sockjs-0.3.4.js"; import "third/sockjs/sockjs-0.3.4.js";
import "third/marked/lib/marked.js"; import "third/marked/lib/marked.js";
import "node_modules/xdate/src/xdate.js"; import "xdate/src/xdate.js";
import "node_modules/jquery-validation/dist/jquery.validate.js"; import "jquery-validation/dist/jquery.validate.js";
import "node_modules/blueimp-md5/js/md5.js"; import "blueimp-md5/js/md5.js";
import "node_modules/clipboard/dist/clipboard.js"; import "clipboard/dist/clipboard.js";
import "node_modules/string.prototype.codepointat/codepointat.js"; import "string.prototype.codepointat/codepointat.js";
import "node_modules/winchan/winchan.js"; import "winchan/winchan.js";
import "node_modules/handlebars/dist/handlebars.runtime.js"; import "handlebars/dist/handlebars.runtime.js";
import "node_modules/to-markdown/dist/to-markdown.js"; import "to-markdown/dist/to-markdown.js";
import "node_modules/flatpickr/dist/flatpickr.js"; import "flatpickr/dist/flatpickr.js";
import "node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js"; import "flatpickr/dist/plugins/confirmDate/confirmDate.js";
import "node_modules/error-stack-parser/dist/error-stack-parser.min.js"; import "error-stack-parser/dist/error-stack-parser.min.js";
import "node_modules/sortablejs/Sortable.js"; import "sortablejs/Sortable.js";
import "generated/emoji/emoji_codes.js"; import "generated/emoji/emoji_codes.js";
import "generated/pygments_data.js"; import "generated/pygments_data.js";
@@ -208,9 +208,9 @@ import 'js/stream_ui_updates.js';
import "third/bootstrap-notify/css/bootstrap-notify.css"; import "third/bootstrap-notify/css/bootstrap-notify.css";
import "third/spectrum/spectrum.css"; import "third/spectrum/spectrum.css";
import "node_modules/katex/dist/katex.css"; import "katex/dist/katex.css";
import "node_modules/flatpickr/dist/flatpickr.css"; import "flatpickr/dist/flatpickr.css";
import "node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.css"; import "flatpickr/dist/plugins/confirmDate/confirmDate.css";
import "styles/components.scss"; import "styles/components.scss";
import "styles/app_components.scss"; import "styles/app_components.scss";
import "styles/zulip.scss"; import "styles/zulip.scss";

16
static/js/bundles/commons.js
View File

@@ -1,20 +1,20 @@
import "string.prototype.endswith"; import "string.prototype.endswith";
import "string.prototype.startswith"; import "string.prototype.startswith";
import "string.prototype.codepointat"; import "string.prototype.codepointat";
import "node_modules/jquery/dist/jquery.js"; import "jquery/dist/jquery.js";
import "node_modules/underscore/underscore.js"; import "underscore/underscore.js";
import "js/blueslip.js"; import "js/blueslip.js";
import "third/bootstrap/js/bootstrap.js"; import "third/bootstrap/js/bootstrap.js";
import "third/bootstrap-typeahead/typeahead.js"; import "third/bootstrap-typeahead/typeahead.js";
import "js/common.js"; import "js/common.js";
import "node_modules/moment/min/moment.min.js"; import "moment/min/moment.min.js";
import "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js"; import "moment-timezone/builds/moment-timezone-with-data.min.js";
import "node_modules/sortablejs/Sortable.js"; import "sortablejs/Sortable.js";
import "third/bootstrap/css/bootstrap.css"; import "third/bootstrap/css/bootstrap.css";
import "third/bootstrap/css/bootstrap-btn.css"; import "third/bootstrap/css/bootstrap-btn.css";
import "third/bootstrap/css/bootstrap-responsive.css"; import "third/bootstrap/css/bootstrap-responsive.css";
import "node_modules/simplebar/dist/simplebar.css"; import "simplebar/dist/simplebar.css";
import "node_modules/font-awesome/css/font-awesome.css"; import "font-awesome/css/font-awesome.css";
import "generated/icons/style.css"; import "generated/icons/style.css";
import "node_modules/source-sans-pro/source-sans-pro.css"; import "source-sans-pro/source-sans-pro.css";
import "styles/pygments.scss"; import "styles/pygments.scss";

2
static/js/popovers.js
View File

@@ -1,4 +1,4 @@
var confirmDatePlugin = require("node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js"); var confirmDatePlugin = require("flatpickr/dist/plugins/confirmDate/confirmDate.js");
var popovers = (function () { var popovers = (function () {

2
static/third/katex/cli.js
View File

@@ -39,7 +39,7 @@ try {
katex = require("/home/zulip/prod-static/min/katex.js"); katex = require("/home/zulip/prod-static/min/katex.js");
} catch (ex) { } catch (ex) {
// Import KaTeX from node_modules (development environment) otherwise // Import KaTeX from node_modules (development environment) otherwise
katex = require("../../node_modules/katex/dist/katex.js"); katex = require("katex/dist/katex.js");
} }
let input = ""; let input = "";

40
tools/webpack.assets.json
View File

@@ -1,12 +1,12 @@
{ {
"activity": [ "activity": [
"./node_modules/sorttable/sorttable.js", "sorttable/sorttable.js",
"./static/js/analytics/activity.js", "./static/js/analytics/activity.js",
"./static/styles/portico/activity.scss" "./static/styles/portico/activity.scss"
], ],
"archive": [ "archive": [
"./node_modules/xdate/src/xdate.js", "xdate/src/xdate.js",
"./node_modules/handlebars/dist/handlebars.runtime.js", "handlebars/dist/handlebars.runtime.js",
"./static/js/archive.js", "./static/js/archive.js",
"./static/js/colorspace.js", "./static/js/colorspace.js",
"./static/js/floating_recipient_bar.js", "./static/js/floating_recipient_bar.js",
@@ -19,7 +19,7 @@
"billing": [ "billing": [
"./static/js/billing/helpers.js", "./static/js/billing/helpers.js",
"./static/js/billing/billing.js", "./static/js/billing/billing.js",
"./node_modules/handlebars/dist/handlebars.runtime.js", "handlebars/dist/handlebars.runtime.js",
"./static/js/templates.js", "./static/js/templates.js",
"./static/templates/compiled.js", "./static/templates/compiled.js",
"./static/js/loading.js", "./static/js/loading.js",
@@ -28,7 +28,7 @@
"upgrade": [ "upgrade": [
"./static/js/billing/helpers.js", "./static/js/billing/helpers.js",
"./static/js/billing/upgrade.js", "./static/js/billing/upgrade.js",
"./node_modules/handlebars/dist/handlebars.runtime.js", "handlebars/dist/handlebars.runtime.js",
"./static/js/templates.js", "./static/js/templates.js",
"./static/templates/compiled.js", "./static/templates/compiled.js",
"./static/js/loading.js", "./static/js/loading.js",
@@ -45,31 +45,31 @@
"string.prototype.endswith", "string.prototype.endswith",
"string.prototype.startswith", "string.prototype.startswith",
"string.prototype.codepointat", "string.prototype.codepointat",
"./node_modules/jquery/dist/jquery.js", "jquery/dist/jquery.js",
"./node_modules/underscore/underscore.js", "underscore/underscore.js",
"./static/js/csrf.js", "./static/js/csrf.js",
"./static/js/blueslip.js", "./static/js/blueslip.js",
"./static/third/bootstrap/js/bootstrap.js", "./static/third/bootstrap/js/bootstrap.js",
"./static/js/common.js", "./static/js/common.js",
"./node_modules/moment/min/moment.min.js", "moment/min/moment.min.js",
"./node_modules/moment-timezone/builds/moment-timezone-with-data.min.js", "moment-timezone/builds/moment-timezone-with-data.min.js",
"./node_modules/sortablejs/Sortable.js", "sortablejs/Sortable.js",
"./static/third/bootstrap/css/bootstrap.css", "./static/third/bootstrap/css/bootstrap.css",
"./static/third/bootstrap/css/bootstrap-btn.css", "./static/third/bootstrap/css/bootstrap-btn.css",
"./static/third/bootstrap/css/bootstrap-responsive.css", "./static/third/bootstrap/css/bootstrap-responsive.css",
"./node_modules/simplebar/dist/simplebar.css", "simplebar/dist/simplebar.css",
"./node_modules/font-awesome/css/font-awesome.css", "font-awesome/css/font-awesome.css",
"./static/generated/icons/style.css", "./static/generated/icons/style.css",
"./node_modules/source-sans-pro/source-sans-pro.css", "source-sans-pro/source-sans-pro.css",
"./static/styles/pygments.scss" "./static/styles/pygments.scss"
], ],
"help": [ "help": [
"./node_modules/simplebar/dist/simplebar.css", "simplebar/dist/simplebar.css",
"./node_modules/simplebar/dist/simplebar.js", "simplebar/dist/simplebar.js",
"./static/js/portico/help.js", "./static/js/portico/help.js",
"./static/js/portico/tabbed-instructions.js" "./static/js/portico/tabbed-instructions.js"
], ],
"katex": "./node_modules/katex/dist/katex.min.js", "katex": "katex/dist/katex.min.js",
"landing-page": [ "landing-page": [
"./static/js/portico/landing-page.js", "./static/js/portico/landing-page.js",
"./static/styles/portico/landing-page.scss" "./static/styles/portico/landing-page.scss"
@@ -80,7 +80,7 @@
"./static/styles/portico/integrations.scss" "./static/styles/portico/integrations.scss"
], ],
"signup": [ "signup": [
"./node_modules/jquery-validation/dist/jquery.validate.min.js", "jquery-validation/dist/jquery.validate.min.js",
"./static/js/portico/signup.js" "./static/js/portico/signup.js"
], ],
"support": [ "support": [
@@ -100,13 +100,13 @@
"stats": [ "stats": [
"./static/styles/portico/stats.scss", "./static/styles/portico/stats.scss",
"./static/js/stats/stats.js", "./static/js/stats/stats.js",
"./node_modules/plotly.js/dist/plotly-basic.min.js" "plotly.js/dist/plotly-basic.min.js"
], ],
"translations": "./static/js/translations.js", "translations": "./static/js/translations.js",
"zxcvbn": "./node_modules/zxcvbn/dist/zxcvbn.js", "zxcvbn": "zxcvbn/dist/zxcvbn.js",
"app": "./static/js/bundles/app.js", "app": "./static/js/bundles/app.js",
"archive-styles": [ "archive-styles": [
"./node_modules/katex/dist/katex.css", "katex/dist/katex.css",
"./static/styles/zulip.scss", "./static/styles/zulip.scss",
"./static/styles/media.scss", "./static/styles/media.scss",
"./static/styles/portico/archive.scss" "./static/styles/portico/archive.scss"

20
tools/webpack.config.ts
View File

@@ -125,22 +125,22 @@ export default (env?: string): webpack.Configuration => {
// Use the unminified versions of jquery and underscore so that // Use the unminified versions of jquery and underscore so that
// Good error messages show up in production and development in the source maps // Good error messages show up in production and development in the source maps
var exposeOptions = [ var exposeOptions = [
{ path: "../node_modules/blueimp-md5/js/md5.js" }, { path: "blueimp-md5/js/md5.js" },
{ path: "../node_modules/clipboard/dist/clipboard.js", name: "ClipboardJS" }, { path: "clipboard/dist/clipboard.js", name: "ClipboardJS" },
{ path: "../node_modules/xdate/src/xdate.js", name: "XDate" }, { path: "xdate/src/xdate.js", name: "XDate" },
{ path: "../node_modules/simplebar/dist/simplebar.js"}, { path: "simplebar/dist/simplebar.js"},
{ path: "../static/third/marked/lib/marked.js" }, { path: "../static/third/marked/lib/marked.js" },
{ path: "../static/generated/emoji/emoji_codes.js" }, { path: "../static/generated/emoji/emoji_codes.js" },
{ path: "../static/generated/pygments_data.js" }, { path: "../static/generated/pygments_data.js" },
{ path: "../static/js/debug.js" }, { path: "../static/js/debug.js" },
{ path: "../static/js/blueslip.js" }, { path: "../static/js/blueslip.js" },
{ path: "../static/js/common.js" }, { path: "../static/js/common.js" },
{ path: "../node_modules/jquery/dist/jquery.js", name: ['$', 'jQuery'] }, { path: "jquery/dist/jquery.js", name: ['$', 'jQuery'] },
{ path: "../node_modules/underscore/underscore.js", name: '_' }, { path: "underscore/underscore.js", name: '_' },
{ path: "../node_modules/handlebars/dist/handlebars.runtime.js", name: 'Handlebars' }, { path: "handlebars/dist/handlebars.runtime.js", name: 'Handlebars' },
{ path: "../node_modules/to-markdown/dist/to-markdown.js", name: 'toMarkdown' }, { path: "to-markdown/dist/to-markdown.js", name: 'toMarkdown' },
{ path: "../node_modules/sortablejs/Sortable.js"}, { path: "sortablejs/Sortable.js"},
{ path: "../node_modules/winchan/winchan.js", name: 'WinChan'}, { path: "winchan/winchan.js", name: 'WinChan'},
]; ];
config.module.rules.push(...getExposeLoaders(exposeOptions)); config.module.rules.push(...getExposeLoaders(exposeOptions));