zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

split compass sass

Browse Source
pull/12065/head
Carlos Matallín 8 years ago
parent fb5b7e6f42
commit 8986017184
10 changed files with 706 additions and 732 deletions
Show Stats Download Patch File Download Diff File

311
Gruntfile.js
Unescape View File

@ -48,9 +48,7 @@ function isRunningTask (taskName, grunt) {
/** /**
* CartoDB UI assets generation * CartoDB UI assets generation
*/ */
module.exports = function(grunt) { module.exports = function(grunt) {
if (timer) timer.init(grunt); if (timer) timer.init(grunt);
var environment = grunt.option('environment') || DEVELOPMENT; var environment = grunt.option('environment') || DEVELOPMENT;
@ -82,8 +80,8 @@ module.exports = function(grunt) {
logFn && logFn(err ? new Error(err): null); logFn && logFn(err ? new Error(err): null);
}); });
} }
checkVersion('node -v', requiredNodeVersion, 'node', logFn); // checkVersion('node -v', requiredNodeVersion, 'node', logFn);
checkVersion('npm -v', requiredNpmVersion, 'npm', logFn); // checkVersion('npm -v', requiredNpmVersion, 'npm', logFn);
} }
var mustCheckNodeVersion = grunt.option('no-node-checker'); var mustCheckNodeVersion = grunt.option('no-node-checker');
@ -117,9 +115,12 @@ module.exports = function(grunt) {
var ROOT_ASSETS_DIR = './public/assets/'; var ROOT_ASSETS_DIR = './public/assets/';
var ASSETS_DIR = './public/assets/<%= pkg.version %>'; var ASSETS_DIR = './public/assets/<%= pkg.version %>';
// use grunt --environment production /**
* `grunt --environment=production`
*/
var env = './config/grunt_' + environment + '.json'; var env = './config/grunt_' + environment + '.json';
grunt.log.writeln('env: ' + env); grunt.log.writeln('env: ' + env);
if (grunt.file.exists(env)) { if (grunt.file.exists(env)) {
env = grunt.file.readJSON(env) env = grunt.file.readJSON(env)
} else { } else {
@ -170,10 +171,14 @@ module.exports = function(grunt) {
connect: require('./lib/build/tasks/connect.js').task(), connect: require('./lib/build/tasks/connect.js').task(),
availabletasks: require('./lib/build/tasks/availabletasks.js').task() availabletasks: require('./lib/build/tasks/availabletasks.js').task(),
sass: require('./lib/build/tasks/sass.js').task()
}); });
// $ grunt availabletasks /**
* `grunt availabletasks`
*/
grunt.loadNpmTasks('grunt-available-tasks'); grunt.loadNpmTasks('grunt-available-tasks');
// Load Grunt tasks // Load Grunt tasks
@ -183,20 +188,7 @@ module.exports = function(grunt) {
require('./lib/build/tasks/manifest').register(grunt, ASSETS_DIR); require('./lib/build/tasks/manifest').register(grunt, ASSETS_DIR);
// builds cdb grunt.registerTask('invalidate', 'invalidate cache', function() {
grunt.registerTask('cdb', "builds cartodb.js", function() {
var done = this.async();
require("child_process").exec('make update_cdb', function (error, stdout, stderr) {
if (error) {
grunt.log.fail('cartodb.js not updated (due to '+ stdout +", "+ stderr +")");
} else {
grunt.log.ok('cartodb.js updated');
}
done();
});
});
grunt.registerTask('invalidate', "invalidate cache", function() {
var done = this.async(); var done = this.async();
var url = require('url'); var url = require('url');
var https = require('https'); var https = require('https');
@ -222,25 +214,26 @@ module.exports = function(grunt) {
}).end(); }).end();
}); });
grunt.registerTask('config', "generates assets config for current configuration", function() { grunt.registerTask('config', 'generates assets config for current configuration', function() {
// Set assets url for static assets in our app // Set assets url for static assets in our app
var config = grunt.template.process("cdb.config.set('assets_url', '<%= env.http_path_prefix %>/assets/<%= pkg.version %>');"); var config = grunt.template.process("cdb.config.set('assets_url', '<%= env.http_path_prefix %>/assets/<%= pkg.version %>');");
config += grunt.template.process("\nconsole.log('cartodbui v<%= pkg.version %>');"); config += grunt.template.process("\nconsole.log('cartodbui v<%= pkg.version %>');");
grunt.file.write("lib/build/app_config.js", config); grunt.file.write("lib/build/app_config.js", config);
}); });
grunt.registerTask('check_release', "checks release can be done", function() { grunt.registerTask('check_release', 'checks release can be done', function() {
if (environment === DEVELOPMENT) { if (environment === DEVELOPMENT) {
grunt.log.error("you can't release running development environment"); grunt.log.error("you can't release running development environment");
return false; return false;
} }
grunt.log.ok("************************************************"); grunt.log.ok("************************************************");
grunt.log.ok(" you are going to deploy to " + env ); grunt.log.ok(" you are going to deploy to " + env );
grunt.log.ok("************************************************"); grunt.log.ok("************************************************");
}); });
grunt.event.on('watch', function(action, filepath, subtask) { grunt.event.on('watch', function(action, filepath, subtask) {
// configure copy vendor to only run on changed file // Configure copy vendor to only run on changed file
var cfg = grunt.config.get('copy.vendor'); var cfg = grunt.config.get('copy.vendor');
if (filepath.indexOf(cfg.cwd) !== -1) { if (filepath.indexOf(cfg.cwd) !== -1) {
grunt.config('copy.vendor.src', filepath.replace(cfg.cwd, '')); grunt.config('copy.vendor.src', filepath.replace(cfg.cwd, ''));
@ -249,17 +242,13 @@ module.exports = function(grunt) {
} }
var builderFiles = [ var builderFiles = [
'js_core_cartodb3', 'js_cartodb3',
'js_client_cartodb3', 'js_test_spec_cartodb3'
'js_test_spec_core_cartodb3',
'js_test_spec_client_cartodb3'
]; ];
var otherFiles = [ var otherFiles = [
'app', 'app',
'js_core_cartodb', 'js_cartodb',
'js_client_cartodb', 'js_test_jasmine_cartodb3'
'js_test_jasmine_core_cartodb3',
'js_test_jasmine_client_cartodb3'
]; ];
var COPY_PATHS = []; var COPY_PATHS = [];
@ -269,7 +258,7 @@ module.exports = function(grunt) {
COPY_PATHS = COPY_PATHS.concat(otherFiles).concat(builderFiles); COPY_PATHS = COPY_PATHS.concat(otherFiles).concat(builderFiles);
} }
// configure copy paths to only run on changed files // Configure copy paths to only run on changed files
for (var j = 0, m = COPY_PATHS.length; j < m; ++j) { for (var j = 0, m = COPY_PATHS.length; j < m; ++j) {
var copy_path = COPY_PATHS[j]; var copy_path = COPY_PATHS[j];
var files = grunt.config.get('copy.' + copy_path + '.files'); var files = grunt.config.get('copy.' + copy_path + '.files');
@ -284,10 +273,154 @@ module.exports = function(grunt) {
} }
}); });
grunt.registerTask('css', [
'copy:vendor',
'copy:app',
'compass',
'sass',
// TODO: migrate mixins to postcss
// 'postcss',
'concat:css'
]);
grunt.registerTask('run_browserify', 'Browserify task with options', function (option) {
var skipEditor = false;
var skipBuilder = false;
var skipAllSpecs = false;
var skipEditorSpecs = false;
var skipBuilderSpecs = false;
if (environment === DEVELOPMENT) {
if (!isRunningTask('test', grunt)) {
grunt.log.writeln('Skipping only Builder specs generation by browserify because we are not running the `test` task.');
skipBuilderSpecs = true;
}
if (option === 'builder') {
grunt.log.writeln('Skipping Editor assets and specs generation by browserify because we are running the `dev` task.');
skipEditor = true;
skipEditorSpecs = true;
} else {
grunt.log.writeln('Skipping Builder assets generation by browserify because we are running the `dev` task later.');
skipBuilder = true;
}
} else {
grunt.log.writeln('Skipping all specs generation by browserify because not in development environment.');
skipAllSpecs = true;
}
if (skipEditor) {
delete grunt.config.data.browserify['explore'];
delete grunt.config.data.browserify['user_feed'];
delete grunt.config.data.browserify['account'];
delete grunt.config.data.browserify['confirmation'];
delete grunt.config.data.browserify['editor'];
delete grunt.config.data.browserify['dashboard'];
delete grunt.config.data.browserify['keys'];
delete grunt.config.data.browserify['new_public_table'];
delete grunt.config.data.browserify['organization'];
delete grunt.config.data.browserify['public_dashboard'];
delete grunt.config.data.browserify['data_library'];
delete grunt.config.data.browserify['public_map'];
delete grunt.config.data.browserify['mobile_apps'];
}
if (skipBuilder) {
delete grunt.config.data.browserify['vendor_editor3'];
delete grunt.config.data.browserify['common_editor3'];
delete grunt.config.data.browserify['dataset'];
delete grunt.config.data.browserify['editor3'];
delete grunt.config.data.browserify['public_editor3'];
}
if (skipAllSpecs) {
delete grunt.config.data.browserify['test_specs_for_browserify_modules'];
delete grunt.config.data.browserify['cartodb3-specs'];
} else if (skipEditorSpecs) {
delete grunt.config.data.browserify['test_specs_for_browserify_modules'];
} else if (skipBuilderSpecs) {
delete grunt.config.data.browserify['cartodb3-specs'];
}
grunt.task.run('browserify');
});
grunt.registerTask('cdb', 'builds cartodb.js', function() {
var done = this.async();
require('child_process').exec('make update_cdb', function (error, stdout, stderr) {
if (error) {
grunt.log.fail('cartodb.js not updated (due to '+ stdout + ', ' + stderr + ')');
} else {
grunt.log.ok('cartodb.js updated');
}
done();
});
});
grunt.registerTask('copy_builder', 'Multitask with all the tasks responsible for copying builder files.', [
'copy:locale',
'copy:js_cartodb3',
'copy:js_test_spec_cartodb3'
]);
grunt.registerTask('js', [
'cdb',
'copy_builder',
'copy:js_cartodb',
'copy:js_test_jasmine_cartodb3',
'run_browserify',
'concat:js',
'jst'
]);
grunt.registerTask('prepare', [
'clean',
'config',
'js'
]);
/**
* `grunt` default task to compile Editor assets, builder assets will be compiled by `grunt dev` task.
* `grunt --environment=production` default task to compile Builder and Editor assets.
*/
grunt.registerTask('default', [
'prepare',
'css',
'manifest'
]);
grunt.registerTask('run_watch', 'All watch tasks except those that watch spec changes', function (option) {
if (option === 'builder_specs=false') {
delete grunt.config.data.watch.js_test_spec_cartodb3;
delete grunt.config.data.watch.js_test_jasmine_cartodb3;
delete grunt.config.data.watch.js_affected;
}
grunt.task.run('watch');
});
grunt.registerTask('build-jasmine-specrunners', _.chain(jasmineCfg)
.keys()
.map(function (name) {
return ['jasmine', name, 'build'].join(':');
})
.value());
grunt.registerTask('setConfig', 'Set a config property', function(name, val) { grunt.registerTask('setConfig', 'Set a config property', function(name, val) {
grunt.config.set(name, val); grunt.config.set(name, val);
}); });
/**
* `grunt dev` compile and watch Builder assets.
*/
grunt.registerTask('dev', 'Frontend development task (watch JS/CSS changes)', [
'setConfig:env.browserify_watch:true',
'run_browserify:builder',
'build-jasmine-specrunners',
// 'connect:server',
// 'run_watch:builder_specs=false'
]);
// still have to use this custom task because registerCmdTask outputs tons of warnings like: // still have to use this custom task because registerCmdTask outputs tons of warnings like:
// path/to/some/ignored/files:0:0: File ignored because of your .eslintignore file. Use --no-ignore to override. // path/to/some/ignored/files:0:0: File ignored because of your .eslintignore file. Use --no-ignore to override.
grunt.registerTask('lint', 'lint source files', function () { grunt.registerTask('lint', 'lint source files', function () {
@ -308,62 +441,17 @@ module.exports = function(grunt) {
}); });
}); });
grunt.registerTask('pre_client', [ /**
'copy:locale_core', * `grunt test`
'copy:locale_client', */
'copy:js_core_cartodb',
'copy:js_client_cartodb',
'copy:js_core_cartodb3',
'copy:js_client_cartodb3',
'copy:js_test_spec_core_cartodb3',
'copy:js_test_spec_client_cartodb3',
'copy:js_test_jasmine_core_cartodb3',
'copy:js_test_jasmine_client_cartodb3'
]);
grunt.registerTask('js', ['cdb', 'pre_client', 'run_browserify', 'concat:js', 'jst']);
grunt.registerTask('pre_default', ['clean', 'config', 'js']);
grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. For manual testing use `grunt jasmine` directly', [ grunt.registerTask('test', '(CI env) Re-build JS files and run all tests. For manual testing use `grunt jasmine` directly', [
'pre_default', 'prepare',
'jasmine:cartodbui', 'jasmine:cartodbui',
'jasmine:cartodb3', 'jasmine:cartodb3',
'lint' 'lint'
]); ]);
grunt.registerTask('editor3', [
'browserify:vendor_editor3',
'browserify:common_editor3',
'browserify:editor3',
'browserify:public_editor3'
]);
grunt.registerTask('css_editor_3', [
'copy:cartofonts',
'copy:iconfont',
'copy:cartoassets',
'copy:perfect_scrollbar',
'copy:colorpicker',
'copy:deep_insights',
'copy:cartodbjs_v4'
]);
grunt.registerTask('css', ['copy:vendor', 'css_editor_3', 'copy:app', 'compass', 'concat:css']);
grunt.registerTask('default', ['pre_default', 'css', 'manifest']);
grunt.registerTask('minimize', ['default', 'copy:js', 'exorcise', 'uglify']);
grunt.registerTask('release', ['check_release', 'minimize', 's3', 'invalidate']);
grunt.registerTask('build-jasmine-specrunners', _
.chain(jasmineCfg)
.keys()
.map(function (name) {
return ['jasmine', name, 'build'].join(':');
})
.value());
grunt.registerTask('dev', 'Typical task for frontend development (watch JS/CSS changes)', [
'setConfig:env.browserify_watch:true',
'run_browserify',
'build-jasmine-specrunners',
'connect:server',
'run_watch:builder_specs=false']);
grunt.registerTask('sourcemaps', grunt.registerTask('sourcemaps', 'generate sourcemaps, to be used w/ trackjs.com for bughunting', [
'generate sourcemaps, to be used w/ trackjs.com for bughunting', [
'setConfig:assets_dir:./tmp/sourcemaps', 'setConfig:assets_dir:./tmp/sourcemaps',
'config', 'config',
'js', 'js',
@ -372,49 +460,22 @@ module.exports = function(grunt) {
'uglify' 'uglify'
]); ]);
grunt.registerTask('run_watch', 'All watch tasks except those that watch spec changes', function (option) { grunt.registerTask('minimize', [
if (option === 'builder_specs=false') { 'default',
delete grunt.config.data.watch.js_test_spec_core_cartodb3; 'copy:js',
delete grunt.config.data.watch.js_test_spec_client_cartodb3; 'exorcise',
delete grunt.config.data.watch.js_test_jasmine_core_cartodb3; 'uglify'
delete grunt.config.data.watch.js_test_jasmine_client_cartodb3;
delete grunt.config.data.watch.js_affected;
}
grunt.task.run('watch');
});
grunt.registerTask('run_browserify', 'Browserify task with options', function (option) {
var skipAllSpecs = false;
var skipBuilderSpecs = false;
if (environment !== DEVELOPMENT) {
grunt.log.writeln('Skipping all specs generation by browserify because not in development environment.');
skipAllSpecs = true;
} else if (!isRunningTask('test', grunt)) {
grunt.log.writeln('Skipping only Builder specs generation by browserify because we are not running the `test` task.');
skipBuilderSpecs = true;
}
if (skipAllSpecs) {
delete grunt.config.data.browserify['test_specs_for_browserify_modules'];
delete grunt.config.data.browserify['cartodb3-specs'];
} else if (skipBuilderSpecs) {
delete grunt.config.data.browserify['cartodb3-specs'];
}
grunt.task.run('browserify');
});
grunt.registerTask('copy_builder', 'Multitask with all the tasks responsible for copying builder files.', [
'copy:locale_core',
'copy:locale_client',
'copy:js_core_cartodb3',
'copy:js_client_cartodb3',
'copy:js_test_spec_core_cartodb3',
'copy:js_test_spec_client_cartodb3'
]); ]);
// Affected specs section - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /**
* `grunt release`
*/
grunt.registerTask('release', [
'check_release',
'minimize',
's3',
'invalidate'
]);
grunt.registerTask('affected', 'Generate only affected specs', function () { grunt.registerTask('affected', 'Generate only affected specs', function () {
requireWebpackTask().affected.call(this, grunt); requireWebpackTask().affected.call(this, grunt);
@ -442,8 +503,6 @@ module.exports = function(grunt) {
'watch:js_affected' 'watch:js_affected'
]); ]);
// / Affected specs section - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
/** /**
* Delegate task to command line. * Delegate task to command line.
* @param {String} name - If taskname starts with npm it's run a npm script (i.e. `npm run foobar` * @param {String} name - If taskname starts with npm it's run a npm script (i.e. `npm run foobar`

2
config.rb
Unescape View File

@ -4,7 +4,7 @@
# Set this to the root of your project when deployed: # Set this to the root of your project when deployed:
http_path = "/" http_path = "/"
css_dir = "dist/css" css_dir = "dist/css"
sass_dir = "tmp/sass/" sass_dir = "tmp/sass/editor"
images_dir = "app/assets/images/" images_dir = "app/assets/images/"
#javascripts_dir = "lib/assets/javascripts" #javascripts_dir = "lib/assets/javascripts"

5
lib/build/files/browserify_files.js
Unescape View File

@ -124,7 +124,6 @@ module.exports = {
] ]
} }
}, },
common_editor3: { common_editor3: {
src: editor3Bundles.common.map(require.resolve), src: editor3Bundles.common.map(require.resolve),
dest: '<%= assets_dir %>/javascripts/common_editor3.js', dest: '<%= assets_dir %>/javascripts/common_editor3.js',
@ -138,7 +137,6 @@ module.exports = {
] ]
} }
}, },
dataset: { dataset: {
src: [ src: [
'lib/assets/javascripts/cartodb3/dataset.js' 'lib/assets/javascripts/cartodb3/dataset.js'
@ -148,7 +146,6 @@ module.exports = {
external: editor3Bundles.vendor.concat(editor3Bundles.common) external: editor3Bundles.vendor.concat(editor3Bundles.common)
} }
}, },
editor3: { editor3: {
src: [ src: [
'lib/assets/javascripts/cartodb3/editor.js' 'lib/assets/javascripts/cartodb3/editor.js'
@ -158,7 +155,6 @@ module.exports = {
external: editor3Bundles.vendor.concat(editor3Bundles.common) external: editor3Bundles.vendor.concat(editor3Bundles.common)
} }
}, },
public_editor3: { public_editor3: {
src: [ src: [
'lib/assets/javascripts/cartodb3/public_editor.js' 'lib/assets/javascripts/cartodb3/public_editor.js'
@ -171,7 +167,6 @@ module.exports = {
] ]
} }
}, },
'cartodb3-specs': { 'cartodb3-specs': {
src: [ src: [
'lib/build/source-map-support.js', 'lib/build/source-map-support.js',

3
lib/build/files/css_files.js
Unescape View File

@ -1,7 +1,5 @@
var css_files; var css_files;
module.exports = css_files = { module.exports = css_files = {
cdb: [ cdb: [
'<%= assets_dir %>/stylesheets/map/leaflet.css', '<%= assets_dir %>/stylesheets/map/leaflet.css',
'<%= assets_dir %>/stylesheets/vendor/cartodb.css' '<%= assets_dir %>/stylesheets/vendor/cartodb.css'
@ -224,7 +222,6 @@ module.exports = css_files = {
api_keys: [ api_keys: [
'<%= assets_dir %>/stylesheets/api_keys/*.css' '<%= assets_dir %>/stylesheets/api_keys/*.css'
] ]
}; };
var _all_css = []; var _all_css = [];

20
lib/build/tasks/clean.js
Unescape View File

@ -1,23 +1,21 @@
/** /**
* Clean task config * Clean task config
*/ */
exports.task = function() { exports.task = function() {
return { return {
options: { options: {
force: true force: true
}, },
src: [ dist: [
"lib/build/app_config.js", '.grunt',
".sass-cache", '.sass-cache',
"tmp/sass", 'tmp/sass',
"<%= assets_dir %>", 'lib/build/app_config.js',
".grunt", '<%= assets_dir %>',
"lib/assets/javascripts/cartodb3", 'lib/assets/javascripts/cartodb3',
"lib/assets/test/{spec,jasmine}/cartodb3", 'lib/assets/test/{spec,jasmine}/cartodb3',
"lib/assets/locale" 'lib/assets/locale'
] ]
} }
} }

11
lib/build/tasks/compass.js
Unescape View File

@ -7,19 +7,10 @@ exports.task = function () {
dist: { dist: {
options: { options: {
importPath: [ importPath: [
'tmp/sass/common',
'tmp/sass/cartoassets' 'tmp/sass/cartoassets'
], ],
sassDir: 'tmp/sass', sassDir: 'tmp/sass/editor',
cssDir: '<%= assets_dir %>/stylesheets', cssDir: '<%= assets_dir %>/stylesheets',
specify: [
'tmp/sass/**/*.scss',
'!tmp/sass/deep-insights/**/*.scss',
'tmp/sass/deep-insights/main.scss',
'tmp/sass/deep-insights/entry.scss',
'!tmp/sass/cartodbjs_v4/**/*.scss',
'tmp/sass/cartodbjs_v4/entry.scss'
],
fontsDir: '<%= assets_dir %>/fonts', fontsDir: '<%= assets_dir %>/fonts',
httpFontsPath: '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/fonts', httpFontsPath: '<%= env.http_path_prefix %>/assets/<%= pkg.version %>/fonts',

232
lib/build/tasks/copy.js
Unescape View File

@ -1,14 +1,9 @@
/** /**
* Copy task config * Copy task config
*/ */
exports.task = function (grunt) { exports.task = function (grunt) {
return { return {
// Vendor stylesheets
vendor: { vendor: {
expand: true, expand: true,
cwd: 'vendor/assets/stylesheets/', cwd: 'vendor/assets/stylesheets/',
@ -27,21 +22,24 @@
} }
}, },
cartoassets: { app: {
files: [{
expand: true,
dot: true,
cwd: 'node_modules/cartoassets/src/fonts',
src: '**/*.*',
dest: '<%= assets_dir %>/fonts/'
}, {
expand: true, expand: true,
cwd: 'node_modules/cartoassets/src/scss/', cwd: 'node_modules/cartoassets/src/scss/',
src: '**/*.scss', src: '**/*.scss',
dest: 'tmp/sass/cartoassets/' dest: 'tmp/sass/cartoassets/'
}, }, {
perfect_scrollbar: {
expand: true, expand: true,
cwd: 'node_modules/perfect-scrollbar/src/css/', cwd: 'node_modules/perfect-scrollbar/src/css/',
src: '*.scss', src: '*.scss',
dest: 'tmp/sass/deep-insights/' dest: 'tmp/sass/deep-insights/'
}, }, {
colorpicker: {
expand: true, expand: true,
cwd: 'node_modules/bootstrap-colorpicker/dist/css/', cwd: 'node_modules/bootstrap-colorpicker/dist/css/',
src: 'bootstrap-colorpicker.css', src: 'bootstrap-colorpicker.css',
@ -49,81 +47,35 @@
rename: function (dest, src) { rename: function (dest, src) {
return dest + src.replace(/\.css$/, '.scss'); return dest + src.replace(/\.css$/, '.scss');
} }
}, }, {
deep_insights: {
expand: true, expand: true,
cwd: 'node_modules/cartodb-deep-insights.js/themes/scss', cwd: 'node_modules/cartodb-deep-insights.js/themes/scss',
src: '**/*.scss', src: '**/*.scss',
dest: 'tmp/sass/deep-insights/' dest: 'tmp/sass/deep-insights/'
}, }, {
cartodbjs_v4: {
expand: true, expand: true,
cwd: 'node_modules/cartodb.js/themes/scss', cwd: 'node_modules/cartodb.js/themes/scss',
src: '**/*.scss', src: '**/*.scss',
dest: 'tmp/sass/cartodbjs_v4/' dest: 'tmp/sass/cartodbjs_v4/'
}, }, {
// TODO: remove editor
iconfont: {
expand: true,
cwd: 'node_modules/cartoassets/src/scss/',
src: 'cdb-icon-font.scss',
dest: 'tmp/sass/common/'
},
cartofonts: {
files: [{
expand: true,
dot: true,
cwd: 'node_modules/cartoassets/src/fonts',
src: '**/*.*',
dest: '<%= assets_dir %>/fonts/'
}]
},
app: {
files: [
/**
* Stylesheets
*/
// App stylesheets
{
expand: true, expand: true,
cwd: 'app/assets/stylesheets/', cwd: 'app/assets/stylesheets/editor',
src: ['**/*.css.scss', '**/*.scss'], src: ['**/*.css.scss', '**/*.scss'],
dest: 'tmp/sass/', dest: 'tmp/sass/editor/',
rename: function (dest, src) { rename: function (dest, src) {
return dest + src.replace(/\.css.scss$/, '.scss'); return dest + src.replace(/\.css.scss$/, '.scss');
} }
}, }, {
// TODO: remove editor
// Vendor stylesheets
{
expand: true, expand: true,
cwd: 'vendor/assets/stylesheets/', cwd: 'app/assets/stylesheets/builder',
src: ['**/*.css.scss', '**/*.scss'], src: ['**/*.scss'],
dest: 'tmp/sass/', dest: 'tmp/sass/builder/',
rename: function (dest, src) { rename: function (dest, src) {
return dest + src.replace(/\.css.scss$/, '.scss'); return dest + src.replace(/\.css.scss$/, '.scss');
} }
}, }, {
// Jasmine stylesheets
{
expand: true,
cwd: 'lib/assets/test/lib/jasmine-1.3.1/',
src: ['**/*.css'],
dest: 'tmp/sass/specs/',
rename: function (dest, src) {
return dest + src.replace(/\.css$/, '.scss');
}
},
// Embed stylesheets
{
expand: true, expand: true,
cwd: 'lib/assets/javascripts/cdb/themes/css/', cwd: 'lib/assets/javascripts/cdb/themes/css/',
src: ['cartodb.css'], src: ['cartodb.css'],
@ -131,10 +83,8 @@
rename: function (dest, src) { rename: function (dest, src) {
return dest + src.replace(/\.css$/, '.scss'); return dest + src.replace(/\.css$/, '.scss');
} }
}, }, {
// Client stylesheets // Client stylesheets
{
expand: true, expand: true,
cwd: 'app/assets/client/stylesheets/', cwd: 'app/assets/client/stylesheets/',
src: [ src: [
@ -145,108 +95,74 @@
rename: function (dest, src) { rename: function (dest, src) {
return dest + src.replace(/\.css.scss$/, '.scss'); return dest + src.replace(/\.css.scss$/, '.scss');
} }
}, }, {
/**
* Images
*/
// public images
{
expand: true, expand: true,
cwd: 'app/assets/images/', cwd: 'app/assets/images/',
src: ['**/*'], src: ['**/*'],
dest: '<%= assets_dir %>/images/' dest: '<%= assets_dir %>/images/'
}, }, {
// Some images should be placed in a unversioned folder
// some images should be placed in a unversioned folder
{
expand: true, expand: true,
cwd: 'app/assets/images/', cwd: 'app/assets/images/',
src: ['avatars/**/*', 'alphamarker.png', 'google-maps-basemap-icons/*'], src: ['avatars/**/*', 'alphamarker.png', 'google-maps-basemap-icons/*'],
dest: '<%= root_assets_dir %>/unversioned/images/' dest: '<%= root_assets_dir %>/unversioned/images/'
}, }, {
// CARTO.js images
// CartoDB.js images
{
expand: true, expand: true,
cwd: 'lib/assets/javascripts/cdb/themes/img/', cwd: 'lib/assets/javascripts/cdb/themes/img/',
src: ['**/*'], src: ['**/*'],
dest: '<%= assets_dir %>/images/themes/' dest: '<%= assets_dir %>/images/themes/'
}, }, {
// Fonts
/**
* Fonts
*/
{
expand: true, expand: true,
cwd: 'app/assets/fonts/', cwd: 'app/assets/fonts/',
src: ['*.{svg,ttf,eot,woff,woff2}'], src: ['*.{svg,ttf,eot,woff,woff2}'],
dest: '<%= assets_dir %>/fonts/' dest: '<%= assets_dir %>/fonts/'
}, }, {
// Client fonts
{
expand: true,
cwd: 'vendor/assets/fonts/',
src: ['*.{svg,ttf,eot,woff,woff2}'],
dest: '<%= assets_dir %>/fonts/'
},
// client fonts
{
expand: true, expand: true,
cwd: 'app/assets/client/fonts/', cwd: 'app/assets/client/fonts/',
src: ['*.{svg,ttf,eot,woff,woff2}'], src: ['*.{svg,ttf,eot,woff,woff2}'],
dest: '<%= assets_dir %>/fonts/' dest: '<%= assets_dir %>/fonts/'
}, }, {
// Flash
/**
* Flash
*/
{
expand: true, expand: true,
cwd: 'app/assets/flash/', cwd: 'app/assets/flash/',
src: ['**/*'], src: ['**/*'],
dest: '<%= assets_dir %>/flash/' dest: '<%= assets_dir %>/flash/'
}, }, {
// Favicons
/**
* Favicons
*/
{
expand: true, expand: true,
cwd: 'public/favicons/', cwd: 'public/favicons/',
src: ['**/*'], src: ['**/*'],
dest: '<%= assets_dir %>/favicons/' dest: '<%= assets_dir %>/favicons/'
}, }, {
// Client favicons
// client Favicons
{
expand: true, expand: true,
cwd: 'app/assets/client/favicons/', cwd: 'app/assets/client/favicons/',
src: ['**/*'], src: ['**/*'],
dest: '<%= assets_dir %>/favicons/' dest: '<%= assets_dir %>/favicons/'
}]
},
css_tests: {
expand: true,
cwd: 'lib/assets/test/lib/jasmine-1.3.1/',
src: ['**/*.css'],
dest: 'tmp/sass/specs/',
rename: function (dest, src) {
return dest + src.replace(/\.css$/, '.scss');
} }
]
}, },
js_core_cartodb: { js_cartodb: {
files: [ files: [
{ {
expand: true, expand: true,
cwd: 'lib/assets/core/javascripts/cartodb/organization/', cwd: 'lib/assets/core/javascripts/cartodb/organization/',
src: ['**/*'], src: ['**/*'],
dest: 'lib/assets/javascripts/cartodb/organization/' dest: 'lib/assets/javascripts/cartodb/organization/'
} } , {
]
},
js_client_cartodb: {
files: [
{
expand: true, expand: true,
cwd: 'lib/assets/client/javascripts/cartodb/organization/', cwd: 'lib/assets/client/javascripts/cartodb/organization/',
src: ['**/*'], src: ['**/*'],
@ -255,20 +171,14 @@
] ]
}, },
js_core_cartodb3: { js_cartodb3: {
files: [ files: [
{ {
expand: true, expand: true,
cwd: 'lib/assets/core/javascripts/cartodb3/', cwd: 'lib/assets/core/javascripts/cartodb3/',
src: ['**/*'], src: ['**/*'],
dest: 'lib/assets/javascripts/cartodb3/' dest: 'lib/assets/javascripts/cartodb3/'
} }, {
]
},
js_client_cartodb3: {
files: [
{
expand: true, expand: true,
cwd: 'lib/assets/client/javascripts/cartodb3/', cwd: 'lib/assets/client/javascripts/cartodb3/',
src: ['**/*'], src: ['**/*'],
@ -277,31 +187,14 @@
] ]
}, },
js_test_spec_core_cartodb3: { js_test_spec_cartodb3: {
files: [ files: [
{ {
expand: true, expand: true,
cwd: 'lib/assets/core/test/spec/cartodb3/', cwd: 'lib/assets/core/test/spec/cartodb3/',
src: ['**/*'], src: ['**/*'],
dest: 'lib/assets/test/spec/cartodb3/' dest: 'lib/assets/test/spec/cartodb3/'
} } , {
]
},
js_test_jasmine_core_cartodb3: {
files: [
{
expand: true,
cwd: 'lib/assets/core/test/jasmine/cartodb3/',
src: ['**/*'],
dest: 'lib/assets/test/jasmine/cartodb3/'
}
]
},
js_test_spec_client_cartodb3: {
files: [
{
expand: true, expand: true,
cwd: 'lib/assets/client/test/spec/cartodb3/', cwd: 'lib/assets/client/test/spec/cartodb3/',
src: ['**/*'], src: ['**/*'],
@ -310,9 +203,14 @@
] ]
}, },
js_test_jasmine_client_cartodb3: { js_test_jasmine_cartodb3: {
files: [ files: [
{ {
expand: true,
cwd: 'lib/assets/core/test/jasmine/cartodb3/',
src: ['**/*'],
dest: 'lib/assets/test/jasmine/cartodb3/'
} , {
expand: true, expand: true,
cwd: 'lib/assets/client/test/jasmine/cartodb3/', cwd: 'lib/assets/client/test/jasmine/cartodb3/',
src: ['**/*'], src: ['**/*'],
@ -321,20 +219,14 @@
] ]
}, },
locale_core: { locale: {
files: [ files: [
{ {
expand: true, expand: true,
cwd: 'lib/assets/core/locale/', cwd: 'lib/assets/core/locale/',
src: ['**/*'], src: ['**/*'],
dest: 'lib/assets/locale/' dest: 'lib/assets/locale/'
} }, {
]
},
locale_client: {
files: [
{
expand: true, expand: true,
cwd: 'lib/assets/client/locale/', cwd: 'lib/assets/client/locale/',
src: ['**/*'], src: ['**/*'],

2
lib/build/tasks/manifest.js
Unescape View File

@ -1,6 +1,4 @@
module.exports = { module.exports = {
task: function() { task: function() {
return {} return {}
}, },

43
lib/build/tasks/sass.js
Unescape View File

@ -0,0 +1,43 @@
/**
* Compass task config
*/
exports.task = function () {
return {
options: {
sourceMap: true,
sourceMapEmbed: true,
sourceMapContents: true,
includePaths: [
'tmp/sass/cartoassets/'
]
},
dist: {
files: [{
expand: true,
cwd: 'tmp/sass/builder/',
src: [
'**/*.scss'
],
dest: '<%= assets_dir %>/stylesheets',
ext: '.css'
}, {
expand: true,
cwd: 'tmp/sass/',
src: [
'**/*.scss',
'!builder/**/*',
'!editor/**/*',
// TODO: this can be achieved prepending the asstes with _
'!deep-insights/**/*.scss',
'deep-insights/main.scss',
'deep-insights/entry.scss',
'!cartodbjs_v4/**/*.scss',
'cartodbjs_v4/entry.scss'
],
dest: '<%= assets_dir %>/stylesheets',
ext: '.css'
}]
},
};
};

3
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "cartodb-ui", "name": "cartodb-ui",
"version": "4.6.81", "version": "4.6.81.11962.02",
"description": "CARTO UI frontend", "description": "CARTO UI frontend",
"repository": { "repository": {
"type": "git", "type": "git",
@ -69,6 +69,7 @@
"grunt-contrib-watch": "1.0.0", "grunt-contrib-watch": "1.0.0",
"grunt-exorcise": "2.1.0", "grunt-exorcise": "2.1.0",
"grunt-postcss": "0.5.5", "grunt-postcss": "0.5.5",
"grunt-sass": "^2.0.0",
"grunt-timer": "0.3.3", "grunt-timer": "0.3.3",
"jasmine": "2.5.2", "jasmine": "2.5.2",
"jasmine-ajax": "git://github.com/nobuti/jasmine-ajax.git#master", "jasmine-ajax": "git://github.com/nobuti/jasmine-ajax.git#master",

Write Preview
Loading…
Cancel
Save