From 7238988959bd584d245a72891b43123ec164c667 Mon Sep 17 00:00:00 2001 From: dima716 Date: Thu, 22 Oct 2015 21:39:16 +0300 Subject: [PATCH 1/9] =?UTF-8?q?#1:=20=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D1=83=D1=8F=20borshik=20=D0=B8=20cleancss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/env/config.js | 68 ++++++++++++++++++++++-- config/env/development.js | 57 +------------------- frontend/.enb/make.js | 9 ++-- frontend/common.blocks/page/page.bemhtml | 2 +- gulpfile.js | 19 ++++--- package.json | 4 +- 6 files changed, 80 insertions(+), 79 deletions(-) diff --git a/config/env/config.js b/config/env/config.js index a591f6d..3f2e7a4 100644 --- a/config/env/config.js +++ b/config/env/config.js @@ -2,7 +2,67 @@ var _ = require('lodash'); var config = { dev: 'development', - prod: 'production' + prod: 'production', + + /*************************************************************************** + * Set the bin path for executing plugins * + ***************************************************************************/ + bin: './node_modules/.bin/', + + /*************************************************************************** + * Set the directory for db files * + ***************************************************************************/ + directoryForDb: './db', + + /*************************************************************************** + * Set the entry point to app * + ***************************************************************************/ + appScript: 'app.js', + + /*************************************************************************** + * Set the src paths to files * + ***************************************************************************/ + src: { + libs: [ + 'frontend/libs/sails.io.js/dist/sails.io.js', + 'frontend/libs/eventemitter2/lib/eventemitter2.js' + ], + server: ['./config', './api'], + css: ['frontend/**/*.styl', + '!frontend/static/**/*', + '!frontend/*.bundles/**/*', + '!frontend/libs/**/*', + '!frontend/static/**/*' + ], + js: ['frontend/**/*.js', + '!frontend/static/**/*', + '!frontend/*.bundles/**/*' + ], + images: ['frontend/**/*.{png,jpg,gif,svg,ico}', + '!frontend/static/*', + '!frontend/*.bundles/*' + ], + bemhtmlTemplates: ['frontend/**/*.bemhtml', + '!frontend/static/**/*', + '!frontend/*.bundles/**/*' + ], + bemtreeTemplates: ['frontend/**/*.bemtree', + '!frontend/static/**/*', + '!frontend/*.bundles/**/*' + ], + }, + + /*************************************************************************** + * Set the dest paths to files * + ***************************************************************************/ + dest: { + mergedCss: 'frontend/desktop.bundles/merged/_merged.css', + finalCss: 'frontend/static/css', + mergedJs: 'frontend/desktop.bundles/merged/_merged.js', + finalJs: 'frontend/static/js', + images: 'frontend/static/images', + libs: 'frontend/static/js' + } }; process.env.PORT = process.env.PORT || 3000; @@ -11,10 +71,8 @@ config.port = process.env.PORT; process.env.BROWSER_SYNC_PORT = process.env.BROWSER_SYNC_PORT || 8090; config.browserSyncPort = process.env.BROWSER_SYNC_PORT; -process.env.NODE_ENV = process.env.NODE_ENV || config.dev; -config.env = process.env.NODE_ENV; - -console.log(process); +process.env.YENV = process.env.YENV || config.dev; +config.env = process.env.YENV; var envConfig; // require could error out if diff --git a/config/env/development.js b/config/env/development.js index db0798c..8fc32ce 100644 --- a/config/env/development.js +++ b/config/env/development.js @@ -11,63 +11,8 @@ */ module.exports = { - /*************************************************************************** - * Set the bin path for executing plugins * - ***************************************************************************/ - bin: './node_modules/.bin/', - - /*************************************************************************** - * Set the directory for db files * - ***************************************************************************/ - directoryForDb: './db', - /*************************************************************************** * Set the logging in production environment to 'debug' * ***************************************************************************/ - logLevel: 'debug', - - /*************************************************************************** - * Set the entry point to app * - ***************************************************************************/ - appScript: 'app.js', - - /*************************************************************************** - * Set the src paths to files * - ***************************************************************************/ - src: { - server: ['./config', './api'], - css: ['frontend/**/*.styl', - '!frontend/static/**/*', - '!frontend/*.bundles/**/*', - '!frontend/libs/**/*', - '!frontend/static/**/*' - ], - js: ['frontend/**/*.js', - '!frontend/static/**/*', - '!frontend/*.bundles/**/*' - ], - images: ['frontend/**/*.{png,jpg,gif,svg,ico}', - '!frontend/static/*', - '!frontend/*.bundles/*' - ], - bemhtmlTemplates: ['frontend/**/*.bemhtml', - '!frontend/static/**/*', - '!frontend/*.bundles/**/*' - ], - bemtreeTemplates: ['frontend/**/*.bemtree', - '!frontend/static/**/*', - '!frontend/*.bundles/**/*' - ], - }, - - /*************************************************************************** - * Set the dest paths to files * - ***************************************************************************/ - dest: { - mergedCss: 'frontend/desktop.bundles/merged/_merged.css', - finalCss: 'frontend/static/css', - mergedJs: 'frontend/desktop.bundles/merged/_merged.js', - finalJs: 'frontend/static/js', - images: 'frontend/static/images' - } + logLevel: 'debug' }; diff --git a/frontend/.enb/make.js b/frontend/.enb/make.js index 9a64133..812f6fe 100644 --- a/frontend/.enb/make.js +++ b/frontend/.enb/make.js @@ -45,7 +45,6 @@ if(!fs.existsSync('frontend/desktop.bundles/merged')) { } module.exports = function (config) { - config.includeConfig('enb-bem-specs'); config.module('enb-bem-specs').createConfigurator('specs').configure({ @@ -56,7 +55,6 @@ module.exports = function (config) { }); config.nodes('*.bundles/*', function (nodeConfig) { - var addTechs = [ // essential (begin) // config levels @@ -181,7 +179,7 @@ module.exports = function (config) { ], [ tech.borschik, - { sourceTarget : '?.css', destTarget : '_?.css', tech : 'cleancss', freeze : true, minify : true } + { sourceTarget : '?.css', destTarget : '_?.css', tech : 'cleancss', freeze : true, minify : false } ] ]); }); @@ -214,9 +212,8 @@ function getLevels(config) { { path : 'libs/bem-components/desktop.blocks', check : false }, { path : 'libs/bem-components/design/common.blocks', check : false }, { path : 'libs/bem-components/design/desktop.blocks', check : false }, - { path : 'libs.blocks', check : true }, - { path : 'common.blocks', check : true }, - { path : 'desktop.blocks', check : true } + { path : 'desktop.blocks', check : true }, + { path : 'common.blocks', check : true } ]; } diff --git a/frontend/common.blocks/page/page.bemhtml b/frontend/common.blocks/page/page.bemhtml index bd99803..ebdc4b3 100644 --- a/frontend/common.blocks/page/page.bemhtml +++ b/frontend/common.blocks/page/page.bemhtml @@ -7,7 +7,7 @@ block('page')( process.env.BROWSER_SYNC_PORT + '/browser-sync/browser-sync-client.2.9.11.js'; - if(process.env.NODE_ENV === 'development') { + if(process.env.YENV === 'development') { content.push({ elem : 'js', url : url diff --git a/gulpfile.js b/gulpfile.js index 32a16e7..8f120da 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,6 +7,8 @@ var flatten = require('gulp-flatten'); var runSequence = require('run-sequence'); var browserSync = require('browser-sync').create(); var stylint = require('gulp-stylint'); +var minifyCss = require('gulp-minify-css'); +var gulpif = require('gulp-if'); var config = require('./config/env/config'); /*************************************************************************** @@ -35,6 +37,10 @@ gulp.task('nodemon-restart', function(){ /*************************************************************************** * Copy tasks * ***************************************************************************/ +gulp.task('copy-libs', function(){ + return gulp.src(config.src.libs) + .pipe(gulp.dest(config.dest.libs)); +}); gulp.task('copy-images', function(){ return gulp.src(config.src.images) @@ -46,6 +52,7 @@ gulp.task('copy-css', function(){ return gulp.src(config.dest.mergedCss) .pipe(replace(/(url\([',"]?(.*[\/]{1})?(.*\.(png|jpg|gif|svg))[',"]?\))/g, 'url("../images/$3")')) .pipe(flatten()) + .pipe(gulpif(config.env === 'production', minifyCss())) .pipe(gulp.dest(config.dest.finalCss)); }); @@ -55,7 +62,7 @@ gulp.task('copy-js', function(){ .pipe(gulp.dest(config.dest.finalJs)); }); -gulp.task('copy-files', ['copy-js', 'copy-css', 'copy-images']); +gulp.task('copy-files', ['copy-libs', 'copy-js', 'copy-css', 'copy-images']); /*************************************************************************** * Mongo tasks * @@ -122,10 +129,6 @@ gulp.task('browser-reload', function(){ * Other tasks * ***************************************************************************/ -gulp.task('run-app', shell.task([ - 'node app.js --prod' -])); - gulp.task('watch', function(){ gulp.watch(config.src.images, function(){ runSequence('copy-images', 'browser-reload'); @@ -145,7 +148,7 @@ gulp.task('watch', function(){ gulp.watch(config.src.js, function(){ runSequence('jslint', 'enb-no-cache', 'copy-js', 'browser-reload'); - }); + }); }); /*************************************************************************** @@ -156,8 +159,4 @@ gulp.task('dev', function(){ runSequence('lint', 'enb-no-cache', 'copy-files', 'server', 'browser-sync', 'watch'); }); -gulp.task('prod', function(){ - runSequence('enb-no-cache', 'copy-files', 'run-app'); -}); - gulp.task('default', ['mongo', 'dev']); diff --git a/package.json b/package.json index f57ce07..7bfc364 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "enb-bem": "0.1.0-beta2", "enb-bem-specs": "^0.6.0", "enb-bemxjst": "^1.3.2", - "enb-borschik": "^1.1.1", + "enb-borschik": "2.1.0", "enb-diverse-js": "^0.1.0", "enb-magic-factory": "^0.4.4", "enb-modules": "^0.2.0", @@ -83,7 +83,9 @@ "faker": "^2.1.2", "git-hooks": "^1.0.0", "grunt": "^0.4.5", + "gulp-if": "^2.0.0", "gulp-jshint": "^1.11.2", + "gulp-minify-css": "^1.2.1", "gulp-stylint": "^2.0.0", "jscs": "^1.11.2", "jscs-bem": "^0.2.0", From 995a02ce5cd9de137466aebfa5ab923e3adfc203 Mon Sep 17 00:00:00 2001 From: dima716 Date: Thu, 22 Oct 2015 21:40:53 +0300 Subject: [PATCH 2/9] =?UTF-8?q?#1:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B9=20=D1=83=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D0=BD=D1=8C=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=BD=D0=B8=D1=8F=20libs.blocks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../emoji-lib/_type/emoji-lib_type_twemoji.deps.js | 0 .../emoji-lib/_type/emoji-lib_type_twemoji.js | 0 .../eventemitter2/eventemitter2.deps.js | 0 .../eventemitter2/eventemitter2.js | 0 .../jquery/__textcomplete/jquery__textcomplete.deps.js | 0 .../jquery/__textcomplete/jquery__textcomplete.js | 0 .../socket-io/__config/socket-io__config.js | 2 -- .../socket-io/socket-io.deps.js | 0 .../{libs.blocks => desktop.blocks}/socket-io/socket-io.js | 7 ++++++- frontend/{libs.blocks => desktop.blocks}/toastr/toastr.css | 0 .../{libs.blocks => desktop.blocks}/toastr/toastr.deps.js | 0 frontend/{libs.blocks => desktop.blocks}/toastr/toastr.js | 0 frontend/libs.blocks/libs/libs.deps.js | 6 ------ frontend/static/js/sails.io.js | 2 +- 14 files changed, 7 insertions(+), 10 deletions(-) rename frontend/{libs.blocks => desktop.blocks}/emoji-lib/_type/emoji-lib_type_twemoji.deps.js (100%) rename frontend/{libs.blocks => desktop.blocks}/emoji-lib/_type/emoji-lib_type_twemoji.js (100%) rename frontend/{libs.blocks => desktop.blocks}/eventemitter2/eventemitter2.deps.js (100%) rename frontend/{libs.blocks => desktop.blocks}/eventemitter2/eventemitter2.js (100%) rename frontend/{libs.blocks => desktop.blocks}/jquery/__textcomplete/jquery__textcomplete.deps.js (100%) rename frontend/{libs.blocks => desktop.blocks}/jquery/__textcomplete/jquery__textcomplete.js (100%) rename frontend/{libs.blocks => desktop.blocks}/socket-io/__config/socket-io__config.js (99%) rename frontend/{libs.blocks => desktop.blocks}/socket-io/socket-io.deps.js (100%) rename frontend/{libs.blocks => desktop.blocks}/socket-io/socket-io.js (70%) rename frontend/{libs.blocks => desktop.blocks}/toastr/toastr.css (100%) rename frontend/{libs.blocks => desktop.blocks}/toastr/toastr.deps.js (100%) rename frontend/{libs.blocks => desktop.blocks}/toastr/toastr.js (100%) delete mode 100644 frontend/libs.blocks/libs/libs.deps.js diff --git a/frontend/libs.blocks/emoji-lib/_type/emoji-lib_type_twemoji.deps.js b/frontend/desktop.blocks/emoji-lib/_type/emoji-lib_type_twemoji.deps.js similarity index 100% rename from frontend/libs.blocks/emoji-lib/_type/emoji-lib_type_twemoji.deps.js rename to frontend/desktop.blocks/emoji-lib/_type/emoji-lib_type_twemoji.deps.js diff --git a/frontend/libs.blocks/emoji-lib/_type/emoji-lib_type_twemoji.js b/frontend/desktop.blocks/emoji-lib/_type/emoji-lib_type_twemoji.js similarity index 100% rename from frontend/libs.blocks/emoji-lib/_type/emoji-lib_type_twemoji.js rename to frontend/desktop.blocks/emoji-lib/_type/emoji-lib_type_twemoji.js diff --git a/frontend/libs.blocks/eventemitter2/eventemitter2.deps.js b/frontend/desktop.blocks/eventemitter2/eventemitter2.deps.js similarity index 100% rename from frontend/libs.blocks/eventemitter2/eventemitter2.deps.js rename to frontend/desktop.blocks/eventemitter2/eventemitter2.deps.js diff --git a/frontend/libs.blocks/eventemitter2/eventemitter2.js b/frontend/desktop.blocks/eventemitter2/eventemitter2.js similarity index 100% rename from frontend/libs.blocks/eventemitter2/eventemitter2.js rename to frontend/desktop.blocks/eventemitter2/eventemitter2.js diff --git a/frontend/libs.blocks/jquery/__textcomplete/jquery__textcomplete.deps.js b/frontend/desktop.blocks/jquery/__textcomplete/jquery__textcomplete.deps.js similarity index 100% rename from frontend/libs.blocks/jquery/__textcomplete/jquery__textcomplete.deps.js rename to frontend/desktop.blocks/jquery/__textcomplete/jquery__textcomplete.deps.js diff --git a/frontend/libs.blocks/jquery/__textcomplete/jquery__textcomplete.js b/frontend/desktop.blocks/jquery/__textcomplete/jquery__textcomplete.js similarity index 100% rename from frontend/libs.blocks/jquery/__textcomplete/jquery__textcomplete.js rename to frontend/desktop.blocks/jquery/__textcomplete/jquery__textcomplete.js diff --git a/frontend/libs.blocks/socket-io/__config/socket-io__config.js b/frontend/desktop.blocks/socket-io/__config/socket-io__config.js similarity index 99% rename from frontend/libs.blocks/socket-io/__config/socket-io__config.js rename to frontend/desktop.blocks/socket-io/__config/socket-io__config.js index 897fad3..332ae75 100644 --- a/frontend/libs.blocks/socket-io/__config/socket-io__config.js +++ b/frontend/desktop.blocks/socket-io/__config/socket-io__config.js @@ -4,7 +4,6 @@ */ modules.define('socket-io__config', function(provide){ - provide(/** @exports */{ /** * URL for loading socket.io if it does not exist. @@ -15,5 +14,4 @@ modules.define('socket-io__config', function(provide){ connectOptions : {}, url : '/static/js/sails.io.js' }); - }); diff --git a/frontend/libs.blocks/socket-io/socket-io.deps.js b/frontend/desktop.blocks/socket-io/socket-io.deps.js similarity index 100% rename from frontend/libs.blocks/socket-io/socket-io.deps.js rename to frontend/desktop.blocks/socket-io/socket-io.deps.js diff --git a/frontend/libs.blocks/socket-io/socket-io.js b/frontend/desktop.blocks/socket-io/socket-io.js similarity index 70% rename from frontend/libs.blocks/socket-io/socket-io.js rename to frontend/desktop.blocks/socket-io/socket-io.js index 2789a1a..b7b909e 100644 --- a/frontend/libs.blocks/socket-io/socket-io.js +++ b/frontend/desktop.blocks/socket-io/socket-io.js @@ -11,6 +11,7 @@ modules.define( /* global io */ function doProvide(preserveGlobal){ + console.log('preserveGlobal', preserveGlobal); /** * @exports * @type Function @@ -19,5 +20,9 @@ modules.define( provide(preserveGlobal? io : io); } - typeof io !== 'undefined'? doProvide(true) : loader(cfg.url, doProvide); + if (typeof io !== 'undefined') { + doProvide(true); + } else { + loader(cfg.url, doProvide); + } }); diff --git a/frontend/libs.blocks/toastr/toastr.css b/frontend/desktop.blocks/toastr/toastr.css similarity index 100% rename from frontend/libs.blocks/toastr/toastr.css rename to frontend/desktop.blocks/toastr/toastr.css diff --git a/frontend/libs.blocks/toastr/toastr.deps.js b/frontend/desktop.blocks/toastr/toastr.deps.js similarity index 100% rename from frontend/libs.blocks/toastr/toastr.deps.js rename to frontend/desktop.blocks/toastr/toastr.deps.js diff --git a/frontend/libs.blocks/toastr/toastr.js b/frontend/desktop.blocks/toastr/toastr.js similarity index 100% rename from frontend/libs.blocks/toastr/toastr.js rename to frontend/desktop.blocks/toastr/toastr.js diff --git a/frontend/libs.blocks/libs/libs.deps.js b/frontend/libs.blocks/libs/libs.deps.js deleted file mode 100644 index 66be89c..0000000 --- a/frontend/libs.blocks/libs/libs.deps.js +++ /dev/null @@ -1,6 +0,0 @@ -({ - mustDeps : [ - { block : 'socket-io' } - ], - shouldDeps : [] -}); diff --git a/frontend/static/js/sails.io.js b/frontend/static/js/sails.io.js index d34fed6..820d794 100644 --- a/frontend/static/js/sails.io.js +++ b/frontend/static/js/sails.io.js @@ -422,7 +422,7 @@ var parts=["source","protocol","authority","userInfo","user","password","host"," // If target hostname is different than actual hostname, we'll consider this cross-origin. - var hasSameHostname = targetAfterProtocol.search(window.location.hostname) !== 0; + var hasSameHostname = targetAfterProtocol.search(window.location.hostname) === 0; if (!hasSameHostname) { return true; } From 9c05d134913bf829480ee23607ab24b0824dc108 Mon Sep 17 00:00:00 2001 From: dima716 Date: Thu, 22 Oct 2015 22:41:58 +0300 Subject: [PATCH 3/9] =?UTF-8?q?#1:=20=D0=9F=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=B2=20travis.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 109ae11..c2bbe0b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,10 @@ language: node_js node_js: -- '0.12' -branches: - only: - - master - - stable - - beta +- '4.0.0' deploy: provider: heroku - api_key: - secure: WYfyx56/Ep8Itxilnpk8MPSokCLO3z7aN7MMhlhbCoS6u0a4p3zNAkpkFC0BJ50Nqt1aONhgQ0LAdIyckzE9SnaEUvJl7xM0fKLf+F9lQnjyKlo6katKKjGwjp/IH8YY1NTrRAvHPvN/hQQg56xJNEtUCtSEk4pWhRAmBXByAefUMYwrBCT7OsEYyVjEJvrvS/FbzNk6Oxg/45058g0qJocR3SDHgCh6SlDv1jV1kMKcglY1sfZt+rjCvPdZMt5Nyf0Ru/JQ8+GuoNM7tE4O0bMha3lPru+QCsgRpUsVfwUN0gE526dcfF/i3fRNzQ+42MvP7c1mZ8zT+ZpB2pA6B9akZpHFf5BNJQTF0wWcObRoAbUpH4vcJ8o/drPNEnGrUxzqNnL5GKFHJv7RRPci8D647OI3geVBsFFyrEql1hS6Tj0qlblC39ym5VNLIf9MraTQ3KH7F9EQXAhPvTRcucDL4ugbpE6j4b47I4l/2seH4WfKEKMQWh+2uzx0swto4SuZrnzyO2EJxWTnIVaUu3czwwFdsU+m66i2MQXC35wW5faIDTxDBeTcbbDJobF5NyOuW40Y115DWoPf2Aj2EbNQiAEMYpxBJ9uJ7RYjtDx2Dd3zNvArvir+Cd21POga1HOe3Jup+UnJoLvaQbhcGTN+ilLtD35J+hlv21iu4sM= - app: shriming + app: shriming-dima716 on: - repo: shriming/chat + repo: dima716/chat + api_key: + secure: FUz+mCz5qxevMYiwJsCdtz8WNzTXYs9yvWyPlXXRq5sYEP6PuG82LerNGqoBJB2aBkgXrp/8hNUOmFJ4QADLc/H4PDyzPccdr1QUaRFES5GQDIBnlbZUrXxGYCWLWASBP3+vMBD9ta59UXddqz6x5dqzANe2/jUWiYF+wFXCrgQfvuHKk+hx+J85LupINx0bTNIGIXXNII/TdV9PnYUggJDIXup5+/E9+zasqIpayn0og+hYMD/UikkPryc9/kJ+4q9mFywOs4/gjabFSbCvuF+e/2w5+bKY4nc1MqzN/BFzbms2TWs6/2l522ZhYXw5Cuu+s8dfoVgis5xHShanrpZmK9nCs+AWGrBfrOGf9ubYHfLZevnb44cw+FXXiWFET58NVP8LhNGZxnem5iQGdGFT8m3b0ws1Jm1qPwRAisNPFvvs5scRnLe5irlWUy9rgfHgFDrpH6ecGUayWxhyavY76RaPP4HnXlHCYWc0AJ+v33/5Pnc4obbqS+Fj0pc1+0h73FQqGMkMHFMH+xVQIjd5VZeAaDvklsI0q+ynDtnbkqWy+B3HFvaQ10lN1FAsETO6w2esEoC/VIr3tA5wqRoofNayLTIYwGSWKEHTqHPRjS2+xh//vXISxierfbJUKtxJubECJPHCdTw/MXXicRkL9/ZOvFUKzXqJ83GFvSw= From d2328ad2f4b1bba62bd54f96bd571c5ecc1e3da1 Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 00:17:24 +0300 Subject: [PATCH 4/9] =?UTF-8?q?#1:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D1=81=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D0=B8=20=D0=B2=20dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + Procfile | 2 +- package.json | 11 +++-------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2bbe0b..1f1a3bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: node_js +script: npm run init node_js: - '4.0.0' deploy: diff --git a/Procfile b/Procfile index d5d8be5..e1d4131 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: npm run make-views && node app.js +web: node app.js diff --git a/package.json b/package.json index 7bfc364..278dd68 100644 --- a/package.json +++ b/package.json @@ -29,11 +29,9 @@ "dependencies": { "bcryptjs": "^2.1.0", "bem-environ": "^1.4.0", - "borschik-tech-cleancss": "^2.0.1", "bower": "^1.3.9", "browser-sync": "^2.9.3", "connect-mongo": "^0.8.2", - "ejs": "~0.8.4", "enb": "0.17.0", "enb-autoprefixer": "^0.1.1", "enb-bem": "0.1.0-beta2", @@ -41,6 +39,7 @@ "enb-bemxjst": "^1.3.2", "enb-borschik": "2.1.0", "enb-diverse-js": "^0.1.0", + "enb-bem-techs": "^2.0.1", "enb-magic-factory": "^0.4.4", "enb-modules": "^0.2.0", "enb-stylus": "1.1.2", @@ -49,6 +48,8 @@ "gulp-flatten": "^0.2.0", "gulp-replace-path": "^0.4.0", "gulp-shell": "^0.4.3", + "gulp-minify-css": "^1.2.1", + "gulp-if": "^2.0.0", "html": "0.0.7", "lodash": "^3.10.1", "nodemon": "^1.5.1", @@ -79,14 +80,8 @@ "bem": "^0.10.1", "bower-npm-install": "^0.5.9", "csscomb": "^3.1.8", - "enb-bem-techs": "^2.0.1", "faker": "^2.1.2", "git-hooks": "^1.0.0", - "grunt": "^0.4.5", - "gulp-if": "^2.0.0", - "gulp-jshint": "^1.11.2", - "gulp-minify-css": "^1.2.1", - "gulp-stylint": "^2.0.0", "jscs": "^1.11.2", "jscs-bem": "^0.2.0", "jshint": "2.6.0", From 39a38fa3abba1fe087f6e13c7377c1649f7fcef0 Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 01:33:01 +0300 Subject: [PATCH 5/9] =?UTF-8?q?#1:=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20gulpfile.js=20=D0=B8=20travis.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- gulpfile.js | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f1a3bd..e5a4c5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: node_js -script: npm run init +before_deploy: npm run init node_js: -- '4.0.0' +- '0.12' deploy: provider: heroku app: shriming-dima716 diff --git a/gulpfile.js b/gulpfile.js index 8f120da..bb65610 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,7 +6,6 @@ var replace = require('gulp-replace-path'); var flatten = require('gulp-flatten'); var runSequence = require('run-sequence'); var browserSync = require('browser-sync').create(); -var stylint = require('gulp-stylint'); var minifyCss = require('gulp-minify-css'); var gulpif = require('gulp-if'); var config = require('./config/env/config'); From 0f8e24b04cfc1debcb778195afb3061fc9712a59 Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 01:41:51 +0300 Subject: [PATCH 6/9] =?UTF-8?q?#1:=20=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=20gulp-stylint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulpfile.js | 1 + package.json | 1 + 2 files changed, 2 insertions(+) diff --git a/gulpfile.js b/gulpfile.js index bb65610..8f120da 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -6,6 +6,7 @@ var replace = require('gulp-replace-path'); var flatten = require('gulp-flatten'); var runSequence = require('run-sequence'); var browserSync = require('browser-sync').create(); +var stylint = require('gulp-stylint'); var minifyCss = require('gulp-minify-css'); var gulpif = require('gulp-if'); var config = require('./config/env/config'); diff --git a/package.json b/package.json index 278dd68..ee4a270 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "gulp-shell": "^0.4.3", "gulp-minify-css": "^1.2.1", "gulp-if": "^2.0.0", + "gulp-stylint": "^2.0.0", "html": "0.0.7", "lodash": "^3.10.1", "nodemon": "^1.5.1", From 79c528acdcf826238a9060396af200771fceea47 Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 02:03:08 +0300 Subject: [PATCH 7/9] =?UTF-8?q?#1:=20=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D1=83=20=D1=84=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=20=D0=B2=20procfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 7 ------- Procfile | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index e5a4c5d..c06b672 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,3 @@ language: node_js before_deploy: npm run init node_js: - '0.12' -deploy: - provider: heroku - app: shriming-dima716 - on: - repo: dima716/chat - api_key: - secure: FUz+mCz5qxevMYiwJsCdtz8WNzTXYs9yvWyPlXXRq5sYEP6PuG82LerNGqoBJB2aBkgXrp/8hNUOmFJ4QADLc/H4PDyzPccdr1QUaRFES5GQDIBnlbZUrXxGYCWLWASBP3+vMBD9ta59UXddqz6x5dqzANe2/jUWiYF+wFXCrgQfvuHKk+hx+J85LupINx0bTNIGIXXNII/TdV9PnYUggJDIXup5+/E9+zasqIpayn0og+hYMD/UikkPryc9/kJ+4q9mFywOs4/gjabFSbCvuF+e/2w5+bKY4nc1MqzN/BFzbms2TWs6/2l522ZhYXw5Cuu+s8dfoVgis5xHShanrpZmK9nCs+AWGrBfrOGf9ubYHfLZevnb44cw+FXXiWFET58NVP8LhNGZxnem5iQGdGFT8m3b0ws1Jm1qPwRAisNPFvvs5scRnLe5irlWUy9rgfHgFDrpH6ecGUayWxhyavY76RaPP4HnXlHCYWc0AJ+v33/5Pnc4obbqS+Fj0pc1+0h73FQqGMkMHFMH+xVQIjd5VZeAaDvklsI0q+ynDtnbkqWy+B3HFvaQ10lN1FAsETO6w2esEoC/VIr3tA5wqRoofNayLTIYwGSWKEHTqHPRjS2+xh//vXISxierfbJUKtxJubECJPHCdTw/MXXicRkL9/ZOvFUKzXqJ83GFvSw= diff --git a/Procfile b/Procfile index e1d4131..d5d8be5 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: node app.js +web: npm run make-views && node app.js From 16067c74e55344fee2667107971a7624671eaf6f Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 02:16:40 +0300 Subject: [PATCH 8/9] =?UTF-8?q?#1:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20bors?= =?UTF-8?q?chik-tech-cleancss=20=D0=B8=D0=B7=20=D1=82=D0=B5=D1=85=D0=BD?= =?UTF-8?q?=D0=BE=D0=BB=D0=BE=D0=B3=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/.enb/make.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.enb/make.js b/frontend/.enb/make.js index 812f6fe..0928002 100644 --- a/frontend/.enb/make.js +++ b/frontend/.enb/make.js @@ -179,7 +179,7 @@ module.exports = function (config) { ], [ tech.borschik, - { sourceTarget : '?.css', destTarget : '_?.css', tech : 'cleancss', freeze : true, minify : false } + { sourceTarget : '?.css', destTarget : '_?.css', freeze : true, minify : false } ] ]); }); From 5b23d778525ac56046ec2d61d4168c86230303a6 Mon Sep 17 00:00:00 2001 From: dima716 Date: Fri, 23 Oct 2015 03:03:21 +0300 Subject: [PATCH 9/9] =?UTF-8?q?#1:=20=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20befo?= =?UTF-8?q?re=5Fdeploy=20=D0=B8=D0=B7=20travis.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c06b672..79c97c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ language: node_js -before_deploy: npm run init node_js: - '0.12'