init

iliakan · iliakan · commit bd2501218723 · 2018-08-12T16:46:04.000+03:00
diff --git a/handlers/tutorial/lib/tutorialImporter.js b/handlers/tutorial/lib/tutorialImporter.js
@@ -209,15 +209,15 @@ module.exports = class TutorialImporter {
     data.githubLink = config.tutorialGithubBaseUrl + articlePath.slice(this.root.length) + '/article.md';
 
     try {
-      data.headJs = fs.readFileSync(path.join(articlePath, 'head.js'));
+      data.headJs = fs.readFileSync(path.join(articlePath, 'head.js'), {encoding: 'utf8'});
     } catch (e) {
     }
     try {
-      data.headCss = fs.readFileSync(path.join(articlePath, 'head.css'));
+      data.headCss = fs.readFileSync(path.join(articlePath, 'head.css'), {encoding: 'utf8'});
     } catch (e) {
     }
     try {
-      data.headHtml = fs.readFileSync(path.join(articlePath, 'head.html'));
+      data.headHtml = fs.readFileSync(path.join(articlePath, 'head.html'), {encoding: 'utf8'});
     } catch (e) {
     }
 
diff --git a/modules/app.js b/modules/app.js
@@ -34,7 +34,9 @@ app.proxy = true;
 
 // ========= Helper handlers ===========
 
-config.handlers.forEach(handler => app.requireHandler(handler));
+for(const handlerName in config.handlers) {
+  app.requireHandler(handlerName);
+}
 
 // must be last
 app.requireHandler('404');
diff --git a/modules/config/handlers.js b/modules/config/handlers.js
@@ -3,7 +3,7 @@
 const path = require('path');
 const fs = require('fs');
 
-let handlers = [
+let handlerNames = [
   'static',
   'requestId',
   'requestLog',
@@ -43,4 +43,17 @@ let handlers = [
   'tutorial'
 ].filter(Boolean);
 
+let handlers = {};
+
+for (const name of handlerNames) {
+  let handlerPath = require.resolve(name);
+  if (handlerPath.endsWith('index.js')) {
+    handlerPath = path.dirname(handlerPath);
+  }
+  handlers[name] = {
+    path: handlerPath
+  }
+}
+
+
 module.exports = handlers;
diff --git a/modules/config/webpack.js b/modules/config/webpack.js
@@ -24,6 +24,7 @@ let noProcessModulesRegExp = /node_modules\/(angular|prismjs)/;
 
 let devMode = process.env.NODE_ENV == 'development';
 
+
 module.exports = function (config) {
 // tutorial.js?hash
 // tutorial.hash.js
@@ -39,6 +40,19 @@ module.exports = function (config) {
     modulesDirectories = modulesDirectories.concat(process.env.NODE_PATH.split(/[:;]/).map(p => path.resolve(p)));
   }
 
+  let assetPaths = [];
+  for(let handlerName in config.handlers) {
+    let handlerPath = config.handlers[handlerName].path;
+    let from = `${handlerPath}/client/assets`;
+    console.log(from);
+
+    if (fse.existsSync(from)) {
+      assetPaths.push(from);
+    }
+  }
+  console.log(assetPaths);
+
+
   let webpackConfig = {
     output: {
       // fs path
@@ -230,16 +244,14 @@ module.exports = function (config) {
       }),
 
       new CopyWebpackPlugin(
-        config.handlers.map(handler => {
-          let from = `handlers/${handler}/client/assets`;
-          if (!fse.existsSync(from)) return;
-
+        assetPaths.map(path => {
           return {
-            from,
+            from: path,
             to: config.publicRoot
           }
-        }).filter(Boolean),
-        { debug: 'warning'}
+        }),
+        { debug: 'debug'}
+        // { debug: 'warning'}
       ),
 
       {
diff --git a/modules/lib/webpack/cssWatchRebuildPlugin.js b/modules/lib/webpack/cssWatchRebuildPlugin.js
@@ -51,11 +51,12 @@ class CssWatchFS {
 
     let styles = glob.sync(`${this.roots[name]}/**/*.styl`, {cwd: config.projectRoot});
 
-    config.handlers.forEach(handler => {
-      let handlerStyles = glob.sync(`handlers/${handler}/client/styles/**/*.styl`, {cwd: config.projectRoot});
+    for (const {path: handlerPath} of Object.values(config.handlers)) {
+      let handlerStyles = glob.sync(`${handlerPath}/client/styles/**/*.styl`, {cwd: config.projectRoot});
       styles.push(...handlerStyles);
-    });
+    }
 
+    console.log("LOG STYLES", styles);
     let content = styles.map(s => `@require '../${s}'`).join("\n");
 
     fs.writeFileSync(`${config.tmpRoot}/${name}.styl`, content);
diff --git a/replace.php b/replace.php
@@ -0,0 +1,29 @@
+<?php
+
+$files = glob("**/*.js");
+foreach($files as $file) {
+  echo "$file\n"; 
+  $content = file_get_contents($file);
+
+  $replaced = str_replace($search, $replace, $content);
+
+  file_put_contents($file, $content);
+}
+
+$search = [
+  "require('textUtil",
+  "require('i18n",
+  "require('log",
+  "require('localStorage",
+  "require('serverPug",
+  "require('momentWithLocale"
+];
+
+$replace = [
+ "require('@jsengine/text-utils",
+ "require('@jsengine/i18n",
+ "require('@jsengine/log",
+ "require('@jsengine/local-storage",
+ "require('@jsengine/server-pug",
+ "require('@jsengine/moment-with-locale"
+];

Original file line number	Diff line number	Diff line change
`@@ -209,15 +209,15 @@ module.exports = class TutorialImporter {`
`209`	`209`	`data.githubLink = config.tutorialGithubBaseUrl + articlePath.slice(this.root.length) + '/article.md';`
`210`	`210`
`211`	`211`	`try {`
`212`		`- data.headJs = fs.readFileSync(path.join(articlePath, 'head.js'));`
	`212`	`+ data.headJs = fs.readFileSync(path.join(articlePath, 'head.js'), {encoding: 'utf8'});`
`213`	`213`	`} catch (e) {`
`214`	`214`	`}`
`215`	`215`	`try {`
`216`		`- data.headCss = fs.readFileSync(path.join(articlePath, 'head.css'));`
	`216`	`+ data.headCss = fs.readFileSync(path.join(articlePath, 'head.css'), {encoding: 'utf8'});`
`217`	`217`	`} catch (e) {`
`218`	`218`	`}`
`219`	`219`	`try {`
`220`		`- data.headHtml = fs.readFileSync(path.join(articlePath, 'head.html'));`
	`220`	`+ data.headHtml = fs.readFileSync(path.join(articlePath, 'head.html'), {encoding: 'utf8'});`
`221`	`221`	`} catch (e) {`
`222`	`222`	`}`
`223`	`223`