Read logoHref from snow res.locals for apple-touch-icon for PWAs

Author: jsbalrog

CHANGELOG-FRONTIER.md

@@ -1,3 +1,9 @@
+## 8.10.5
+
+- Add intelligence to `layout.ejs` to use the correct icon for PWAs saved to homescreen.
+- Update package.json to use `prepublishOnly` to run modernizr on layout.
+- Update `README-FRONTIER.md` to reflect the correct steps for testing local changes to `react-scripts`.
+
 ## 8.10.4
 
 - Add @emotion/babel-plugin for cypress tests in apps

README-FRONTIER.md

@@ -16,10 +16,12 @@ That being said, if you want to use our fork "manually", then here is how you do
 If you have cloned this repo and made changes locally and want to test them before committing and publishing here is how.
 
 1. Clone this repo and make any changes needed in `./packages/react-scripts/`
-2. Change directories to where you want a brand new app to be created in (don't run step 3 in an existing repo)
-3. Run the following command  
+2. In the `react-scripts` directory run `npm install`.
+3. Change directories to where you want a brand new app to be created in (don't run step 4 in an existing repo)
+4. Run the following command  
    `npx create-react-app --use-npm --template @fs/cra-template --scripts-version file:${relativePathToYourClonedCreateReactAppRepo}/packages/react-scripts ${your-app-name} `
 
+
 ## Development and Cutting a Release
 
 - All development will be done from the frontierMaster branch

package-lock.json

@@ -14,8 +14,10 @@
     <meta name="description" content="Discover your family history. Explore the world’s largest collection of free family trees, genealogy records and resources.">
     <meta name="google-site-verification" content="VJlFQrAXTCBy0PqVi23EsGD-mpA5KaBhIt8LkrcRbP0" />
     <link href="https://edge.fscdn.org/assets/docs/fs_logo_favicon_sq.png" rel="icon" type="image/x-icon" />
-    <link rel="apple-touch-icon" href="https://edge.fscdn.org/assets/components/hf/assets/img/tree-touch-icon-11024a277f1fda5735de5a9f0f4f75ca.png" />
-
+    
+    <!-- icon used for PWAs saved to homescreen -->
+    <link rel="apple-touch-icon" href="<%= typeof logoHref !== 'undefined' ? logoHref : 'https://edge.fscdn.org/assets/components/hf/assets/img/tree-touch-icon-11024a277f1fda5735de5a9f0f4f75ca.png' %>" />
+    
     <% if (typeof manifestJsonExists === 'undefined' || manifestJsonExists) { %>
       <link rel="manifest" href="<%= typeof appPathOverride !== 'undefined' ? appPathOverride : appPath('') %>/manifest.json" type="application/manifest+json" crossorigin="use-credentials" />
     <% } %>

packages/react-scripts/layout/views/layout.ejs

@@ -1,6 +1,6 @@
 {
   "name": "@fs/react-scripts",
-  "version": "8.10.4",
+  "version": "8.10.5",
   "upstreamVersion": "5.0.1",
   "description": "Configuration and scripts for Create React App.",
   "repository": {
@@ -18,7 +18,7 @@
   "scripts": {
     "prettier": "npx prettier --arrow-parens always --single-quote --trailing-comma es5 --print-width 120 --no-semi --write \"template*/**/*.js\"",
     "fs-publish": "npmPublish",
-    "prepare": "modernizr -c modernizr-config.json -d layout"
+    "prepublishOnly": "npx modernizr -c modernizr-config.json -d layout"
   },
   "files": [
     "bin",