From 8d6a625bbcd2b783befb73aa1145b1f8d01b2482 Mon Sep 17 00:00:00 2001
From: Logan Allred <allredlt@familysearch.org>
Date: Sat, 16 Mar 2019 00:17:54 -0600
Subject: [PATCH 1/2] Fix zion rename and linting

---
 packages/react-scripts/package-lock.json      |  2 +-
 .../template/src/components/App.js            | 10 ++++--
 .../template/src/components/home/Home.js      | 36 ++++++++++---------
 .../template/src/components/home/Home.test.js |  2 +-
 .../template/src/components/home/Logo.js      |  2 +-
 .../template/src/components/user/UserInfo.js  |  4 +--
 packages/react-scripts/template/src/index.js  |  6 ++--
 .../template/src/locales/index.js             |  2 +-
 .../react-scripts/template/src/setupTests.js  |  2 +-
 9 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/packages/react-scripts/package-lock.json b/packages/react-scripts/package-lock.json
index 41bfe97b7d1..0d0bec8c3cb 100644
--- a/packages/react-scripts/package-lock.json
+++ b/packages/react-scripts/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@fs/react-scripts",
-  "version": "1.6.7",
+  "version": "1.7.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages/react-scripts/template/src/components/App.js b/packages/react-scripts/template/src/components/App.js
index 8aa16c7fa2b..ed093f5b9ed 100644
--- a/packages/react-scripts/template/src/components/App.js
+++ b/packages/react-scripts/template/src/components/App.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Router, Link, NotFound, RequiresAuth } from '@fs/router'
+import { Router, Link, NotFound, RequiresAuth } from '@fs/zion-router'
 import { Trans } from 'react-i18next'
 import Home from './home/Home'
 import UserInfo from './user/UserInfo'
@@ -8,8 +8,12 @@ function App() {
   return (
     <>
       <nav>
-        <Link to="/"><Trans i18nkey="nav.home">Home</Trans></Link>
-        <Link to="user"><Trans i18nkey="nav.userInfo">User Info</Trans></Link>
+        <Link to="/">
+          <Trans i18nKey="nav.home">Home</Trans>
+        </Link>
+        <Link to="user">
+          <Trans i18nKey="nav.userInfo">User Info</Trans>
+        </Link>
       </nav>
 
       <Router>
diff --git a/packages/react-scripts/template/src/components/home/Home.js b/packages/react-scripts/template/src/components/home/Home.js
index 5b86d82c344..863a8dab697 100644
--- a/packages/react-scripts/template/src/components/home/Home.js
+++ b/packages/react-scripts/template/src/components/home/Home.js
@@ -10,24 +10,26 @@ const Home = () => (
     css={css`
       text-align: center;
     `}
-    >
-      <HomeHeader>
-        <Logo />
-        <p>
-          <Trans i18nkey="update.instructions">Edit <code>src/components/App.js</code> and save to reload.</Trans>
-        </p>
-        <a
-          css={css`
+  >
+    <HomeHeader>
+      <Logo />
+      <p>
+        <Trans i18nKey="update.instructions">
+          Edit <code>src/components/App.js</code> and save to reload.
+        </Trans>
+      </p>
+      <a
+        css={css`
           color: #61dafb;
         `}
-          href="https://www.familysearch.org/frontier/docs/#/"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          <Trans i18nkey="learn.frontier">Learn Frontier</Trans>
-        </a>
-      </HomeHeader>
-    </div>
-  )
+        href="https://www.familysearch.org/frontier/docs/#/"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        <Trans i18nKey="learn.frontier">Learn Frontier</Trans>
+      </a>
+    </HomeHeader>
+  </div>
+)
 
 export default Home
diff --git a/packages/react-scripts/template/src/components/home/Home.test.js b/packages/react-scripts/template/src/components/home/Home.test.js
index e6194898c02..ca369bce213 100644
--- a/packages/react-scripts/template/src/components/home/Home.test.js
+++ b/packages/react-scripts/template/src/components/home/Home.test.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { render } from '@fs/testing-library'
+import { render } from '@fs/zion-testing-library'
 import Home from './Home'
 
 test('renders with Learn Frontier on the page', () => {
diff --git a/packages/react-scripts/template/src/components/home/Logo.js b/packages/react-scripts/template/src/components/home/Logo.js
index 1fb802f46fa..9894c24701b 100644
--- a/packages/react-scripts/template/src/components/home/Logo.js
+++ b/packages/react-scripts/template/src/components/home/Logo.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { css } from '@emotion/core'
-import { i18n } from '@fs/locale'
+import { i18n } from '@fs/zion-locale'
 import logo from './Logo.svg'
 
 const styles = css`
diff --git a/packages/react-scripts/template/src/components/user/UserInfo.js b/packages/react-scripts/template/src/components/user/UserInfo.js
index 1681287b620..1de21c8764d 100644
--- a/packages/react-scripts/template/src/components/user/UserInfo.js
+++ b/packages/react-scripts/template/src/components/user/UserInfo.js
@@ -1,9 +1,9 @@
 import React from 'react'
-import { useUser } from '@fs/user'
+import { useUser } from '@fs/zion-user'
 import { useTranslation } from 'react-i18next'
 
 export default function UserInfo() {
   const user = useUser()
   const { t } = useTranslation()
-  return <div>{t('user.greeting', 'Hello, {{user.displayName}}!')}</div>
+  return <div>{t('user.greeting', { user, defaultValue: 'Hello, {{user.displayName}}!' })}</div>
 }
diff --git a/packages/react-scripts/template/src/index.js b/packages/react-scripts/template/src/index.js
index 99d50ba9ae1..743bb0f93bc 100644
--- a/packages/react-scripts/template/src/index.js
+++ b/packages/react-scripts/template/src/index.js
@@ -1,8 +1,8 @@
 import React, { Suspense } from 'react'
 import ReactDOM from 'react-dom'
-import { UserProvider } from '@fs/user'
-import RootErrorBoundary from '@fs/error-boundary'
-import { I18nProvider, addTranslations } from '@fs/locale'
+import { UserProvider } from '@fs/zion-user'
+import RootErrorBoundary from '@fs/zion-error-boundary'
+import { I18nProvider, addTranslations } from '@fs/zion-locale'
 import App from './components/App'
 import * as serviceWorker from './serviceWorker'
 import translations from './locales'
diff --git a/packages/react-scripts/template/src/locales/index.js b/packages/react-scripts/template/src/locales/index.js
index 18eed9c369b..8136f6dd229 100644
--- a/packages/react-scripts/template/src/locales/index.js
+++ b/packages/react-scripts/template/src/locales/index.js
@@ -1 +1 @@
-// This file is intentionally blank, used as a mount point to load the locales
\ No newline at end of file
+// This file is intentionally blank, used as a mount point to load the locales
diff --git a/packages/react-scripts/template/src/setupTests.js b/packages/react-scripts/template/src/setupTests.js
index b0958bc96b5..1af51327d85 100644
--- a/packages/react-scripts/template/src/setupTests.js
+++ b/packages/react-scripts/template/src/setupTests.js
@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { cleanup } from '@fs/testing-library'
+import { cleanup } from '@fs/zion-testing-library'
 import 'jest-dom/extend-expect'
 
 afterEach(cleanup)

From 08f17f645b4cf93656291db29dad687d310154cc Mon Sep 17 00:00:00 2001
From: Logan Allred <allredlt@familysearch.org>
Date: Sat, 16 Mar 2019 01:46:35 -0600
Subject: [PATCH 2/2] add i18next loader

---
 packages/react-scripts/scripts/utils/frontierInit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-scripts/scripts/utils/frontierInit.js b/packages/react-scripts/scripts/utils/frontierInit.js
index 7e5164f9710..5bc1009274e 100644
--- a/packages/react-scripts/scripts/utils/frontierInit.js
+++ b/packages/react-scripts/scripts/utils/frontierInit.js
@@ -69,6 +69,7 @@ function installFrontierDependencies(appPath, appName, answers, ownPath) {
       '@fs/zion-testing-library',
       'eslint@5.12.0',
       'i18next-scanner@2.10.0',
+      '@alienfast/i18next-loader@1.0.18',
       'react-styleguidist@9.0.4',
       'webpack@4.28.3',
       'jest-dom@3.1.3',