mirror of https://github.com/zulip/zulip.git
deps: Upgrade and move `underscore.js` from `static/third` to `npm`
- Remove `underscore.js` from `static/third` and fetch it from `npm`. - Upgrade `underscore.js` to 1.8.3. - Bump up the `PROVISION_VERSION` to 4.2. Part of #1709
This commit is contained in:
parent
911fcd3831
commit
84e802422e
|
@ -187,11 +187,6 @@ Files: static/third/spectrum/*
|
||||||
Copyright: 2013 Brian Grinstead
|
Copyright: 2013 Brian Grinstead
|
||||||
License: Expat
|
License: Expat
|
||||||
|
|
||||||
Files: static/third/underscore/underscore.js
|
|
||||||
Copyright: 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
|
|
||||||
License: Expat
|
|
||||||
Comment: https://github.com/jashkenas/underscore/blob/master/LICENSE
|
|
||||||
|
|
||||||
Files: static/third/xdate/*
|
Files: static/third/xdate/*
|
||||||
Copyright: 2010 C. F., Wong
|
Copyright: 2010 C. F., Wong
|
||||||
License: Expat
|
License: Expat
|
||||||
|
|
|
@ -91,7 +91,7 @@ For all the modules where you want to run actual code, add a statement
|
||||||
like the following to the top of your test file:
|
like the following to the top of your test file:
|
||||||
|
|
||||||
> add_dependencies({
|
> add_dependencies({
|
||||||
> _: 'third/underscore/underscore.js',
|
> _: 'node_modules/underscore/underscore.js',
|
||||||
> util: 'js/util.js',
|
> util: 'js/util.js',
|
||||||
> Dict: 'js/dict.js',
|
> Dict: 'js/dict.js',
|
||||||
> Handlebars: 'handlebars',
|
> Handlebars: 'handlebars',
|
||||||
|
@ -165,4 +165,3 @@ asserts, the *actual* value comes first, the *expected* value second.
|
||||||
|
|
||||||
The test runner (`index.js`) automatically runs all .js files in the
|
The test runner (`index.js`) automatically runs all .js files in the
|
||||||
frontend\_tests/node directory.
|
frontend\_tests/node directory.
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
var _ = require('third/underscore/underscore.js');
|
var _ = require('node_modules/underscore/underscore.js');
|
||||||
var MessageListView = require('js/message_list_view.js');
|
var MessageListView = require('js/message_list_view.js');
|
||||||
|
|
||||||
add_dependencies({
|
add_dependencies({
|
||||||
|
|
|
@ -2,7 +2,7 @@ var finder = (function () {
|
||||||
|
|
||||||
var exports = {};
|
var exports = {};
|
||||||
|
|
||||||
var _ = require('third/underscore/underscore.js');
|
var _ = require('node_modules/underscore/underscore.js');
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var path = require('path');
|
var path = require('path');
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ global.assert = require('assert');
|
||||||
require('node_modules/string.prototype.codepointat/codepointat.js');
|
require('node_modules/string.prototype.codepointat/codepointat.js');
|
||||||
|
|
||||||
global.Dict = require('js/dict');
|
global.Dict = require('js/dict');
|
||||||
global._ = require('third/underscore/underscore.js');
|
global._ = require('node_modules/underscore/underscore.js');
|
||||||
var _ = global._;
|
var _ = global._;
|
||||||
|
|
||||||
// Find the files we need to run.
|
// Find the files we need to run.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
var namespace = (function () {
|
var namespace = (function () {
|
||||||
|
|
||||||
var _ = require('third/underscore/underscore.js');
|
var _ = require('node_modules/underscore/underscore.js');
|
||||||
var exports = {};
|
var exports = {};
|
||||||
|
|
||||||
var dependencies = [];
|
var dependencies = [];
|
||||||
|
|
|
@ -3,7 +3,7 @@ var render = (function () {
|
||||||
var exports = {};
|
var exports = {};
|
||||||
|
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var _ = require('third/underscore/underscore.js');
|
var _ = require('node_modules/underscore/underscore.js');
|
||||||
var Handlebars = require('handlebars');
|
var Handlebars = require('handlebars');
|
||||||
|
|
||||||
function template_dir() {
|
function template_dir() {
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
"jquery-validation": "1.15.1",
|
"jquery-validation": "1.15.1",
|
||||||
"plotly.js": "1.19.2",
|
"plotly.js": "1.19.2",
|
||||||
"string.prototype.codepointat": "0.2.0",
|
"string.prototype.codepointat": "0.2.0",
|
||||||
|
"underscore": "1.8.3",
|
||||||
"webpack": "1.12.2",
|
"webpack": "1.12.2",
|
||||||
"winchan": "0.2.0",
|
"winchan": "0.2.0",
|
||||||
"zxcvbn": "4.4.1"
|
"zxcvbn": "4.4.1"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,2 +1,2 @@
|
||||||
ZULIP_VERSION = "1.4.1+git"
|
ZULIP_VERSION = "1.4.1+git"
|
||||||
PROVISION_VERSION = '4.1'
|
PROVISION_VERSION = '4.2'
|
||||||
|
|
|
@ -729,7 +729,7 @@ JS_SPECS = {
|
||||||
'common': {
|
'common': {
|
||||||
'source_filenames': [
|
'source_filenames': [
|
||||||
'node_modules/jquery/dist/jquery.js',
|
'node_modules/jquery/dist/jquery.js',
|
||||||
'third/underscore/underscore.js',
|
'node_modules/underscore/underscore.js',
|
||||||
'js/blueslip.js',
|
'js/blueslip.js',
|
||||||
'third/bootstrap/js/bootstrap.js',
|
'third/bootstrap/js/bootstrap.js',
|
||||||
'js/common.js',
|
'js/common.js',
|
||||||
|
|
Loading…
Reference in New Issue