Merge branch 'useCreateReactAppToSimplify' into separateNonFeaturedArticlesOnQuadrantView

dist_scripts/scripts/buildRadar.js

@@ -32,6 +32,8 @@ process.env.NODE_ENV = "production";
 process.on("unhandledRejection", function (err) {
     throw err;
 });
+fs.removeSync(paths.templateNodeModules);
+fs.ensureSymlinkSync(paths.appNodeModules, paths.templateNodeModules);
 var runCommand = function (command) {
     return new Promise(function (resolve, reject) {
         var executedCommand = child_process_1.spawn(command, {

dist_scripts/scripts/generateJson.js

@@ -56,9 +56,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var fs = __importStar(require("fs-extra"));
 var paths = __importStar(require("./paths"));
-var radar_1 = require("./generateJson/radar");
-var file_1 = require("./generateJson/file");
 // Do this as the first thing so that any code reading it knows the right env.
 process.env.BABEL_ENV = "production";
 process.env.NODE_ENV = "production";
@@ -68,24 +67,30 @@ process.env.NODE_ENV = "production";
 process.on("unhandledRejection", function (err) {
     throw err;
 });
+fs.removeSync(paths.templateNodeModules);
+fs.ensureSymlinkSync(paths.appNodeModules, paths.templateNodeModules);
 var generateJson = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var radar, e_1;
+    var createRadar, save, radar, e_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                _a.trys.push([0, 3, , 4]);
-                return [4 /*yield*/, radar_1.createRadar()];
+                createRadar = require("./generateJson/radar").createRadar;
+                save = require("./generateJson/file").save;
+                _a.label = 1;
             case 1:
-                radar = _a.sent();
-                return [4 /*yield*/, file_1.save(JSON.stringify(radar), paths.radarJson)];
+                _a.trys.push([1, 4, , 5]);
+                return [4 /*yield*/, createRadar()];
             case 2:
-                _a.sent();
-                return [3 /*break*/, 4];
+                radar = _a.sent();
+                return [4 /*yield*/, save(JSON.stringify(radar), paths.radarJson)];
             case 3:
+                _a.sent();
+                return [3 /*break*/, 5];
+            case 4:
                 e_1 = _a.sent();
                 console.error("error:", e_1);
-                return [3 /*break*/, 4];
-            case 4: return [2 /*return*/];
+                return [3 /*break*/, 5];
+            case 5: return [2 /*return*/];
         }
     });
 }); };

dist_scripts/scripts/paths.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appYarnLock = exports.appPublic = exports.appBuild = exports.appRdJson = exports.templateBuild = exports.template = exports.radarJson = void 0;
+exports.appNodeModules = exports.appYarnLock = exports.appPublic = exports.appBuild = exports.appRdJson = exports.templateNodeModules = exports.templateBuild = exports.template = exports.radarJson = void 0;
 var path_1 = require("path");
 var fs_1 = require("fs");
 exports.radarJson = "rd.json";
@@ -16,7 +16,9 @@ var resolveTemplate = function (relativePath) {
 };
 exports.template = resolveTemplate();
 exports.templateBuild = resolveTemplate("build");
+exports.templateNodeModules = resolveTemplate("node_modules");
 exports.appRdJson = resolveApp("build/" + exports.radarJson);
 exports.appBuild = resolveApp("build");
 exports.appPublic = resolveApp("public");
 exports.appYarnLock = resolveApp("yarn.lock");
+exports.appNodeModules = resolveApp("node_modules");

dist_scripts/src/model.js

@@ -25,6 +25,7 @@ var nonFeaturedOnly = function (items) {
     return items.filter(function (item) { return !item.featured; });
 };
 exports.nonFeaturedOnly = nonFeaturedOnly;
+
 var groupByQuadrants = function (items) {
     return items.reduce(function (quadrants, item) {
         var _a;
@@ -58,7 +59,5 @@ var addItemToRing = function (ring, item) {
     if (ring === void 0) { ring = []; }
     return __spreadArray(__spreadArray([], ring), [item]);
 };
-var getFirstLetter = function (item) {
-    return item.title.substr(0, 1).toUpperCase();
-};
+var getFirstLetter = function (item) { return item.title.substr(0, 1).toUpperCase(); };
 exports.getFirstLetter = getFirstLetter;