Merge branch '11962-assets-build-webpack' of github.com:CartoDB/cartodb into 11962-assets-build-webpack

lib/build/files/css_files.js

@@ -210,7 +210,6 @@ module.exports = css_files = {
 
   deep_insights: [
     '<%= assets_dir %>/stylesheets/deep-insights/entry.css',
-    '<%= assets_dir %>/stylesheets/deep-insights/main.css',
     '<%= assets_dir %>/stylesheets/cartodbjs_v4/entry.css'
   ],
 

lib/build/tasks/sass.js

@@ -5,11 +5,11 @@
 exports.task = function () {
   return {
     options: {
-      sourceMap: true,
-      sourceMapEmbed: true,
-      sourceMapContents: true,
+      sourceMap: false,
+      sourceMapEmbed: false,
+      sourceMapContents: false,
       includePaths: [
-        'tmp/sass/cartoassets/'
+        'node_modules/cartoassets/src/scss'
       ]
     },
     dist: {
@@ -18,9 +18,7 @@ exports.task = function () {
         cwd: 'tmp/sass/',
         src: [
           '**/*.scss',
-          '!editor/**/*',
-          'deep-insights/entry.scss',
-          'cartodbjs_v4/entry.scss'
+          '!editor/**/*'
         ],
         dest: '<%= assets_dir %>/stylesheets',
         ext: '.css'

package.json

@@ -23,10 +23,10 @@
     "browserify-shim": "3.8.12",
     "camshaft-reference": "0.32.0",
     "carto": "cartodb/carto#master",
+    "cartocolor": "4.0.0",
     "cartodb-deep-insights.js": "cartodb/deep-insights.js#master",
     "cartodb-pecan": "0.2.x",
     "cartodb.js": "CartoDB/cartodb.js#v4",
-    "cartocolor": "4.0.0",
     "clipboard": "1.6.1",
     "codemirror": "5.14.2",
     "jquery": "2.1.4",
@@ -45,7 +45,7 @@
     "bluebird": "3.5.0",
     "brfs": "^1.4.3",
     "browserify-resolutions": "1.1.0",
-    "cartoassets": "cartodb/CartoAssets#master",
+    "cartoassets": "CartoDB/CartoAssets#entry-point",
     "colors": "1.1.2",
     "csswring": "^3.0.5",
     "exports-loader": "0.6.4",
@@ -69,7 +69,7 @@
     "grunt-contrib-watch": "1.0.0",
     "grunt-exorcise": "2.1.0",
     "grunt-postcss": "0.5.5",
-    "grunt-sass": "^2.0.0",
+    "grunt-sass": "2.0.0",
     "grunt-timer": "0.3.3",
     "jasmine": "2.5.2",
     "jasmine-ajax": "git://github.com/nobuti/jasmine-ajax.git#master",