Remove underscore

.circleci/config.yml

@@ -360,7 +360,7 @@ jobs:
           path: ./tmp/results
       - persist_to_workspace:
           root: .
-          paths: ./tmp/results/junit
+          paths: [./tmp/results/junit]
       - store_artifacts:
           path: ./tmp/results
       - store_artifacts:

docs/_config.yml

@@ -74,7 +74,6 @@ sidebar_categories:
     - packages/random
     - packages/server-render
     - packages/spacebars
-    - packages/underscore
     - packages/url
     - packages/webapp
   Command Line:

packages/boilerplate-generator-tests/package.js

@@ -14,7 +14,6 @@ Npm.depends({
 Package.onTest(function (api) {
   api.use('ecmascript');
   api.use([
-    'underscore',
     'tinytest',
     'boilerplate-generator'
   ], 'server');

packages/boilerplate-generator-tests/web.browser-tests.js

@@ -1,6 +1,6 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
+
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.browser - basic output",
@@ -66,10 +66,6 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch("web.browser", false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
-
     test.matches(newHtml, /foo="foobar"/);
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);

packages/boilerplate-generator-tests/web.cordova-tests.js

@@ -1,6 +1,6 @@
 import { parse, serialize } from 'parse5';
 import { generateHTMLForArch } from './test-lib';
-import { _ } from 'meteor/underscore';
+
 
 Tinytest.addAsync(
   "boilerplate-generator-tests - web.cordova - basic output",
@@ -60,9 +60,6 @@ Tinytest.addAsync(
   async function (test) {
     const newHtml = await generateHTMLForArch('web.cordova', false);
 
-    _.templateSettings = {
-      interpolate: /\{\{(.+?)\}\}/g
-    };
     test.matches(newHtml, /<link[^<>]*href="[^<>]*bootstrap[^<>]*">/);
     test.matches(newHtml, /<script[^<>]*src="[^<>]*templating[^<>]*">/);
     test.matches(newHtml, /<script>var a/);

packages/boilerplate-generator/package.js

@@ -4,12 +4,12 @@ Package.describe({
 });
 
 Npm.depends({
-  "combined-stream2": "1.1.2"
+  "combined-stream2": "1.1.2",
+  "lodash.escape": "4.0.1"
 });
 
 Package.onUse(api => {
   api.use('ecmascript');
-  api.use('underscore', 'server');
   api.mainModule('generator.js', 'server');
   api.export('Boilerplate', 'server');
 });

packages/boilerplate-generator/template.js

@@ -1,4 +1,94 @@
-import { _ } from 'meteor/underscore';
+import escape from "lodash.escape";
+
+const _ = {};
+
+_.escape = escape;
+
+_.templateSettings = {
+  evaluate: /<%([\s\S]+?)%>/g,
+  interpolate: /<%=([\s\S]+?)%>/g,
+  escape: /<%-([\s\S]+?)%>/g
+};
+
+// When customizing `templateSettings`, if you don't want to define an
+// interpolation, evaluation or escaping regex, we need one that is
+// guaranteed not to match.
+var noMatch = /(.)^/;
+
+// Certain characters need to be escaped so that they can be put into a
+// string literal.
+var escapes = {
+  "'": "'",
+  '\\': '\\',
+  '\r': 'r',
+  '\n': 'n',
+  '\t': 't',
+  '\u2028': 'u2028',
+  '\u2029': 'u2029'
+};
+
+var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
+
+// JavaScript micro-templating, similar to John Resig's implementation.
+// Underscore templating handles arbitrary delimiters, preserves whitespace,
+// and correctly escapes quotes within interpolated code.
+_.template = function (text, data, settings) {
+  var render;
+  settings = Object.assign({}, settings, _.templateSettings);
+
+  // Combine delimiters into one regular expression via alternation.
+  var matcher = new RegExp([
+    (settings.escape || noMatch).source,
+    (settings.interpolate || noMatch).source,
+    (settings.evaluate || noMatch).source
+  ].join('|') + '|$', 'g');
+
+  // Compile the template source, escaping string literals appropriately.
+  var index = 0;
+  var source = "__p+='";
+  text.replace(matcher, function (match, escape, interpolate, evaluate, offset) {
+    source += text.slice(index, offset)
+      .replace(escaper, function (match) { return '\\' + escapes[match]; });
+
+    if (escape) {
+      source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+    }
+    if (interpolate) {
+      source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+    }
+    if (evaluate) {
+      source += "';\n" + evaluate + "\n__p+='";
+    }
+    index = offset + match.length;
+    return match;
+  });
+  source += "';\n";
+
+  // If a variable is not specified, place data values in local scope.
+  if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+  source = "var __t,__p='',__j=Array.prototype.join," +
+    "print=function(){__p+=__j.call(arguments,'');};\n" +
+    source + "return __p;\n";
+
+  try {
+    render = new Function(settings.variable || 'obj', '_', source);
+  } catch (e) {
+    e.source = source;
+    throw e;
+  }
+
+  if (data) return render(data, _);
+  var template = function (data) {
+    return render.call(this, data, _);
+  };
+
+  // Provide the compiled function source as a convenience for precompilation.
+  template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
+
+  return template;
+};
+
 
 // As identified in issue #9149, when an application overrides the default
 // _.template settings using _.templateSettings, those new settings are
@@ -7,8 +97,8 @@ import { _ } from 'meteor/underscore';
 // been verified to work are overridden here on each _.template call.
 export default function template(text) {
   return _.template(text, null, {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g,
+    evaluate: /<%([\s\S]+?)%>/g,
+    interpolate: /<%=([\s\S]+?)%>/g,
+    escape: /<%-([\s\S]+?)%>/g,
   });
 };

packages/browser-policy-content/browser-policy-content.js

@@ -1,3 +1,7 @@
+const isEmpty = Npm.require('lodash.isempty');
+const has = Npm.require('lodash.has');
+const union = Npm.require('lodash.union');
+
 // By adding this package, you get the following default policy:
 // No eval or other string-to-code, and content can only be loaded from the
 // same origin as the app (except for XHRs and websocket connections, which can
@@ -56,12 +60,12 @@ BrowserPolicy.content = {};
 var parseCsp = function (csp) {
   var policies = csp.split("; ");
   cspSrcs = {};
-  _.each(policies, function (policy) {
+  policies.forEach(function (policy) {
     if (policy[policy.length - 1] === ";")
       policy = policy.substring(0, policy.length - 1);
     var srcs = policy.split(" ");
     var directive = srcs[0];
-    if (_.indexOf(srcs, keywords.none) !== -1)
+    if (srcs.indexOf(keywords.none) !== -1)
       cspSrcs[directive] = null;
     else
       cspSrcs[directive] = srcs.slice(1);
@@ -72,22 +76,24 @@ var parseCsp = function (csp) {
                     "browser-policy must specify a default-src.");
 
   // Copy default-src sources to other directives.
-  _.each(cspSrcs, function (sources, directive) {
-    cspSrcs[directive] = _.union(sources || [], cspSrcs["default-src"] || []);
+  Object.entries(cspSrcs).forEach(function ([directive, sources]) {
+    cspSrcs[directive] = union(sources || [], cspSrcs["default-src"] || []);
   });
 };
 
 var removeCspSrc = function (directive, src) {
-  cspSrcs[directive] = _.without(cspSrcs[directive] || [], src);
+  cspSrcs[directive] = (cspSrcs[directive] || []).filter(function(value) {
+    return value !== src;
+  });
 };
 
 // Prepare for a change to cspSrcs. Ensure that we have a key in the dictionary
 // and clear any cached CSP.
 var prepareForCspDirective = function (directive) {
   cspSrcs = cspSrcs || {};
   cachedCsp = null;
-  if (! _.has(cspSrcs, directive))
-    cspSrcs[directive] = _.clone(cspSrcs["default-src"]);
+  if (!has(cspSrcs, directive))
+    cspSrcs[directive] = [...cspSrcs["default-src"]];
 };
 
 // Add `src` to the list of allowed sources for `directive`, with the
@@ -100,7 +106,7 @@ var prepareForCspDirective = function (directive) {
 // - Trim trailing slashes from `src`, since some browsers interpret
 //   "foo.com/" as "foo.com" and some don't.
 var addSourceForDirective = function (directive, src) {
-  if (_.contains(_.values(keywords), src)) {
+  if (Object.values(keywords).includes(src)) {
     cspSrcs[directive].push(src);
   } else {
     var toAdd = [];
@@ -123,7 +129,7 @@ var addSourceForDirective = function (directive, src) {
       }
     }
 
-    _.each(toAdd, function (s) {
+    toAdd.forEach(function (s) {
       cspSrcs[directive].push(s);
     });
   }
@@ -148,23 +154,23 @@ var setWebAppInlineScripts = function (value) {
     WebAppInternals.setInlineScriptsAllowed(value);
 };
 
-_.extend(BrowserPolicy.content, {
+Object.assign(BrowserPolicy.content, {
   allowContentTypeSniffing: function () {
     contentSniffingAllowed = true;
   },
   // Exported for tests and browser-policy-common.
   _constructCsp: function () {
-    if (! cspSrcs || _.isEmpty(cspSrcs))
+    if (! cspSrcs || isEmpty(cspSrcs))
       return null;
 
     if (cachedCsp)
       return cachedCsp;
 
-    var header = _.map(cspSrcs, function (srcs, directive) {
+    var header = Object.entries(cspSrcs).map(function ([directive, srcs]) {
       srcs = srcs || [];
-      if (_.isEmpty(srcs))
+      if (isEmpty(srcs))
         srcs = [keywords.none];
-      var directiveCsp = _.uniq(srcs).join(" ");
+      var directiveCsp = [...new Set(srcs)].join(" ");
       return directive + " " + directiveCsp + ";";
     });
 
@@ -187,7 +193,7 @@ _.extend(BrowserPolicy.content, {
 
   _keywordAllowed: function (directive, keyword) {
     return (cspSrcs[directive] &&
-            _.indexOf(cspSrcs[directive], keyword) !== -1);
+            cspSrcs[directive].indexOf(keyword) !== -1);
   },
 
   // Helpers for creating content security policies
@@ -228,7 +234,7 @@ _.extend(BrowserPolicy.content, {
   },
   allowOriginForAll: function (origin) {
     prepareForCspDirective("default-src");
-    _.each(_.keys(cspSrcs), function (directive) {
+    Object.keys(cspSrcs).forEach(function (directive) {
       addSourceForDirective(directive, origin);
     });
   },
@@ -260,12 +266,12 @@ var resources = [
   { methodResource: "Frame", directive: "frame-src" },
   { methodResource: "FrameAncestors", directive: "frame-ancestors" }
 ];
-_.each(resources,
 function (resource) {
-  var directive = resource.directive;

-  var methodResource = resource.methodResource;

+resources.forEach(function (resource) {
+  var directive = resource.directive;
+  var methodResource = resource.methodResource;
   var allowMethodName = "allow" + methodResource + "Origin";
   var disallowMethodName = "disallow" + methodResource;
-  var allowDataMethodName = "allow" + methodResource + "DataUrl";

+  var allowDataMethodName = "allow" + methodResource + "DataUrl";
   var allowBlobMethodName = "allow" + methodResource + "BlobUrl";
   var allowSelfMethodName = "allow" + methodResource + "SameOrigin";
 
@@ -302,4 +308,4 @@ _.each(resources,
 function (resource) {
 
 setDefaultPolicy();
 
-exports.BrowserPolicy = BrowserPolicy;
+exports.BrowserPolicy = BrowserPolicy;

packages/browser-policy-content/package.js

@@ -3,9 +3,15 @@ Package.describe({
   version: "1.1.1"
 });
 
+Npm.depends({
+  'lodash.isempty': '4.4.0',
+  'lodash.has': '4.5.2',
+  'lodash.union': '4.6.0'
+})
+
 Package.onUse(function (api) {
   api.use("modules");
-  api.use(["underscore", "browser-policy-common", "webapp"], "server");
+  api.use(["browser-policy-common", "webapp"], "server");
   api.imply(["browser-policy-common"], "server");
   api.mainModule("browser-policy-content.js", "server");
 });

packages/browser-policy-framing/browser-policy-framing.js

@@ -12,7 +12,7 @@ var xFrameOptions = defaultXFrameOptions;
 const BrowserPolicy = require("meteor/browser-policy-common").BrowserPolicy;
 BrowserPolicy.framing = {};
 
-_.extend(BrowserPolicy.framing, {
+Object.assign(BrowserPolicy.framing, {
   // Exported for tests and browser-policy-common.
   _constructXFrameOptions: function () {
     return xFrameOptions;

packages/browser-policy-framing/package.js

@@ -5,7 +5,7 @@ Package.describe({
 
 Package.onUse(function (api) {
   api.use("modules");
-  api.use(["underscore", "browser-policy-common"], "server");
+  api.use(["browser-policy-common"], "server");
   api.imply(["browser-policy-common"], "server");
   api.mainModule("browser-policy-framing.js", "server");
 });