Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c3b679d
wagon wheel logo back in. made the readme a little more pared down an…
joeycozza Mar 14, 2019
3477064
fixing spacing of comment for replacement during frontierInit
joeycozza Mar 14, 2019
0955223
no need for manifest.json right now
joeycozza Mar 14, 2019
b9f40d1
Merge pull request #68 from fs-webdev/moreUpdates
joeycozza Mar 14, 2019
522d90a
1.6.8 version bump
joeycozza Mar 14, 2019
5fb40ca
Merge branch 'frontierMaster' into develop
joeycozza Mar 14, 2019
7fb4397
added error-boundary, user-provider, configured router, etc.
gmdayley Mar 14, 2019
69ac650
Merge branch 'develop' into template-tweaks
gmdayley Mar 14, 2019
c0a11f5
Add i18n
redbugz Mar 14, 2019
a002678
Merge branch 'develop' into i18n
redbugz Mar 14, 2019
7d9f1e8
running prettier on a file
joeycozza Mar 14, 2019
99fad91
Merge pull request #70 from fs-webdev/template-tweaks
joeycozza Mar 14, 2019
7f2dd1d
Merge branch 'develop' into i18n
joeycozza Mar 14, 2019
23ddb6a
Merge pull request #71 from fs-webdev/i18n
joeycozza Mar 14, 2019
259d6df
removing HF and beefing up/fixing styleguidist and the tests (#72)
joeycozza Mar 14, 2019
eebfe1d
adding react and react-dom to the webpack.config.js alias section
joeycozza Mar 14, 2019
217b46d
Merge pull request #74 from fs-webdev/addingAlias
tylergraf Mar 15, 2019
0370c40
1.7.0 bump with react and react-dom aliases
joeycozza Mar 15, 2019
7ab197b
Merge branch 'frontierMaster' into develop
joeycozza Mar 15, 2019
13f99b9
Add i18n to CRA starter template (#73)
redbugz Mar 15, 2019
147d138
updating to the newly named zion components
joeycozza Mar 15, 2019
cbc046e
Merge branch 'develop' of https://github.com/fs-webdev/create-react-a…
joeycozza Mar 15, 2019
20f6c15
incorporating Subnav into the template (#77)
matthewmatician Mar 16, 2019
baca3d7
Add prop-types to template (#76)
redbugz Mar 16, 2019
7e771ec
Restore Heroku prebuild (#79)
redbugz Mar 16, 2019
5c325f8
Fix zion rename and linting (#78)
redbugz Mar 16, 2019
0915f44
Release 1.7.1
redbugz Mar 16, 2019
2277090
Merge branch 'frontierMaster' into develop
redbugz Mar 16, 2019
e86494d
tweak home page style (#81)
gmdayley Mar 18, 2019
f520cf9
App styleguidist update and routing fixes (#82)
redbugz Mar 18, 2019
a5571e0
Release 1.7.2
redbugz Mar 18, 2019
bbadf85
Merge branch 'frontierMaster' into develop
redbugz Mar 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
531 changes: 321 additions & 210 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/react-scripts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/react-scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@fs/react-scripts",
"version": "1.7.1",
"version": "1.7.2",
"upstreamVersion": "2.1.8",
"description": "Configuration and scripts for Create React App.",
"repository": "fs-webdev/create-react-app",
Expand Down
3 changes: 3 additions & 0 deletions packages/react-scripts/scripts/utils/frontierInit.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ function installFrontierDependencies(appPath, appName, answers, ownPath) {
'i18next-scanner@2.10.0',
'@alienfast/i18next-loader@1.0.18',
'react-styleguidist@9.0.4',
'@fs/styleguidist-overrides@1.3.0',
'@fs/configurations@1.3.4',
'dotenv@7.0.0',
'webpack@4.28.3',
'jest-dom@3.1.3',
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@ import React from 'react'
import { css } from '@emotion/core'

const styles = css`
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
`

const HomeHeader = ({ children }) => <header css={styles}>{children}</header>
Expand Down
3 changes: 2 additions & 1 deletion packages/react-scripts/template/src/components/home/Logo.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import logo from './Logo.svg'

const styles = css`
animation: spin infinite 20s linear;
height: 40vmin;
height: 30vmin;
margin: 10px;

@keyframes spin {
from {
Expand Down
8 changes: 7 additions & 1 deletion packages/react-scripts/template/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,24 @@ import ReactDOM from 'react-dom'
import { UserProvider } from '@fs/zion-user'
import RootErrorBoundary from '@fs/zion-error-boundary'
import { I18nProvider, 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)

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

const FrontierRoot = () => (
<RootErrorBoundary>
<Suspense fallback="Loading ...">
<I18nProvider>
<UserProvider>
<App />
<Router>
<App path={`${base}/*`} />
<NotFound default />
</Router>
</UserProvider>
</I18nProvider>
</Suspense>
Expand Down
27 changes: 26 additions & 1 deletion packages/react-scripts/template/styleguide.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,28 @@
require('dotenv')
const styles = require('@fs/styleguidist-overrides/dist/styles.js')
const webpackConfig = require('@fs/configurations/webpack.dev.js')

module.exports = {
webpackConfig: require('@fs/react-scripts/config/webpack.config'),
webpackConfig,
serverPort: 5009,
pagePerSection: true,
theme: {
color: {
sidebarBackground: '#333331',
},
sidebarWidth: 250,
maxWidth: 1200,
},
styles,
styleguideComponents: {
Wrapper: require.resolve('@fs/styleguidist-overrides/dist/Wrapper.js'),
StyleGuideRenderer: require.resolve('@fs/styleguidist-overrides/dist/StyleGuideRenderer.js'),
},
usageMode: 'expand',
configureServer: app => {
// This endpoint returns the current dev environment. Used by the client when in local development.
app.get('/dev-env', (req, res) => {
res.status(200).send({ environment: process.env.REMOTE_ENV || 'beta' })
})
},
}