Set alias for Backbone

lib/build/tasks/webpack/webpack.config.js

@@ -17,10 +17,7 @@ module.exports = {
       },
       resolve: {
         symlinks: false,
-        modules: [
+        modules: require('../../../../webpack/common/modules.js'),
-          'node_modules',
-          path.resolve(path.resolve('.'), 'lib/assets/javascripts')
-        ],
         alias: require('../../../../webpack/common/alias')
       },
       module: {

npm-shrinkwrap.json

@@ -17,6 +17,18 @@
       "from": "acorn-dynamic-import@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz"
     },
+    "acorn-node": {
+      "version": "1.3.0",
+      "from": "acorn-node@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.3.0.tgz",
+      "dependencies": {
+        "acorn": {
+          "version": "5.4.1",
+          "from": "acorn@>=5.4.1 <6.0.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz"
+        }
+      }
+    },
     "ajv": {
       "version": "4.11.8",
       "from": "ajv@>=4.7.0 <5.0.0",
@@ -175,9 +187,9 @@
       "resolved": "https://registry.npmjs.org/bootstrap-colorpicker/-/bootstrap-colorpicker-2.5.0.tgz"
     },
     "brace-expansion": {
-      "version": "1.1.8",
+      "version": "1.1.9",
       "from": "brace-expansion@>=1.1.7 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz"
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.9.tgz"
     },
     "braces": {
       "version": "1.8.5",
@@ -190,9 +202,9 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"
     },
     "browser-pack": {
-      "version": "6.0.3",
+      "version": "6.0.4",
       "from": "browser-pack@>=6.0.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.4.tgz"
     },
     "browser-resolve": {
       "version": "1.11.2",
@@ -1815,9 +1827,9 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"
     },
     "syntax-error": {
-      "version": "1.3.0",
+      "version": "1.4.0",
       "from": "syntax-error@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz"
     },
     "tapable": {
       "version": "0.2.8",
@@ -1902,14 +1914,14 @@
       "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
     },
     "uglify-js": {
-      "version": "3.3.9",
+      "version": "3.3.10",
       "from": "uglify-js@>=3.3.0 <3.4.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.9.tgz",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.10.tgz",
       "dependencies": {
         "commander": {
-          "version": "2.13.0",
+          "version": "2.14.1",
-          "from": "commander@>=2.13.0 <2.14.0",
+          "from": "commander@>=2.14.1 <2.15.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz"
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz"
         },
         "source-map": {
           "version": "0.6.1",

webpack/common/alias.js

@@ -3,5 +3,6 @@ const {resolve} = require('path');
 module.exports = {
   'backbone/core-view$': resolve(resolve('.'), 'lib/assets/javascripts/vendor/backbone/core-view.js'),
   'backbone/core-model$': resolve(resolve('.'), 'lib/assets/javascripts/vendor/backbone/core-model.js'),
-  'jquery-ui$': resolve(resolve('.'), 'lib/assets/javascripts/vendor/jquery-ui.js')
+  'jquery-ui$': resolve(resolve('.'), 'lib/assets/javascripts/vendor/jquery-ui.js'),
+  'backbone': resolve(resolve('.'), 'node_modules/backbone') // Avoid two different `backbone` modules when linking `cartodb.js`
 };

webpack/common/modules.js

@@ -1,6 +1,6 @@
 const {resolve} = require('path');
 
 module.exports = [
-  resolve(resolve('.'), 'node_modules'),
+  'node_modules',
   resolve(resolve('.'), 'lib/assets/javascripts')
 ];