From ecf693ac750679fb1433e82bfd3931e20af2970e Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Thu, 16 Jul 2015 21:47:37 -0700
Subject: [PATCH] Change file references from `lodash.src.js` to `lodash.js`.

---
 .travis.yml           |  3 +--
 bower.json            |  1 -
 package.json          |  3 +--
 perf/asset/perf-ui.js | 30 ++++++++++++------------------
 perf/index.html       |  2 +-
 perf/perf.js          |  2 +-
 perf/run-perf.sh      |  2 +-
 test/asset/test-ui.js | 24 +++++++++---------------
 test/backbone.html    |  2 +-
 test/run-test.sh      |  4 ++--
 test/saucelabs.js     |  2 +-
 test/test.js          |  2 +-
 12 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 212a9e6d0..742acc012 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,8 +55,7 @@ before_install:
 #  - "[ $BIN != 'rhino' ] || (echo -e '#!/bin/sh\\njava -jar /opt/rhino-1.7.6/js.jar $@' | sudo tee /usr/local/bin/rhino && sudo chmod +x /usr/local/bin/rhino)"
 #  - "[ $BIN != 'ringo' ] || (wget --no-check-certificate https://lodash.com/_travis/ringojs-0.11.zip && sudo unzip ringojs-0.11 -d /opt && rm ringojs-0.11.zip)"
 #  - "[ $BIN != 'ringo' ] || (sudo ln -s /opt/ringojs-0.11/bin/ringo /usr/local/bin/ringo && sudo chmod +x $_)"
-  - "perl -pi -e 's|\"lodash\"|\"lodash-compat\"|' ./package.json"
-  - "git clone --depth=10 --branch=master git://github.com/lodash/lodash-cli ./node_modules/lodash-cli && mkdir $_/node_modules && cd $_ && ln -s ../../../ ./lodash-compat && cd ../ && npm i && cd ../../"
+  - "git clone --depth=10 --branch=master git://github.com/lodash/lodash-cli ./node_modules/lodash-cli && mkdir $_/node_modules && cd $_ && ln -s ../../../ ./lodash && cd ../ && npm i && cd ../../"
   - "node ./node_modules/lodash-cli/bin/lodash $BUILD -o ./lodash.$BUILD.js"
 script:
   - "[ $ISTANBUL == false ]   || cp ./lodash.$BUILD.js ./lodash.js"
diff --git a/bower.json b/bower.json
index 23c390577..866721a54 100644
--- a/bower.json
+++ b/bower.json
@@ -7,7 +7,6 @@
     "*.log",
     "*.map",
     "*.md",
-    "lodash.src.js",
     "component.json",
     "package.json",
     "doc",
diff --git a/package.json b/package.json
index e175f8c9a..a4081c986 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "lodash",
   "version": "3.10.1",
-  "main": "lodash.src.js",
+  "main": "lodash.js",
   "private": true,
   "devDependencies": {
     "curl-amd": "0.8.12",
@@ -20,7 +20,6 @@
       "*.log",
       "*.map",
       "*.md",
-      "lodash.src.js",
       "bower.json",
       "component.json",
       "doc",
diff --git a/perf/asset/perf-ui.js b/perf/asset/perf-ui.js
index c1a4897e5..43623ed64 100644
--- a/perf/asset/perf-ui.js
+++ b/perf/asset/perf-ui.js
@@ -58,8 +58,7 @@
     span1.innerHTML =
       '<label for="perf-build">Build: </label>' +
       '<select id="perf-build">' +
-      '<option value="lodash-compat">lodash (compat)</option>' +
-      '<option value="lodash-modern">lodash (modern)</option>' +
+      '<option value="lodash">lodash</option>' +
       '<option value="lodash-custom-dev">lodash (custom development)</option>' +
       '<option value="lodash-custom">lodash (custom production)</option>' +
       '</select>';
@@ -71,8 +70,7 @@
       '<select id="perf-other">' +
       '<option value="underscore-dev">Underscore (development)</option>' +
       '<option value="underscore">Underscore (production)</option>' +
-      '<option value="lodash-compat">lodash (compat)</option>' +
-      '<option value="lodash-modern">lodash (modern)</option>' +
+      '<option value="lodash">lodash</option>' +
       '<option value="lodash-custom-dev">lodash (custom development)</option>' +
       '<option value="lodash-custom">lodash (custom production)</option>' +
       '</select>';
@@ -86,11 +84,10 @@
 
     buildList.selectedIndex = (function() {
       switch (build) {
-        case 'lodash-compat':     return 0;
-        case 'lodash-custom-dev': return 2;
-        case 'lodash-custom':     return 3;
-        case 'lodash-modern':
-        case null:                return 1;
+        case 'lodash-custom-dev': return 1;
+        case 'lodash-custom':     return 2;
+        case 'lodash':
+        case null:                return 0;
       }
       return -1;
     }());
@@ -98,10 +95,9 @@
     otherList.selectedIndex = (function() {
       switch (other) {
         case 'underscore-dev':    return 0;
-        case 'lodash-compat':     return 2;
-        case 'lodash-modern':     return 3;
-        case 'lodash-custom-dev': return 4;
-        case 'lodash-custom':     return 5;
+        case 'lodash':            return 2;
+        case 'lodash-custom-dev': return 3;
+        case 'lodash-custom':     return 4;
         case 'underscore':
         case null:                return 1;
       }
@@ -116,11 +112,10 @@
   ui.buildPath = (function() {
     var result;
     switch (build) {
-      case 'lodash-compat':     result = 'lodash.compat.min.js'; break;
       case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
       case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
-      case null:                build  = 'lodash-modern';
-      case 'lodash-modern':     result = 'lodash.min.js'; break;
+      case null:                build  = 'lodash';
+      case 'lodash':            result = 'lodash.min.js'; break;
       default:                  return build;
     }
     return basePath + result;
@@ -130,8 +125,7 @@
   ui.otherPath = (function() {
     var result;
     switch (other) {
-      case 'lodash-compat':     result = 'lodash.compat.min.js'; break;
-      case 'lodash-modern':     result = 'lodash.min.js'; break;
+      case 'lodash':            result = 'lodash.min.js'; break;
       case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
       case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
       case 'underscore-dev':    result = 'vendor/underscore/underscore.js'; break;
diff --git a/perf/index.html b/perf/index.html
index b5cd14fbe..0f5ed640a 100644
--- a/perf/index.html
+++ b/perf/index.html
@@ -29,7 +29,7 @@
   <body>
     <div id="perf-toolbar"></div>
     <script src="../node_modules/platform/platform.js"></script>
-    <script src="../lodash.src.js"></script>
+    <script src="../lodash.js"></script>
     <script src="../vendor/benchmark.js/benchmark.js"></script>
     <script src="../vendor/firebug-lite/src/firebug-lite-debug.js"></script>
     <script src="./asset/perf-ui.js"></script>
diff --git a/perf/perf.js b/perf/perf.js
index da375fbb7..27b291dba 100644
--- a/perf/perf.js
+++ b/perf/perf.js
@@ -38,7 +38,7 @@
       result = params;
     }
     var last = result[result.length - 1];
-    result = (result.length > min && !/perf(?:\.js)?$/.test(last)) ? last : '../lodash.src.js';
+    result = (result.length > min && !/perf(?:\.js)?$/.test(last)) ? last : '../lodash.js';
 
     if (!amd) {
       try {
diff --git a/perf/run-perf.sh b/perf/run-perf.sh
index c219fd18a..eaa63ae4c 100755
--- a/perf/run-perf.sh
+++ b/perf/run-perf.sh
@@ -6,7 +6,7 @@ node perf.js ../lodash.js && node perf.js ../lodash.min.js
 for cmd in rhino "rhino -require" narwhal ringo phantomjs; do
   echo ""
   echo "Running performance suite in $cmd..."
-  $cmd perf.js ../lodash.src.js
+  $cmd perf.js ../lodash.min.js
 done
 
 echo ""
diff --git a/test/asset/test-ui.js b/test/asset/test-ui.js
index f5b9eed2b..c3167c5f1 100644
--- a/test/asset/test-ui.js
+++ b/test/asset/test-ui.js
@@ -64,12 +64,10 @@
 
       buildList.selectedIndex = (function() {
         switch (build) {
-          case 'lodash-compat':     return 1;
-          case 'lodash-modern-dev': return 2;
-          case 'lodash-modern':     return 3;
-          case 'lodash-custom-dev': return 4;
-          case 'lodash-custom':     return 5;
-          case 'lodash-compat-dev':
+          case 'lodash':            return 1;
+          case 'lodash-custom-dev': return 2;
+          case 'lodash-custom':     return 3;
+          case 'lodash-dev':
           case null:                return 0;
         }
         return -1;
@@ -95,10 +93,8 @@
     span1.innerHTML =
       '<label for="qunit-build">Build: </label>' +
       '<select id="qunit-build">' +
-      '<option value="lodash-compat-dev">lodash (compat development)</option>' +
-      '<option value="lodash-compat">lodash (compat production)</option>' +
-      '<option value="lodash-modern-dev">lodash (modern development)</option>' +
-      '<option value="lodash-modern">lodash (modern production)</option>' +
+      '<option value="lodash-dev">lodash (development)</option>' +
+      '<option value="lodash">lodash (production)</option>' +
       '<option value="lodash-custom-dev">lodash (custom development)</option>' +
       '<option value="lodash-custom">lodash (custom production)</option>' +
       '</select>';
@@ -140,13 +136,11 @@
   ui.buildPath = (function() {
     var result;
     switch (build) {
-      case 'lodash-compat':     result = 'lodash.compat.min.js'; break;
-      case 'lodash-modern-dev': result = 'lodash.js'; break;
-      case 'lodash-modern':     result = 'lodash.min.js'; break;
+      case 'lodash':            result = 'lodash.min.js'; break;
       case 'lodash-custom-dev': result = 'lodash.custom.js'; break;
       case 'lodash-custom':     result = 'lodash.custom.min.js'; break;
-      case null:                build  = 'lodash-compat-dev';
-      case 'lodash-compat-dev': result = 'lodash.src.js'; break;
+      case null:                build  = 'lodash-dev';
+      case 'lodash-dev':        result = 'lodash.js'; break;
       default:                  return build;
     }
     return basePath + result;
diff --git a/test/backbone.html b/test/backbone.html
index b01da499e..6c037bb1a 100644
--- a/test/backbone.html
+++ b/test/backbone.html
@@ -22,7 +22,7 @@
     <script src="../vendor/json-js/json2.js"></script>
     <script src="../node_modules/platform/platform.js"></script>
     <script src="./asset/test-ui.js"></script>
-    <script src="../lodash.src.js"></script>
+    <script src="../lodash.js"></script>
     <script>
       var mixinPrereqs = (function() {
         var lodash = _.noConflict();
diff --git a/test/run-test.sh b/test/run-test.sh
index 44346ea1e..e828d926d 100644
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -1,12 +1,12 @@
 cd "$(dirname "$0")"
 
 echo "Testing in node..."
-node test.js ../lodash.src.js
+node test.js ../lodash.js
 
 for cmd in rhino "rhino -require" ringo phantomjs; do
   echo ""
   echo "Testing in $cmd..."
-  $cmd test.js ../lodash.src.js
+  $cmd test.js ../lodash.js
 done
 
 echo ""
diff --git a/test/saucelabs.js b/test/saucelabs.js
index b6f6de769..5d597a225 100644
--- a/test/saucelabs.js
+++ b/test/saucelabs.js
@@ -17,7 +17,7 @@ var EventEmitter = require('events').EventEmitter,
     util = require('util');
 
 /** Load other modules. */
-var _ = require('../lodash.src.js'),
+var _ = require('../lodash.js'),
     chalk = require('chalk'),
     ecstatic = require('ecstatic'),
     request = require('request'),
diff --git a/test/test.js b/test/test.js
index f2dc2e176..29f0e24ac 100644
--- a/test/test.js
+++ b/test/test.js
@@ -92,7 +92,7 @@
       result = params;
     }
     var last = result[result.length - 1];
-    result = (result.length > min && !/test(?:\.js)?$/.test(last)) ? last : '../lodash.src.js';
+    result = (result.length > min && !/test(?:\.js)?$/.test(last)) ? last : '../lodash.js';
 
     if (!amd) {
       try {