diff --git a/.gitignore b/.gitignore index 31e8640..76c2238 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,24 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build + +# misc .idea .DS_Store -dist -node_modules -npm-debug.log -yarn-error.log -aoe_technology_radar.iml -build -# bin +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/.husky/.gitignore b/.husky/.gitignore new file mode 100644 index 0000000..31354ec --- /dev/null +++ b/.husky/.gitignore @@ -0,0 +1 @@ +_ diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 0000000..5a31180 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +yarn ts:check && yarn lint-staged diff --git a/.lintstagedrc b/.lintstagedrc new file mode 100644 index 0000000..d2cb794 --- /dev/null +++ b/.lintstagedrc @@ -0,0 +1,5 @@ +{ + "*.{json, md, yml, js, ts, tsx}": [ + "prettier --write", + ] +} diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 9c0e840..0000000 --- a/LICENSE +++ /dev/null @@ -1,204 +0,0 @@ -The license applies to the generator code and not the articles in the "radar" folder. (Read also the README.md in this folder) - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2017 Google Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 6550c34..76ca812 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,14 @@ Add the tech radar as a dependency yarn add https://github.com/aoepeople/aoe_technology_radar.git ``` +Generate json file based on md files +``` +yarn generateJson +``` + Build the radar ``` -yarn aoe_technology_radar +yarn buildRadar ``` Serve @@ -36,20 +41,6 @@ python3 -m http.server 8080 ``` Then open here: http://localhost:8080 -## Run a prepared static version - -In most cases you have the techradar available at `/techradar`, and for reasons want all correct pages to be accessable. - -Until this setup improves, you can use the following way to generate the correct techradar: - -``` -PUBLIC_URL=techradar/ yarn aoe_technology_radar -yarn aoe_technology_radar-static -cp -r build techradar -``` - -(This is rather workaroundish for now, but does the job.) - ## Usage For a new Technology Radar release, create a folder of the release date diff --git a/bin/src/config.js b/bin/src/config.js index a63423d..f05b826 100644 --- a/bin/src/config.js +++ b/bin/src/config.js @@ -16,20 +16,22 @@ exports.rings = [ 'assess', 'hold' ]; -exports.getItemPageNames = (items) => items.map(item => `${item.quadrant}/${item.name}`); +var getItemPageNames = function (items) { return items.map(function (item) { return item.quadrant + "/" + item.name; }); }; +exports.getItemPageNames = getItemPageNames; exports.showEmptyRings = false; -const messages = { +var messages = { 'languages-and-frameworks': 'Languages & Frameworks', 'methods-and-patterns': 'Methods & Patterns', 'platforms-and-aoe-services': 'Platforms and Operations', 'tools': 'Tools', }; -exports.translate = (key) => (messages[key] || '-'); +var translate = function (key) { return (messages[key] || '-'); }; +exports.translate = translate; function isMobileViewport() { // return false for server side rendering if (typeof window == 'undefined') return false; - const width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; + var width = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth; return width < 1200; } exports.isMobileViewport = isMobileViewport; diff --git a/bin/src/model.js b/bin/src/model.js index e766b24..32c7836 100644 --- a/bin/src/model.js +++ b/bin/src/model.js @@ -1,18 +1,56 @@ "use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from) { + for (var i = 0, il = from.length, j = to.length; i < il; i++, j++) + to[j] = from[i]; + return to; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.getFirstLetter = exports.groupByFirstLetter = exports.groupByQuadrants = exports.featuredOnly = void 0; -exports.featuredOnly = (items) => items.filter(item => item.featured); -exports.groupByQuadrants = (items) => items.reduce((quadrants, item) => (Object.assign(Object.assign({}, quadrants), { [item.quadrant]: addItemToQuadrant(quadrants[item.quadrant], item) })), {}); -exports.groupByFirstLetter = (items) => { - const index = items.reduce((letterIndex, item) => (Object.assign(Object.assign({}, letterIndex), { [exports.getFirstLetter(item)]: addItemToList(letterIndex[exports.getFirstLetter(item)], item) })), {}); +var featuredOnly = function (items) { return items.filter(function (item) { return item.featured; }); }; +exports.featuredOnly = featuredOnly; +var groupByQuadrants = function (items) { + return items.reduce(function (quadrants, item) { + var _a; + return (__assign(__assign({}, quadrants), (_a = {}, _a[item.quadrant] = addItemToQuadrant(quadrants[item.quadrant], item), _a))); + }, {}); +}; +exports.groupByQuadrants = groupByQuadrants; +var groupByFirstLetter = function (items) { + var index = items.reduce(function (letterIndex, item) { + var _a; + return (__assign(__assign({}, letterIndex), (_a = {}, _a[exports.getFirstLetter(item)] = addItemToList(letterIndex[exports.getFirstLetter(item)], item), _a))); + }, {}); return Object.keys(index) .sort() - .map(letter => ({ - letter, + .map(function (letter) { return ({ + letter: letter, items: index[letter], - })); + }); }); }; -const addItemToQuadrant = (quadrant = {}, item) => (Object.assign(Object.assign({}, quadrant), { [item.ring]: addItemToRing(quadrant[item.ring], item) })); -const addItemToList = (list = [], item) => [...list, item]; -const addItemToRing = (ring = [], item) => [...ring, item]; -exports.getFirstLetter = (item) => item.title.substr(0, 1).toUpperCase(); +exports.groupByFirstLetter = groupByFirstLetter; +var addItemToQuadrant = function (quadrant, item) { + var _a; + if (quadrant === void 0) { quadrant = {}; } + return (__assign(__assign({}, quadrant), (_a = {}, _a[item.ring] = addItemToRing(quadrant[item.ring], item), _a))); +}; +var addItemToList = function (list, item) { + if (list === void 0) { list = []; } + return __spreadArray(__spreadArray([], list), [item]); +}; +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(); }; +exports.getFirstLetter = getFirstLetter; diff --git a/bin/tasks/create-static.js b/bin/tasks/create-static.js old mode 100755 new mode 100644 index 0e138f2..bd5def7 --- a/bin/tasks/create-static.js +++ b/bin/tasks/create-static.js @@ -9,26 +9,63 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; Object.defineProperty(exports, "__esModule", { value: true }); -const radar_1 = require("./radar"); -const fs_1 = require("fs"); -const config_1 = require("../src/config"); -(() => __awaiter(void 0, void 0, void 0, function* () { - try { - console.log('starting static'); - const radar = yield radar_1.createRadar(); - fs_1.copyFileSync('build/index.html', 'build/overview.html'); - fs_1.copyFileSync('build/index.html', 'build/help-and-about-tech-radar.html'); - config_1.quadrants.forEach(quadrant => { - fs_1.copyFileSync('build/index.html', 'build/' + quadrant + '.html'); - fs_1.mkdirSync('build/' + quadrant); - }); - radar.items.forEach(item => { - fs_1.copyFileSync('build/index.html', 'build/' + item.quadrant + '/' + item.name + '.html'); - }); - console.log('created static'); - } - catch (e) { - console.error('error:', e); - } -}))(); +var radar_1 = require("./radar"); +var fs_1 = require("fs"); +var config_1 = require("../src/config"); +(function () { return __awaiter(void 0, void 0, void 0, function () { + var radar, e_1; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: + _a.trys.push([0, 2, , 3]); + console.log('starting static'); + return [4 /*yield*/, radar_1.createRadar()]; + case 1: + radar = _a.sent(); + fs_1.copyFileSync('build/index.html', 'build/overview.html'); + fs_1.copyFileSync('build/index.html', 'build/help-and-about-tech-radar.html'); + config_1.quadrants.forEach(function (quadrant) { + fs_1.copyFileSync('build/index.html', 'build/' + quadrant + '.html'); + fs_1.mkdirSync('build/' + quadrant); + }); + radar.items.forEach(function (item) { + fs_1.copyFileSync('build/index.html', 'build/' + item.quadrant + '/' + item.name + '.html'); + }); + console.log('created static'); + return [3 /*break*/, 3]; + case 2: + e_1 = _a.sent(); + console.error('error:', e_1); + return [3 /*break*/, 3]; + case 3: return [2 /*return*/]; + } + }); +}); })(); diff --git a/bin/tasks/file.js b/bin/tasks/file.js old mode 100755 new mode 100644 index 8d23a03..7da2b7e --- a/bin/tasks/file.js +++ b/bin/tasks/file.js @@ -1,43 +1,120 @@ "use strict"; +var __spreadArray = (this && this.__spreadArray) || function (to, from) { + for (var i = 0, il = from.length, j = to.length; i < il; i++, j++) + to[j] = from[i]; + return to; +}; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.save = exports.getAllMarkdownFiles = exports.distPath = exports.jsPath = exports.faviconPath = exports.assetsPath = exports.stylesPath = exports.radarPath = exports.relativePath = void 0; -const fs_extra_1 = require("fs-extra"); -const path_1 = __importDefault(require("path")); -const walk_1 = require("walk"); -exports.relativePath = (...relativePath) => ( -// path.resolve(__dirname, '..', ...relativePath) -path_1.default.resolve(...relativePath)); -exports.radarPath = (...pathInSrc) => (exports.relativePath('radar', ...pathInSrc)); -exports.stylesPath = (...pathInSrc) => (exports.relativePath('styles', ...pathInSrc)); -exports.assetsPath = (...pathInSrc) => (exports.relativePath('assets', ...pathInSrc)); -exports.faviconPath = (...pathInSrc) => (exports.relativePath('assets/favicon.ico', ...pathInSrc)); -exports.jsPath = (...pathInSrc) => (exports.relativePath('js', ...pathInSrc)); -exports.distPath = (...pathInDist) => (exports.relativePath('src', ...pathInDist)); -exports.getAllMarkdownFiles = (folder) => (getAllFiles(folder, isMarkdownFile)); -const getAllFiles = (folder, predicate) => (new Promise((resolve, reject) => { - const walker = walk_1.walk(folder, { followLinks: false }); - const files = []; - walker.on("file", (root, fileStat, next) => { - if (predicate(fileStat.name)) { - files.push(path_1.default.resolve(root, fileStat.name)); - } - next(); - }); - walker.on("errors", (root, nodeStatsArray, next) => { - nodeStatsArray.forEach(function (n) { - console.error("[ERROR] " + n.name); - if (n.error) { - console.error(n.error.message || (n.error.code + ": " + n.error.path)); +exports.save = exports.getAllMarkdownFiles = exports.builderPath = exports.buildPath = exports.publicPath = exports.jsPath = exports.faviconPath = exports.assetsPath = exports.stylesPath = exports.radarPath = exports.relativePath = void 0; +var fs_extra_1 = require("fs-extra"); +var path_1 = __importDefault(require("path")); +var walk_1 = require("walk"); +var relativePath = function () { + var relativePath = []; + for (var _i = 0; _i < arguments.length; _i++) { + relativePath[_i] = arguments[_i]; + } + // path.resolve(__dirname, '..', ...relativePath) + return path_1.default.resolve.apply(path_1.default, relativePath); +}; +exports.relativePath = relativePath; +var radarPath = function () { + var pathInSrc = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInSrc[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["radar"], pathInSrc)); +}; +exports.radarPath = radarPath; +var stylesPath = function () { + var pathInSrc = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInSrc[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["styles"], pathInSrc)); +}; +exports.stylesPath = stylesPath; +var assetsPath = function () { + var pathInSrc = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInSrc[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["assets"], pathInSrc)); +}; +exports.assetsPath = assetsPath; +var faviconPath = function () { + var pathInSrc = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInSrc[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["assets/favicon.ico"], pathInSrc)); +}; +exports.faviconPath = faviconPath; +var jsPath = function () { + var pathInSrc = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInSrc[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["js"], pathInSrc)); +}; +exports.jsPath = jsPath; +var publicPath = function () { + var pathInDist = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInDist[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["public"], pathInDist)); +}; +exports.publicPath = publicPath; +var buildPath = function () { + var pathInDist = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInDist[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["build"], pathInDist)); +}; +exports.buildPath = buildPath; +var builderPath = function () { + var pathInDist = []; + for (var _i = 0; _i < arguments.length; _i++) { + pathInDist[_i] = arguments[_i]; + } + return exports.relativePath.apply(void 0, __spreadArray(["node_modules", "aoe_technology_radar", "src"], pathInDist)); +}; +exports.builderPath = builderPath; +var getAllMarkdownFiles = function (folder) { + return getAllFiles(folder, isMarkdownFile); +}; +exports.getAllMarkdownFiles = getAllMarkdownFiles; +var getAllFiles = function (folder, predicate) { + return new Promise(function (resolve, reject) { + var walker = walk_1.walk(folder, { followLinks: false }); + var files = []; + walker.on("file", function (root, fileStat, next) { + if (predicate(fileStat.name)) { + files.push(path_1.default.resolve(root, fileStat.name)); } + next(); + }); + walker.on("errors", function (root, nodeStatsArray, next) { + nodeStatsArray.forEach(function (n) { + console.error("[ERROR] " + n.name); + if (n.error) { + console.error(n.error.message || n.error.code + ": " + n.error.path); + } + }); + next(); + }); + walker.on("end", function () { + resolve(files.sort()); }); - next(); }); - walker.on("end", () => { - resolve(files.sort()); - }); -})); -const isMarkdownFile = (name) => name.match(/\.md$/) !== null; -exports.save = (data, fileName) => fs_extra_1.outputFile(exports.distPath(fileName), data); +}; +var isMarkdownFile = function (name) { return name.match(/\.md$/) !== null; }; +var save = function (data, fileName) { + return fs_extra_1.outputFile(exports.buildPath(fileName), data); +}; +exports.save = save; diff --git a/bin/tasks/radar.js b/bin/tasks/radar.js old mode 100755 new mode 100644 index 61d243c..4b88945 --- a/bin/tasks/radar.js +++ b/bin/tasks/radar.js @@ -1,4 +1,15 @@ "use strict"; +var __assign = (this && this.__assign) || function () { + __assign = Object.assign || function(t) { + for (var s, i = 1, n = arguments.length; i < n; i++) { + s = arguments[i]; + for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) + t[p] = s[p]; + } + return t; + }; + return __assign.apply(this, arguments); +}; var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } return new (P || (P = Promise))(function (resolve, reject) { @@ -8,110 +19,170 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; +var __spreadArray = (this && this.__spreadArray) || function (to, from) { + for (var i = 0, il = from.length, j = to.length; i < il; i++, j++) + to[j] = from[i]; + return to; +}; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); exports.createRadar = void 0; -const fs_extra_1 = require("fs-extra"); -const path_1 = __importDefault(require("path")); -const front_matter_1 = __importDefault(require("front-matter")); -const marked_1 = __importDefault(require("marked")); -const highlight_js_1 = __importDefault(require("highlight.js")); -const config_1 = require("../src/config"); -const file_1 = require("./file"); +var fs_extra_1 = require("fs-extra"); +var path_1 = __importDefault(require("path")); +var front_matter_1 = __importDefault(require("front-matter")); +var marked_1 = __importDefault(require("marked")); +var highlight_js_1 = __importDefault(require("highlight.js")); +var config_1 = require("../src/config"); +var file_1 = require("./file"); marked_1.default.setOptions({ - highlight: code => highlight_js_1.default.highlightAuto(code).value, + highlight: function (code) { return highlight_js_1.default.highlightAuto(code).value; }, }); -exports.createRadar = () => __awaiter(void 0, void 0, void 0, function* () { - const fileNames = yield file_1.getAllMarkdownFiles(file_1.radarPath()); - const revisions = yield createRevisionsFromFiles(fileNames); - const allReleases = getAllReleases(revisions); - const items = createItems(revisions); - const flaggedItems = flagItem(items, allReleases); - return { - items: flaggedItems, - releases: allReleases, - }; -}); -const checkAttributes = (fileName, attributes) => { +var createRadar = function () { return __awaiter(void 0, void 0, void 0, function () { + var fileNames, revisions, allReleases, items, flaggedItems; + return __generator(this, function (_a) { + switch (_a.label) { + case 0: return [4 /*yield*/, file_1.getAllMarkdownFiles(file_1.radarPath())]; + case 1: + fileNames = _a.sent(); + return [4 /*yield*/, createRevisionsFromFiles(fileNames)]; + case 2: + revisions = _a.sent(); + allReleases = getAllReleases(revisions); + items = createItems(revisions); + flaggedItems = flagItem(items, allReleases); + return [2 /*return*/, { + items: flaggedItems, + releases: allReleases, + }]; + } + }); +}); }; +exports.createRadar = createRadar; +var checkAttributes = function (fileName, attributes) { if (attributes.ring && !config_1.rings.includes(attributes.ring)) { - throw new Error(`Error: ${fileName} has an illegal value for 'ring' - must be one of ${config_1.rings}`); + throw new Error("Error: " + fileName + " has an illegal value for 'ring' - must be one of " + config_1.rings); } if (attributes.quadrant && !config_1.quadrants.includes(attributes.quadrant)) { - throw new Error(`Error: ${fileName} has an illegal value for 'quadrant' - must be one of ${config_1.quadrants}`); + throw new Error("Error: " + fileName + " has an illegal value for 'quadrant' - must be one of " + config_1.quadrants); } return attributes; }; -const createRevisionsFromFiles = (fileNames) => Promise.all(fileNames.map(fileName => { - return new Promise((resolve, reject) => { - fs_extra_1.readFile(fileName, 'utf8', (err, data) => { - if (err) { - reject(err); - } - else { - const fm = front_matter_1.default(data); - // add target attribute to external links - // todo: check path - let html = marked_1.default(fm.body.replace(/\]\(\//g, '](/techradar/')); - html = html.replace(/a href="http/g, 'a target="_blank" rel="noopener noreferrer" href="http'); - resolve(Object.assign(Object.assign(Object.assign({}, itemInfoFromFilename(fileName)), checkAttributes(fileName, fm.attributes)), { fileName, body: html })); - } +var createRevisionsFromFiles = function (fileNames) { + return Promise.all(fileNames.map(function (fileName) { + return new Promise(function (resolve, reject) { + fs_extra_1.readFile(fileName, 'utf8', function (err, data) { + if (err) { + reject(err); + } + else { + var fm = front_matter_1.default(data); + // add target attribute to external links + // todo: check path + var html = marked_1.default(fm.body.replace(/\]\(\//g, '](/techradar/')); + html = html.replace(/a href="http/g, 'a target="_blank" rel="noopener noreferrer" href="http'); + resolve(__assign(__assign(__assign({}, itemInfoFromFilename(fileName)), checkAttributes(fileName, fm.attributes)), { fileName: fileName, body: html })); + } + }); }); - }); -})); -const itemInfoFromFilename = (fileName) => { - const [release, name] = fileName.split(path_1.default.sep).slice(-2); + })); +}; +var itemInfoFromFilename = function (fileName) { + var _a = fileName.split(path_1.default.sep).slice(-2), release = _a[0], name = _a[1]; return { name: path_1.default.basename(name, '.md'), - release, + release: release, }; }; -const getAllReleases = (revisions) => revisions - .reduce((allReleases, { release }) => { - if (!allReleases.includes(release)) { - return [...allReleases, release]; - } - return allReleases; -}, []) - .sort(); -const createItems = (revisions) => { - const itemMap = revisions.reduce((items, revision) => { - return Object.assign(Object.assign({}, items), { [revision.name]: addRevisionToItem(items[revision.name], revision) }); - }, {}); - return Object.values(itemMap).map(item => (Object.assign(Object.assign({}, item), { ['title']: item.title || item.name }))).sort((x, y) => (x.name > y.name ? 1 : -1)); +var getAllReleases = function (revisions) { + return revisions + .reduce(function (allReleases, _a) { + var release = _a.release; + if (!allReleases.includes(release)) { + return __spreadArray(__spreadArray([], allReleases), [release]); + } + return allReleases; + }, []) + .sort(); }; -const ignoreEmptyRevisionBody = (revision, item) => { +var createItems = function (revisions) { + var itemMap = revisions.reduce(function (items, revision) { + var _a; + return __assign(__assign({}, items), (_a = {}, _a[revision.name] = addRevisionToItem(items[revision.name], revision), _a)); + }, {}); + return Object.values(itemMap).map(function (item) { + var _a; + return (__assign(__assign({}, item), (_a = {}, _a['title'] = item.title || item.name, _a))); + }).sort(function (x, y) { return (x.name > y.name ? 1 : -1); }); +}; +var ignoreEmptyRevisionBody = function (revision, item) { if (!revision.body || revision.body.trim() === '') { return item.body; } return revision.body; }; -const addRevisionToItem = (item = { - flag: 'default', - featured: true, - revisions: [], - name: '', - title: '', - ring: 'trial', - quadrant: '', - body: '', - info: '', -}, revision) => { - let newItem = Object.assign(Object.assign(Object.assign({}, item), revision), { body: ignoreEmptyRevisionBody(revision, item) }); +var addRevisionToItem = function (item, revision) { + if (item === void 0) { item = { + flag: 'default', + featured: true, + revisions: [], + name: '', + title: '', + ring: 'trial', + quadrant: '', + body: '', + info: '', + }; } + var newItem = __assign(__assign(__assign({}, item), revision), { body: ignoreEmptyRevisionBody(revision, item) }); if (revisionCreatesNewHistoryEntry(revision)) { - newItem = Object.assign(Object.assign({}, newItem), { revisions: [revision, ...newItem.revisions] }); + newItem = __assign(__assign({}, newItem), { revisions: __spreadArray([revision], newItem.revisions) }); } return newItem; }; -const revisionCreatesNewHistoryEntry = (revision) => { +var revisionCreatesNewHistoryEntry = function (revision) { return revision.body.trim() !== '' || typeof revision.ring !== 'undefined'; }; -const flagItem = (items, allReleases) => items.map(item => (Object.assign(Object.assign({}, item), { flag: getItemFlag(item, allReleases) })), []); -const isInLastRelease = (item, allReleases) => item.revisions[0].release === allReleases[allReleases.length - 1]; -const isNewItem = (item, allReleases) => item.revisions.length === 1 && isInLastRelease(item, allReleases); -const hasItemChanged = (item, allReleases) => item.revisions.length > 1 && isInLastRelease(item, allReleases); -const getItemFlag = (item, allReleases) => { +var flagItem = function (items, allReleases) { + return items.map(function (item) { return (__assign(__assign({}, item), { flag: getItemFlag(item, allReleases) })); }, []); +}; +var isInLastRelease = function (item, allReleases) { + return item.revisions[0].release === allReleases[allReleases.length - 1]; +}; +var isNewItem = function (item, allReleases) { + return item.revisions.length === 1 && isInLastRelease(item, allReleases); +}; +var hasItemChanged = function (item, allReleases) { + return item.revisions.length > 1 && isInLastRelease(item, allReleases); +}; +var getItemFlag = function (item, allReleases) { if (isNewItem(item, allReleases)) { return 'new'; } diff --git a/bin/tasks/radarjson.js b/bin/tasks/radarjson.js old mode 100755 new mode 100644 index 847eb1a..af63e4d --- a/bin/tasks/radarjson.js +++ b/bin/tasks/radarjson.js @@ -9,33 +9,56 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; +var __generator = (this && this.__generator) || function (thisArg, body) { + var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g; + return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g; + function verb(n) { return function (v) { return step([n, v]); }; } + function step(op) { + if (f) throw new TypeError("Generator is already executing."); + while (_) try { + if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t; + if (y = 0, t) op = [op[0] & 2, t.value]; + switch (op[0]) { + case 0: case 1: t = op; break; + case 4: _.label++; return { value: op[1], done: false }; + case 5: _.label++; y = op[1]; op = [0]; continue; + case 7: op = _.ops.pop(); _.trys.pop(); continue; + default: + if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; } + if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; } + if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; } + if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; } + if (t[2]) _.ops.pop(); + _.trys.pop(); continue; + } + op = body.call(thisArg, _); + } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; } + if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true }; + } +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.radarJsonGenerator = void 0; -const radar_1 = require("./radar"); -const file_1 = require("./file"); -exports.radarJsonGenerator = (() => __awaiter(void 0, void 0, void 0, function* () { - try { - console.log('start'); - const radar = yield radar_1.createRadar(); - // console.log(radar); - file_1.save(JSON.stringify(radar), 'rd.json'); - file_1.save(`import React from 'react'; -import ReactDOM from 'react-dom'; -import App from 'aoe_technology_radar/src/components/App'; -import 'aoe_technology_radar/src/index.scss'; -import {Item} from "aoe_technology_radar/src/model"; -import radardata from './rd.json'; - -ReactDOM.render( - - - , - document.getElementById('root') -); -`, 'index.tsx'); - console.log('Built radar'); - } - catch (e) { - console.error('error:', e); - } -})); +var radar_1 = require("./radar"); +var file_1 = require("./file"); +var radarJsonGenerator = function () { return __awaiter(void 0, void 0, void 0, function () { + var 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()]; + case 1: + radar = _a.sent(); + return [4 /*yield*/, file_1.save(JSON.stringify(radar), "rd.json")]; + case 2: + _a.sent(); + return [3 /*break*/, 4]; + case 3: + e_1 = _a.sent(); + console.error("error:", e_1); + return [3 /*break*/, 4]; + case 4: return [2 /*return*/]; + } + }); +}); }; +exports.radarJsonGenerator = radarJsonGenerator; diff --git a/config/env.js b/config/env.js deleted file mode 100644 index 86630b0..0000000 --- a/config/env.js +++ /dev/null @@ -1,104 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')]; - -const NODE_ENV = process.env.NODE_ENV; -if (!NODE_ENV) { - throw new Error( - 'The NODE_ENV environment variable is required but was not specified.' - ); -} - -// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use -const dotenvFiles = [ - `${paths.dotenv}.${NODE_ENV}.local`, - `${paths.dotenv}.${NODE_ENV}`, - // Don't include `.env.local` for `test` environment - // since normally you expect tests to produce the same - // results for everyone - NODE_ENV !== 'test' && `${paths.dotenv}.local`, - paths.dotenv, -].filter(Boolean); - -// Load environment variables from .env* files. Suppress warnings using silent -// if this file is missing. dotenv will never modify any environment variables -// that have already been set. Variable expansion is supported in .env files. -// https://github.com/motdotla/dotenv -// https://github.com/motdotla/dotenv-expand -dotenvFiles.forEach(dotenvFile => { - if (fs.existsSync(dotenvFile)) { - require('dotenv-expand')( - require('dotenv').config({ - path: dotenvFile, - }) - ); - } -}); - -// We support resolving modules according to `NODE_PATH`. -// This lets you use absolute paths in imports inside large monorepos: -// https://github.com/facebook/create-react-app/issues/253. -// It works similar to `NODE_PATH` in Node itself: -// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders -// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. -// Otherwise, we risk importing Node.js core modules into an app instead of webpack shims. -// https://github.com/facebook/create-react-app/issues/1023#issuecomment-265344421 -// We also resolve them to make sure all tools using them work consistently. -const appDirectory = fs.realpathSync(process.cwd()); -process.env.NODE_PATH = (process.env.NODE_PATH || '') - .split(path.delimiter) - .filter(folder => folder && !path.isAbsolute(folder)) - .map(folder => path.resolve(appDirectory, folder)) - .join(path.delimiter); - -// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be -// injected into the application via DefinePlugin in webpack configuration. -const REACT_APP = /^REACT_APP_/i; - -function getClientEnvironment(publicUrl) { - const raw = Object.keys(process.env) - .filter(key => REACT_APP.test(key)) - .reduce( - (env, key) => { - env[key] = process.env[key]; - return env; - }, - { - // Useful for determining whether we’re running in production mode. - // Most importantly, it switches React into the correct mode. - NODE_ENV: process.env.NODE_ENV || 'development', - // Useful for resolving the correct path to static assets in `public`. - // For example, . - // This should only be used as an escape hatch. Normally you would put - // images into the `src` and `import` them in code to get their paths. - PUBLIC_URL: publicUrl, - - RADAR_NAME: process.env.RADAR_NAME || 'AOE Technology Radar', - - // We support configuring the sockjs pathname during development. - // These settings let a developer run multiple simultaneous projects. - // They are used as the connection `hostname`, `pathname` and `port` - // in webpackHotDevClient. They are used as the `sockHost`, `sockPath` - // and `sockPort` options in webpack-dev-server. - WDS_SOCKET_HOST: process.env.WDS_SOCKET_HOST, - WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH, - WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT, - } - ); - // Stringify all values so we can feed into webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]); - return env; - }, {}), - }; - - return { raw, stringified }; -} - -module.exports = getClientEnvironment; diff --git a/config/getHttpsConfig.js b/config/getHttpsConfig.js deleted file mode 100644 index 013d493..0000000 --- a/config/getHttpsConfig.js +++ /dev/null @@ -1,66 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const crypto = require('crypto'); -const chalk = require('react-dev-utils/chalk'); -const paths = require('./paths'); - -// Ensure the certificate and key provided are valid and if not -// throw an easy to debug error -function validateKeyAndCerts({ cert, key, keyFile, crtFile }) { - let encrypted; - try { - // publicEncrypt will throw an error with an invalid cert - encrypted = crypto.publicEncrypt(cert, Buffer.from('test')); - } catch (err) { - throw new Error( - `The certificate "${chalk.yellow(crtFile)}" is invalid.\n${err.message}` - ); - } - - try { - // privateDecrypt will throw an error with an invalid key - crypto.privateDecrypt(key, encrypted); - } catch (err) { - throw new Error( - `The certificate key "${chalk.yellow(keyFile)}" is invalid.\n${ - err.message - }` - ); - } -} - -// Read file and throw an error if it doesn't exist -function readEnvFile(file, type) { - if (!fs.existsSync(file)) { - throw new Error( - `You specified ${chalk.cyan( - type - )} in your env, but the file "${chalk.yellow(file)}" can't be found.` - ); - } - return fs.readFileSync(file); -} - -// Get the https config -// Return cert files if provided in env, otherwise just true or false -function getHttpsConfig() { - const { SSL_CRT_FILE, SSL_KEY_FILE, HTTPS } = process.env; - const isHttps = HTTPS === 'true'; - - if (isHttps && SSL_CRT_FILE && SSL_KEY_FILE) { - const crtFile = path.resolve(paths.appPath, SSL_CRT_FILE); - const keyFile = path.resolve(paths.appPath, SSL_KEY_FILE); - const config = { - cert: readEnvFile(crtFile, 'SSL_CRT_FILE'), - key: readEnvFile(keyFile, 'SSL_KEY_FILE'), - }; - - validateKeyAndCerts({ ...config, keyFile, crtFile }); - return config; - } - return isHttps; -} - -module.exports = getHttpsConfig; diff --git a/config/jest/cssTransform.js b/config/jest/cssTransform.js deleted file mode 100644 index 8f65114..0000000 --- a/config/jest/cssTransform.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -// This is a custom Jest transformer turning style imports into empty objects. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process() { - return 'module.exports = {};'; - }, - getCacheKey() { - // The output is always the same. - return 'cssTransform'; - }, -}; diff --git a/config/jest/fileTransform.js b/config/jest/fileTransform.js deleted file mode 100644 index aab6761..0000000 --- a/config/jest/fileTransform.js +++ /dev/null @@ -1,40 +0,0 @@ -'use strict'; - -const path = require('path'); -const camelcase = require('camelcase'); - -// This is a custom Jest transformer turning file imports into filenames. -// http://facebook.github.io/jest/docs/en/webpack.html - -module.exports = { - process(src, filename) { - const assetFilename = JSON.stringify(path.basename(filename)); - - if (filename.match(/\.svg$/)) { - // Based on how SVGR generates a component name: - // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6 - const pascalCaseFilename = camelcase(path.parse(filename).name, { - pascalCase: true, - }); - const componentName = `Svg${pascalCaseFilename}`; - return `const React = require('react'); - module.exports = { - __esModule: true, - default: ${assetFilename}, - ReactComponent: React.forwardRef(function ${componentName}(props, ref) { - return { - $$typeof: Symbol.for('react.element'), - type: 'svg', - ref: ref, - key: null, - props: Object.assign({}, props, { - children: ${assetFilename} - }) - }; - }), - };`; - } - - return `module.exports = ${assetFilename};`; - }, -}; diff --git a/config/modules.js b/config/modules.js deleted file mode 100644 index c8efd0d..0000000 --- a/config/modules.js +++ /dev/null @@ -1,141 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); -const chalk = require('react-dev-utils/chalk'); -const resolve = require('resolve'); - -/** - * Get additional module paths based on the baseUrl of a compilerOptions object. - * - * @param {Object} options - */ -function getAdditionalModulePaths(options = {}) { - const baseUrl = options.baseUrl; - - // We need to explicitly check for null and undefined (and not a falsy value) because - // TypeScript treats an empty string as `.`. - if (baseUrl == null) { - // If there's no baseUrl set we respect NODE_PATH - // Note that NODE_PATH is deprecated and will be removed - // in the next major release of create-react-app. - - const nodePath = process.env.NODE_PATH || ''; - return nodePath.split(path.delimiter).filter(Boolean); - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - // We don't need to do anything if `baseUrl` is set to `node_modules`. This is - // the default behavior. - if (path.relative(paths.appNodeModules, baseUrlResolved) === '') { - return null; - } - - // Allow the user set the `baseUrl` to `appSrc`. - if (path.relative(paths.appSrc, baseUrlResolved) === '') { - return [paths.appSrc]; - } - - // If the path is equal to the root directory we ignore it here. - // We don't want to allow importing from the root directly as source files are - // not transpiled outside of `src`. We do allow importing them with the - // absolute path (e.g. `src/Components/Button.js`) but we set that up with - // an alias. - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return null; - } - - // Otherwise, throw an error. - throw new Error( - chalk.red.bold( - "Your project's `baseUrl` can only be set to `src` or `node_modules`." + - ' Create React App does not support other values at this time.' - ) - ); -} - -/** - * Get webpack aliases based on the baseUrl of a compilerOptions object. - * - * @param {*} options - */ -function getWebpackAliases(options = {}) { - const baseUrl = options.baseUrl; - - if (!baseUrl) { - return {}; - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return { - src: paths.appSrc, - }; - } -} - -/** - * Get jest aliases based on the baseUrl of a compilerOptions object. - * - * @param {*} options - */ -function getJestAliases(options = {}) { - const baseUrl = options.baseUrl; - - if (!baseUrl) { - return {}; - } - - const baseUrlResolved = path.resolve(paths.appPath, baseUrl); - - if (path.relative(paths.appPath, baseUrlResolved) === '') { - return { - '^src/(.*)$': '/src/$1', - }; - } -} - -function getModules() { - // Check if TypeScript is setup - const hasTsConfig = fs.existsSync(paths.appTsConfig); - const hasJsConfig = fs.existsSync(paths.appJsConfig); - - if (hasTsConfig && hasJsConfig) { - throw new Error( - 'You have both a tsconfig.json and a jsconfig.json. If you are using TypeScript please remove your jsconfig.json file.' - ); - } - - let config; - - // If there's a tsconfig.json we assume it's a - // TypeScript project and set up the config - // based on tsconfig.json - if (hasTsConfig) { - const ts = require(resolve.sync('typescript', { - basedir: paths.appNodeModules, - })); - config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config; - // Otherwise we'll check if there is jsconfig.json - // for non TS projects. - } else if (hasJsConfig) { - config = require(paths.appJsConfig); - } - - config = config || {}; - const options = config.compilerOptions || {}; - - const additionalModulePaths = getAdditionalModulePaths(options); - - return { - additionalModulePaths: additionalModulePaths, - webpackAliases: getWebpackAliases(options), - jestAliases: getJestAliases(options), - hasTsConfig, - }; -} - -module.exports = getModules(); diff --git a/config/paths.js b/config/paths.js deleted file mode 100644 index 74abf0a..0000000 --- a/config/paths.js +++ /dev/null @@ -1,75 +0,0 @@ -'use strict'; - -const path = require('path'); -const fs = require('fs'); -const getPublicUrlOrPath = require('react-dev-utils/getPublicUrlOrPath'); - -// Make sure any symlinks in the project folder are resolved: -// https://github.com/facebook/create-react-app/issues/637 -const appDirectory = fs.realpathSync(process.cwd()); -const resolveApp = relativePath => path.resolve(appDirectory, relativePath); -const templateDirectory = fs.realpathSync(__dirname); -const resolveTemplate = relativePath => path.resolve(templateDirectory, '..', relativePath); - -// We use `PUBLIC_URL` environment variable or "homepage" field to infer -// "public path" at which the app is served. -// webpack needs to know it to put the right