up

iliakan · iliakan · commit dd2ecedb70f3 · 2018-10-04T21:28:43.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -21,16 +21,16 @@ sftp-config.json
 Thumbs.db
 
 # database dump for tutorial export
-dump/
+/dump
 
 # NPM packages folder.
 node_modules/
 
 # TMP folder (run-time tmp)
-tmp/
+/tmp
 
 # Manifest (build-generated content, versions)
-cache/
+/cache
 
 # contains v8 executable for linux-tick-processor (run from project root)
 out/*
diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/gulpfile.js b/gulpfile.js
@@ -58,43 +58,23 @@ gulp.task("test", lazyRequireTask('./tasks/test', {
 }));
 
 
-gulp.task('watch', lazyRequireTask('./tasks/watch', {
-  root:        __dirname,
-  // for performance, watch only these dirs under root
-  dirs: ['assets', 'styles'],
-  taskMapping: [
-    {
-      watch: 'assets/**',
-      task:  'sync-resources'
-    }
-  ]
-}));
-
 gulp.task('deploy', function(callback) {
   runSequence("deploy:build", "deploy:update", callback);
 });
 
-gulp.task("sync-resources", lazyRequireTask('./tasks/syncResources', {
-  assets: 'public'
-}));
-
 
 gulp.task('webpack', lazyRequireTask('./tasks/webpack'));
 // gulp.task('webpack-dev-server', lazyRequireTask('./tasks/webpackDevServer'));
 
 
-gulp.task('build', function(callback) {
-  runSequence("sync-resources", 'webpack', callback);
-});
+gulp.task('build', ['webpack']);
 
 gulp.task('server', lazyRequireTask('./tasks/server'));
 
-gulp.task('edit', ['webpack', 'jsengine:koa:tutorial:importWatch', "sync-resources", 'livereload', 'server']);
+gulp.task('edit', ['webpack', 'jsengine:koa:tutorial:importWatch', 'livereload', 'server']);
 
 
-gulp.task('dev', function(callback) {
-  runSequence("sync-resources", ['nodemon', 'livereload', 'webpack', 'watch'], callback);
-});
+gulp.task('dev', ['nodemon', 'livereload', 'webpack']);
 
 gulp.on('err', function(gulpErr) {
   if (gulpErr.err) {
diff --git a/modules/config/index.js b/modules/config/index.js
@@ -1,5 +1,5 @@
 let path = require('path');
-let fs = require('fs');
+let fs = require('fs-extra');
 let yaml = require('js-yaml');
 let env = process.env;
 
@@ -54,12 +54,13 @@ let config = module.exports = {
 
   projectRoot:           process.cwd(),
   // public files, served by nginx
-  publicRoot:            path.join(process.cwd(), 'public'),
+  publicRoot:            path.join(process.cwd(), 'public', lang),
   // private files, for expiring links, not directly accessible
   tutorialRoot:          env.TUTORIAL_ROOT || path.join(process.cwd(), '..', 'javascript-tutorial-' + lang),
-  tmpRoot:               path.join(process.cwd(), 'tmp'),
+  tmpRoot:               path.join(process.cwd(), 'tmp', lang),
   // js/css build versions
-  cacheRoot:          path.join(process.cwd(), 'cache'),
+  cacheRoot:          path.join(process.cwd(), 'cache', lang),
+  assetsRoot:            path.join(process.cwd(), 'assets'),
 
   handlers: require('./handlers')
 };
@@ -89,3 +90,17 @@ t.requireHandlerLocales();
 // we have a loop dep here
 config.webpack = require('./webpack');
 
+
+createRoot(config.publicRoot);
+createRoot(config.cacheRoot);
+createRoot(config.tmpRoot);
+
+function createRoot(root) {
+  // may be existing symlink
+  if (fs.existsSync(root) && fs.statSync(root).isFile()) {
+    fs.unlinkSync(root);
+  }
+  if (!fs.existsSync(root)) {
+    fs.ensureDirSync(root);
+  }
+}
diff --git a/modules/config/webpack.js b/modules/config/webpack.js
@@ -46,7 +46,7 @@ module.exports = function () {
   /**
    * handler/client/assets/* goes to public/assets/
    */
-  let assetPaths = [];
+  let assetPaths = [config.assetsRoot];
   for (let handlerName in config.handlers) {
     let handlerPath = config.handlers[handlerName].path;
     let from = `${handlerPath}/client/assets`;
diff --git a/tmp/.gitkeep b/tmp/.gitkeep
