Merge pull request #68 from fs-webdev/moreUpdates

More updates

Author: joeycozza

packages/react-scripts/scripts/init.js

@@ -108,8 +108,6 @@ module.exports = async function(appPath, appName, verbose, originalDirectory, te
  JSON.stringify(appPackage, null, 2) + os.EOL
  );
 
- frontierInit.packageJsonWritten();
-
  const readmeExists = fs.existsSync(path.join(appPath, 'README.md'));
  if (readmeExists) {
  fs.renameSync(path.join(appPath, 'README.md'), path.join(appPath, 'README.old.md'));
@@ -179,7 +177,7 @@ module.exports = async function(appPath, appName, verbose, originalDirectory, te
  }
  }
 
- frontierInit.installFrontierDependencies(appPath, answers, ownPath);
+ frontierInit.installFrontierDependencies(appPath, appName, answers, ownPath);
 
  if (useTypeScript) {
  verifyTypeScriptSetup();

packages/react-scripts/scripts/utils/frontierInit.js

@@ -10,7 +10,6 @@ const osUtils = require('./osUtils');
 module.exports = {
  installFrontierDependencies,
  promptForConfig,
- packageJsonWritten,
 };
 
 const polymerFromCDNCode = `
@@ -48,9 +47,7 @@ async function promptForConfig() {
  return answers;
 }
 
-function packageJsonWritten() {}
-
-function installFrontierDependencies(appPath, answers, ownPath) {
+function installFrontierDependencies(appPath, appName, answers, ownPath) {
  const { additionalFeatures } = answers;
  const usePolymer = additionalFeatures.includes('polymer');
  const useEF = additionalFeatures.includes('electric-flow');
@@ -106,18 +103,21 @@ function installFrontierDependencies(appPath, answers, ownPath) {
  });
  installModulesSync(depsToInstall);
  installModulesSync(devDepsToInstall, true);
+
+ replaceStringInFile(appPath, './README.md', /\{GITHUB_ORG\}\/\{GITHUB_REPO\}/g, `fs-webdev/${appName}`)
 }
 
 function handlePolymerCodeAndComments(appPath, usePolymer, useHF) {
+ const polymerComment = '<!-- FRONTIER WEBCOMPONENT LOADER CODE FRONTIER -->'
  let filePath = 'public/index.html';
  if (useHF) {
  filePath = 'views/index.ejs';
  }
 
  if (usePolymer) {
- replaceComment(appPath, filePath, polymerFromCDNCode);
+ replaceStringInFile(appPath, filePath, polymerComment, polymerFromCDNCode);
  } else {
- replaceComment(appPath, filePath, '');
+ replaceStringInFile(appPath, filePath, polymerComment, '');
  }
 }
 
@@ -130,14 +130,11 @@ function alterPackageJsonFile(appPath, extendFunction) {
  );
 }
 
-function replaceComment(appPath, fileToInjectIntoPath, stringToInject) {
+function replaceStringInFile(appPath, fileToInjectIntoPath, stringToReplace, stringToInject) {
  const indexPath = path.join(appPath, fileToInjectIntoPath);
  let indexCode = fs.readFileSync(indexPath, 'UTF8');
 
- indexCode = indexCode.replace(
- '<!--FRONTIER WEBCOMPONENT LOADER CODE FRONTIER -->',
- stringToInject
- );
+ indexCode = indexCode.replace(stringToReplace, stringToInject);
  fs.writeFileSync(indexPath, indexCode);
 }
 

packages/react-scripts/template-hf/views/index.ejs

@@ -5,5 +5,5 @@
  page.showHelper = true;
 %>
 <div id='root'></div>
-<!--FRONTIER WEBCOMPONENT LOADER CODE FRONTIER -->
+<!-- FRONTIER WEBCOMPONENT LOADER CODE FRONTIER -->
 <%- include(indexPath) %>

packages/react-scripts/template/README.md

@@ -1,5 +1,6 @@
-This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+[![Build Status](https://travis-ci.org/{GITHUB_ORG}/{GITHUB_REPO}.svg?branch=master)](https://travis-ci.org/{GITHUB_ORG}/{GITHUB_REPO})
 
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 ## Available Scripts
 
 In the project directory, you can run:
@@ -15,54 +16,16 @@ You will also see any lint errors in the console.
 ### `npm test`
 
 Launches the test runner in the interactive watch mode.<br>
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
 
 ### `npm run build`
 
 Builds the app for production to the `build` folder.<br>
 It correctly bundles React in production mode and optimizes the build for the best performance.
 
 The build is minified and the filenames include the hashes.<br>
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `npm run eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
-
-Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
-
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+See the section about [deployment](https://www.familysearch.org/frontier/docs/#/develop/deploy) for more information.
 
 ## Learn More
 
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
-
-To learn React, check out the [React documentation](https://reactjs.org/).
-
-### Code Splitting
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
-
-### Analyzing the Bundle Size
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
-
-### Making a Progressive Web App
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
-
-### Advanced Configuration
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
-
-### Deployment
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
-
-### `npm run build` fails to minify
-
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+You can learn more in the [Frontier Documentation](https://www.familysearch.org/frontier/docs/#/).

packages/react-scripts/template/public/index.html

@@ -5,13 +5,9 @@
  <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
  <meta name="theme-color" content="#000000" />
+
  <!--
- manifest.json provides metadata used when your web app is installed on a
- user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
- -->
- <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
- <!--
- Notice the use of %PUBLIC_URL% in the tags above.
+ Notice the use of %PUBLIC_URL% in the tag above.
  It will be replaced with the URL of the `public` folder during the build.
  Only files inside the `public` folder can be referenced from the HTML.