2 bug fixes (#98)

* Merge fix

* Updating lock file.

* Bug fix for rss feed truncation...

* Fixes infinite recursive loop for #89

* Removed use of module cache invalidator from feed.js

* Replaced 'latest' babel presets with 'env'

* Ignore temp build folder

* Adding back new truncation logic for RSS

* Updating yarn lock

.gitignore

@@ -6,6 +6,7 @@ website/translated_docs
 website/build/
 website/yarn.lock
 website/node_modules
+lib/pages/
 
 website/i18n/*
 !website/i18n/en.json

lib/build-files.js

@@ -13,7 +13,7 @@ require("babel-register")({
 	babelrc: false,
 	only: [__dirname, process.cwd() + "/core"],
 	plugins: [require("./server/translate-plugin.js")],
-  presets: ["react", "latest"]
+	presets: ["react", "env"]
 });
 
 // initial check that required files are present

lib/server/feed.js

@@ -26,48 +26,17 @@ const jestImage = siteConfig.url + siteConfig.headerIcon;
 let readMetadata;
 let Metadata;
 
-function reloadMetadata() {
-  removeFromCache("./readMetadata.js");
 readMetadata = require("./readMetadata.js");
 readMetadata.generateDocsMetadata();
-  removeFromCache("../core/metadata.js");
 Metadata = require("../core/metadata.js");
-}
 
 /****************************************************************************/
 
-// remove a module and child modules from require cache, so server does not have
-// to be restarted
-const removeFromCache = moduleName => {
-  let mod = require.resolve(moduleName);
-  if (mod && (mod = require.cache[mod])) {
-    (function traverse(mod) {
-      mod.children.forEach(child => {
-        traverse(child);
-      });
-      delete require.cache[mod.id];
-    })(mod);
-  }
-
-  Object.keys(module.constructor._pathCache).forEach(function(cacheKey) {
-    if (cacheKey.indexOf(moduleName) > 0) {
-      delete module.constructor._pathCache[cacheKey];
-    }
-  });
-};
-
-reloadMetadata();
-
 module.exports = function(type) {
   console.log("feed.js triggered...");
 
   type = type || "rss";
 
-  removeFromCache(CWD + "/siteConfig.js");
-  if (fs.existsSync(__dirname + "/../core/MetadataBlog.js")) {
-    removeFromCache("../core/MetadataBlog.js");
-    fs.removeSync(__dirname + "/../core/MetadataBlog.js");
-  }
   readMetadata.generateBlogMetadata();
   const MetadataBlog = require("../core/MetadataBlog.js");
 
@@ -87,11 +56,14 @@ module.exports = function(type) {
   MetadataBlog.forEach(post => {
     const url = blogRootURL + "/" + post.path;
     let content = "";
+    if (post.content.indexOf("<!--truncate-->") == -1) {
+      content = post.content.trim().substring(0, 250);
+    } else {
       let contentArr = post.content.split("<!--truncate-->");
       if (contentArr.length > 0) {
         content = contentArr[0];
       }
-    content = content.trim().substring(0, 250);
+    }
 
     feed.addItem({
       title: post.title,

lib/server/server.js

@@ -33,17 +33,19 @@ function execute(port) {
 
   // remove a module and child modules from require cache, so server does not have
   // to be restarted
-  function removeFromCache(moduleName) {
+  function removeModuleAndChildrenFromCache(moduleName) {
     let mod = require.resolve(moduleName);
     if (mod && (mod = require.cache[mod])) {
-      (function traverse(mod) {
       mod.children.forEach(child => {
-          traverse(child);
+        delete require.cache[child.id];
+        removeModulePathFromCache(mod.id);
       });
       delete require.cache[mod.id];
-      })(mod);
+      removeModulePathFromCache(mod.id);
+    }
   }
 
+  function removeModulePathFromCache(moduleName) {
     Object.keys(module.constructor._pathCache).forEach(function(cacheKey) {
       if (cacheKey.indexOf(moduleName) > 0) {
         delete module.constructor._pathCache[cacheKey];
@@ -57,10 +59,10 @@ function execute(port) {
   let Metadata;
 
   function reloadMetadata() {
-    removeFromCache("./readMetadata.js");
+    removeModuleAndChildrenFromCache("./readMetadata.js");
     readMetadata = require("./readMetadata.js");
     readMetadata.generateDocsMetadata();
-    removeFromCache("../core/metadata.js");
+    removeModuleAndChildrenFromCache("../core/metadata.js");
     Metadata = require("../core/metadata.js");
   }
 
@@ -105,7 +107,7 @@ function execute(port) {
 
   // handle all requests for document pages
   const app = express().get(/docs\/.*html$/, (req, res, next) => {
-    removeFromCache(CWD + "/siteConfig.js");
+    removeModuleAndChildrenFromCache(CWD + "/siteConfig.js");
     siteConfig = require(CWD + "/siteConfig.js");
 
     let url = req.path.toString().replace(siteConfig.baseUrl, "");
@@ -210,7 +212,7 @@ function execute(port) {
       "](" + siteConfig.baseUrl + "docs/assets/"
     );
 
-    removeFromCache("../core/DocsLayout.js");
+    removeModuleAndChildrenFromCache("../core/DocsLayout.js");
     const DocsLayout = require("../core/DocsLayout.js");
     const docComp = (
       <DocsLayout metadata={metadata} language={language} config={siteConfig}>
@@ -233,17 +235,17 @@ function execute(port) {
 
   // handle all requests for blog pages and posts
   app.get(/blog\/.*html$/, (req, res) => {
-    removeFromCache(CWD + "/siteConfig.js");
+    removeModuleAndChildrenFromCache(CWD + "/siteConfig.js");
     siteConfig = require(CWD + "/siteConfig.js");
     if (fs.existsSync(__dirname + "/../core/MetadataBlog.js")) {
-      removeFromCache("../core/MetadataBlog.js");
+      removeModuleAndChildrenFromCache("../core/MetadataBlog.js");
       fs.removeSync(__dirname + "/../core/MetadataBlog.js");
     }
     readMetadata.generateBlogMetadata();
     const MetadataBlog = require("../core/MetadataBlog.js");
 
     // generate all of the blog pages
-    removeFromCache("../core/BlogPageLayout.js");
+    removeModuleAndChildrenFromCache("../core/BlogPageLayout.js");
     const BlogPageLayout = require("../core/BlogPageLayout.js");
     const blogPages = {};
     // make blog pages with 10 posts per page
@@ -302,7 +304,7 @@ function execute(port) {
       metadata.id = metadata.title;
 
       let language = "en";
-      removeFromCache("../core/BlogPostLayout.js");
+      removeModuleAndChildrenFromCache("../core/BlogPostLayout.js");
       const BlogPostLayout = require("../core/BlogPostLayout.js");
 
       const blogPostComp = (
@@ -320,7 +322,7 @@ function execute(port) {
 
   // handle all other main pages
   app.get("*.html", (req, res, next) => {
-    removeFromCache(CWD + "/siteConfig.js");
+    removeModuleAndChildrenFromCache(CWD + "/siteConfig.js");
     siteConfig = require(CWD + "/siteConfig.js");
 
     // look for user provided html file first
@@ -385,9 +387,9 @@ function execute(port) {
       fs.copySync(userFile, tempFile);
 
       // render into a string
-      removeFromCache(tempFile);
+      removeModuleAndChildrenFromCache(tempFile);
       const ReactComp = require(tempFile);
-      removeFromCache("../core/Site.js");
+      removeModuleAndChildrenFromCache("../core/Site.js");
       const Site = require("../core/Site.js");
       translate.setLanguage(language);
       const str = renderToStaticMarkup(

lib/start-server.js

@@ -13,7 +13,7 @@ require("babel-register")({
 	babelrc: false,
 	only: [__dirname, process.cwd() + "/core"],
 	plugins: [require("./server/translate-plugin.js")],
-  presets: ["react", "latest"]
+	presets: ["react", "env"]
 });
 
 // initial check that required files are present

package.json

@@ -1,13 +1,13 @@
 {
   "dependencies": {
-    "babel-preset-latest": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
+    "babel-preset-env": "^1.6.0",
     "babel-register": "^6.24.1",
     "babel-traverse": "^6.25.0",
     "babylon": "^6.17.4",
     "chalk": "^2.1.0",
     "classnames": "^2.2.5",
     "commander": "^2.11.0",
+    "crowdin-cli": "^0.3.0",
     "diff": "^3.3.0",
     "express": "^4.15.3",
     "feed": "^1.1.0",
@@ -26,9 +26,6 @@
     "type": "git",
     "url": "https://github.com/facebookexperimental/Docusaurus.git"
   },
-  "devDependencies": {
-    "jest": "^21.2.0"
-  },
   "bin": {
     "docusaurus-start": "./lib/start-server.js",
     "docusaurus-build": "./lib/build-files.js",