Skip to content

ACTUAL 2.0.1 release #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 7, 2019
Merged

ACTUAL 2.0.1 release #107

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
289091c
Utilize new Root component that includes ErrorBoundary and new useUse…
tylergraf May 7, 2019
875ae1e
Move default Suspense into Root.
tylergraf May 7, 2019
78c9f0e
Run through our eslint.
tylergraf May 7, 2019
5cf51fd
Merge branch 'develop' into root
joeycozza May 7, 2019
558fcb8
Merge pull request #105 from fs-webdev/root
joeycozza May 7, 2019
136441c
Merge branch 'frontierMaster' into develop
joeycozza May 7, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Run through our eslint.
  • Loading branch information
@tylergraf
tylergraf committed May 7, 2019
commit 78c9f0e4e8e873a0fb476739dad875a44397e16d
28 changes: 13 additions & 15 deletions packages/react-scripts/template/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Root from '@fs/zion-root';
import { addTranslations } from '@fs/zion-locale';
import { Router, NotFound } from '@fs/zion-router';
import App from './components/App';
import * as serviceWorker from './serviceWorker';
import translations from './locales';
import React from 'react'
import ReactDOM from 'react-dom'
import Root from '@fs/zion-root'
import { addTranslations } from '@fs/zion-locale'
import { Router, NotFound } from '@fs/zion-router'
import App from './components/App'
import * as serviceWorker from './serviceWorker'
import translations from './locales'

addTranslations(translations);
addTranslations(translations)

const base = window.SERVER_DATA
? new URL(window.SERVER_DATA.appPath).pathname
: '';
const base = window.SERVER_DATA ? new URL(window.SERVER_DATA.appPath).pathname : ''

const FrontierRoot = () => (
<Root>
Expand All @@ -20,11 +18,11 @@ const FrontierRoot = () => (
<NotFound default />
</Router>
</Root>
);
)

ReactDOM.render(<FrontierRoot />, document.getElementById('root'));
ReactDOM.render(<FrontierRoot />, document.getElementById('root'))

// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();
serviceWorker.unregister()