jsengine -> engine

Author: iliakan

.gitignore

@@ -39,5 +39,5 @@ out/*
 public/*
 package-lock.json
 
-/modules/jsengine
+/modules/engine
 .gitmodules

bin/server.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 const config = require('config');
-const app = require('jsengine/koa/app');
-const log = require('jsengine/log')();
+const app = require('engine/koa/app');
+const log = require('engine/log')();
 
 app.waitBootAndListen(config.server.host, config.server.port).then(() => {
   log.info("App is listening");

gulpfile.js

@@ -7,7 +7,7 @@ const gulp = require('gulp');
 const glob = require('glob');
 const path = require('path');
 const fs = require('fs');
-const {lazyRequireTask, requireModuleTasks} = require('jsengine/gulp/requireModuleTasks');
+const {lazyRequireTask, requireModuleTasks} = require('engine/gulp/requireModuleTasks');
 const runSequence = require('run-sequence');
 
 const config = require('config');
@@ -42,7 +42,7 @@ gulp.task("livereload", lazyRequireTask("./tasks/livereload", {
   ]
 }));
 
-requireModuleTasks('jsengine/koa/tutorial');
+requireModuleTasks('engine/koa/tutorial');
 
 let testSrcs = ['modules/**/test/**/*.js'];
 // on Travis, keys are required for E2E Selenium tests
@@ -71,7 +71,7 @@ gulp.task('build', ['webpack']);
 
 gulp.task('server', lazyRequireTask('./tasks/server'));
 
-gulp.task('edit', ['webpack', 'jsengine:koa:tutorial:importWatch', 'livereload', 'server']);
+gulp.task('edit', ['webpack', 'engine:koa:tutorial:importWatch', 'livereload', 'server']);
 
 
 gulp.task('dev', ['nodemon', 'livereload', 'webpack']);

modules/client/clientRender.js

@@ -1,6 +1,6 @@
 const LANG = require('config').lang;
 
-const t = require('jsengine/i18n/t');
+const t = require('engine/i18n/t');
 
 module.exports = function(template, locals) {
   locals = locals ? Object.create(locals) : {};

modules/client/head/index.js

@@ -18,7 +18,7 @@ exports.Modal = require('./modal');
 exports.fontTest = require('./fontTest');
 exports.resizeOnload = require('./resizeOnload');
 require('./layout');
-require('jsengine/sidebar/client');
+require('engine/sidebar/client');
 require('./navigationArrows');
 require('./hover');
 require('./trackLinks');

modules/client/localeExample.js

@@ -1,8 +1,8 @@
 // client-side locale example
 // can be used as require('client/test') from server-side
 // and from client side too
-const t = require('jsengine/i18n/t');
+const t = require('engine/i18n/t');
 
 t.i18n.add('test', require('../../locales/' + require('config').lang + '.yml'));
 
-console.log(t('test.ilya_kantor'));
+console.log(t('test.ilya_kantor'));

modules/config/handlers.js

@@ -4,43 +4,43 @@ const path = require('path');
 const fs = require('fs');
 
 let handlerNames = [
-  'jsengine/koa/static',
-  'jsengine/koa/requestId',
-  'jsengine/koa/requestLog',
-  'jsengine/koa/nocache',
+  'engine/koa/static',
+  'engine/koa/requestId',
+  'engine/koa/requestLog',
+  'engine/koa/nocache',
 
   // this middleware adds this.render method
   // it is *before error*, because errors need this.render
   'render',
 
   // errors wrap everything
-  'jsengine/koa/error',
+  'engine/koa/error',
 
   // this logger only logs HTTP status and URL
   // before everything to make sure it log all
-  'jsengine/koa/accessLogger',
+  'engine/koa/accessLogger',
 
   // pure node.js examples from tutorial
   // before session
   // before form parsing, csrf checking or whatever, bare node
-  'jsengine/koa/nodeExample',
+  'engine/koa/nodeExample',
 
   // before anything that may deal with body
   // it parses JSON & URLENCODED FORMS,
   // it does not parse form/multipart
-  'jsengine/koa/bodyParser',
+  'engine/koa/bodyParser',
 
   // parse FORM/MULTIPART
   // (many tweaks possible, lets the middleware decide how to parse it)
-  'jsengine/koa/multipartParser',
+  'engine/koa/multipartParser',
 
   // right after parsing body, make sure we logged for development
-  'jsengine/koa/verboseLogger',
+  'engine/koa/verboseLogger',
 
-  'jsengine/koa/conditional',
+  'engine/koa/conditional',
 
   process.env.NODE_ENV === 'development' && 'dev',
-  'jsengine/koa/tutorial',
+  'engine/koa/tutorial',
   'frontpage'
 ].filter(Boolean);
 

modules/config/index.js

@@ -65,7 +65,7 @@ let config = module.exports = {
   handlers: require('./handlers')
 };
 
-let repos = require('jsengine/koa/tutorial/repos');
+let repos = require('engine/koa/tutorial/repos');
 for(let repo in repos) {
   if (repos[repo].lang === lang) {
     config.tutorialRepo = {
@@ -83,7 +83,7 @@ require.extensions['.yml'] = function(module, filename) {
 
 
 // after module.exports for circle dep w/ config
-const t = require('jsengine/i18n');
+const t = require('engine/i18n');
 t.requireHandlerLocales();
 
 // webpack config uses general config

modules/config/webpack.js

@@ -17,8 +17,8 @@ module.exports = function () {
   let rupture = require('rupture');
   let chokidar = require('chokidar');
   let webpack = require('webpack');
-  let WriteVersionsPlugin = require('jsengine/webpack/writeVersionsPlugin');
-  let CssWatchRebuildPlugin = require('jsengine/webpack/cssWatchRebuildPlugin');
+  let WriteVersionsPlugin = require('engine/webpack/writeVersionsPlugin');
+  let CssWatchRebuildPlugin = require('engine/webpack/cssWatchRebuildPlugin');
   const CopyWebpackPlugin = require('copy-webpack-plugin')
   const MiniCssExtractPlugin = require("mini-css-extract-plugin");
   const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
@@ -65,7 +65,7 @@ module.exports = function () {
   let entries = {
     head:      'client/head',
     footer:    'client/footer',
-    tutorial:  'jsengine/koa/tutorial/client',
+    tutorial:  'engine/koa/tutorial/client',
     styles:    config.tmpRoot + '/styles.styl',
     frontpage: config.tmpRoot + '/frontpage.styl'
   };
@@ -131,7 +131,7 @@ module.exports = function () {
         entry: {
           styles: config.tmpRoot + '/styles.styl',
           head: 'client/head',
-          tutorial: 'jsengine/koa/tutorial/client',
+          tutorial: 'engine/koa/tutorial/client',
           footer: 'client/footer',
         },*/
 
@@ -188,7 +188,7 @@ module.exports = function () {
                 ]
               }
             },
-            'jsengine/webpack/hover-loader',
+            'engine/webpack/hover-loader',
             {
               loader:  'stylus-loader',
               options: {
@@ -226,7 +226,7 @@ module.exports = function () {
       // allow require('styles') which looks for styles/index.styl
       extensions: ['.js', '.styl'],
       alias:      {
-        'entities/maps/entities.json': 'jsengine/markit/emptyEntities',
+        'entities/maps/entities.json': 'engine/markit/emptyEntities',
         config:                        'client/config'
       },
       modules:    modulesDirectories
@@ -300,7 +300,7 @@ module.exports = function () {
           return ignore;
         }
       }),
-      
+
 
       new WriteVersionsPlugin(path.join(config.cacheRoot, 'webpack.versions.json')),
 

modules/dev/index.js

@@ -1,4 +1,4 @@
-let mountHandlerMiddleware = require('jsengine/koa/mountHandlerMiddleware');
+let mountHandlerMiddleware = require('engine/koa/mountHandlerMiddleware');
 
 exports.init = function(app) {
   app.use( mountHandlerMiddleware('/dev', __dirname) );

modules/frontpage/controller/frontpage.js

@@ -1,11 +1,11 @@
 
-const Article = require('jsengine/koa/tutorial').Article;
-const TutorialTree = require('jsengine/koa/tutorial').TutorialTree;
-const Task = require('jsengine/koa/tutorial').Task;
+const Article = require('engine/koa/tutorial').Article;
+const TutorialTree = require('engine/koa/tutorial').TutorialTree;
+const Task = require('engine/koa/tutorial').Task;
 const _ = require('lodash');
-const ArticleRenderer = require('jsengine/koa/tutorial').ArticleRenderer;
-const localStorage = require('jsengine/local-storage').instance();
-const t = require('jsengine/i18n');
+const ArticleRenderer = require('engine/koa/tutorial').ArticleRenderer;
+const localStorage = require('engine/local-storage').instance();
+const t = require('engine/i18n');
 
 t.requirePhrase('frontpage');
 

modules/frontpage/index.js

@@ -1,4 +1,4 @@
-const mountHandlerMiddleware = require('jsengine/koa/mountHandlerMiddleware');
+const mountHandlerMiddleware = require('engine/koa/mountHandlerMiddleware');
 
 exports.init = function(app) {
   app.use(mountHandlerMiddleware('/', __dirname));

modules/render.js

@@ -1,4 +1,4 @@
-let Renderer = require('jsengine/koa/renderer');
+let Renderer = require('engine/koa/renderer');
 
 // (!) this.render does not assign this.body to the result
 // that's because render can be used for different purposes, e.g to send emails

modules/styles/blocks/sidebar/sidebar.styl

@@ -1 +1 @@
-@require '~jsengine/sidebar/templates/sidebar.styl'
+@require '~engine/sidebar/templates/sidebar.styl'

tasks/server.js

@@ -1,4 +1,4 @@
-let app = require('jsengine/koa/app');
+let app = require('engine/koa/app');
 let config = require('config');
 
 module.exports = function() {