diff --git a/README.md b/README.md index 2300fc11d..ac514f9b8 100644 --- a/README.md +++ b/README.md @@ -1,186 +1,16 @@ -# `react-scripts-ts` [![npm version](https://badge.fury.io/js/react-scripts-ts.svg)](https://badge.fury.io/js/react-scripts-ts) [![Build Status](https://travis-ci.org/wmonk/create-react-app-typescript.svg?branch=master)](https://travis-ci.org/wmonk/create-react-app-typescript) +Create React apps with Typescript + Vital Ui Kit -Create React apps (with Typescript) with no build configuration. +Integrating with +- Typescript +- Redux +- React Router +- Styled-components +- Vital UI Kit React - * [Getting Started](#tldr) – How to create a new app. - * [User Guide](https://github.com/wmonk/create-react-app-typescript/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with react scripts ts. - -_Do you know react and want to try out typescript? Or do you know typescript and want to try out react?_ Get all the benefits from `create-react-app` but you use typescript! πŸš€ - -## tl;dr - -```sh -npm install -g create-react-app - -create-react-app my-app --scripts-version=react-scripts-ts -cd my-app/ -npm start -``` - -## Migration - -In general, most upgrades won't require any migration steps to work, but if you experience problems after an upgrade, please file an issue, and we'll add it to the list of migration steps below. - -### From `<2.16.0` to `>=2.16.0` - -Since `2.16.0`, the template uses different `tsconfig` files for both development and production mode. For the latter, unfortunately, the path resolver is not smart enough to fall back to the basic `tsconfig.json` in case the expected `tsconfig.prod.json` is not present, so you have to create this file manually like shown [here](https://github.com/wmonk/create-react-app-typescript/blob/master/packages/react-scripts/template/tsconfig.prod.json). - -### From `<2.13.0` to `>=2.13.0` - -Since `2.13.0`, `typescript` is listed as a peer dependency of `react-scripts-ts`. For projects generated with at least this version, the init script takes care of properly installing it as dev dependency to the generated projects. Older projects require manual installation, in case you have not already done that. - -Using `npm`: -``` -npm i -D typescript +```bash +npx create-react-app my-app --scripts-version=@gssfed/react-scripts ``` -Using `yarn`: -``` -yarn add -D typescript -``` - -### From `<2.5.0` to `>=2.5.0` - -Version `2.5.0` introduces a new config file for jest, that is necessary for the tests to run. If you were previously running a version older than `v2.5.0` and upgraded to `v2.5.0` or newer, you need to manually add the new file, or else you'll get an error similar to this when trying to run your tests: - -```javascript -Test suite failed to run - -{ - "messageText": "Cannot read file 'C:\\[project]\\tsconfig.test.json': ENOENT: no such file or directory, open 'C:\\[project]\\tsconfig.test.json'.", - "category": 1, - "code": 5012 -} -``` - -To fix this, create a new file *in the root of the project* called `tsconfig.test.json`, and paste [the content of this file into it](https://raw.githubusercontent.com/wmonk/create-react-app-typescript/master/packages/react-scripts/template/tsconfig.test.json). Everything should work now. For more info, please see [this issue](https://github.com/wmonk/create-react-app-typescript/issues/141). - -## Changelog - -### 2.16.0 -* Allow `moduleNameMapper` config override - @sebald -* Fix travis build - @DorianGrey -* Allow using different tsconfig file for dev and build - @DorianGrey - -### 2.15.1 -* Fix duplicated mjs entry in Jest config - @StevenLangbroek -* Allow `--watchAll` to be set - @DorianGrey - -### 2.15.0 -* Replace TSLint rules with presets - @nielsdB97 -* Update file-loader exclusion rules - @winstonewert -* Fix Uglifyjs settings - @meandmax -* Merge react-script 1.1.x - @wmonk - -### 2.14.0 -* README fixes - @kaminskypavel -* README fixes - @adambowles -* Remove unused JS files - @DorianGrey -* README fixes - @stephtr -* Added the abillity to import js and jsx files with ts-loader - @GeeWee -* Uglifyjs update for es6 support - @thetric - -### 2.13.0 -* Remove tslint-loader from prod builds - @DorianGrey -* Include typescript as devDependency in boilerplate - @ianschmitz -* Document custom module formats - @joshtynjala -* Fix tsconfig.json - @diabelb - -### 2.12.0 -* Update typescript to 2.6.2 - -### 2.11.0 -* Upgrade to [`react-scripts@1.0.17`](https://github.com/facebookincubator/create-react-app/releases/tag/v1.0.17) - -### 2.10.0 -* README updates - StefanSchoof -* README updates - DorianGrey -* Add support for fork-ts-checker-webpack-plugin - johnnyreilly - -### 2.9.0 - UNPUBLISHED -This included changes that were not published by the facebook upstream, so was unpublished. - -### 2.8.0 -* Update typescript to 2.5.3 - @nicolaserny - -### 2.7.0 -* Merge react-scripts@1.0.13 - @JohnNilsson -* Fix git tempalte - @hktonylee -* Provide migration docs - @JReinhold -* Updated dependencies - @swengorschewski -* Fix tslint config - @comerc - -### 2.6.0 -* Merge react-scripts@1.0.10 - @wmonk -* Update component template - @pelotom - -### 2.5.0 -* Support dynamic imports - thanks @nicolaserny, @DorianGrey -* Fix up tsconfig - thanks @js-n -* Fix readme typo - thanks @adambowles -* Move to ts-jest - thanks @DorianGrey - -### 2.4.0 -* Upgrade typescript to 2.4 and ts-loader to 2.2.1 - thanks @frederickfogerty -* Fix readme typo - thanks @wrongway4you - -### 2.3.2 -* Fix `typescript` version to 2.3.x until 2.4 @types are fixed - -### 2.3.1 - -* All tsc to parse config (for `extend`) - Thanks to @DorianGrey -* Fix various jest issues - thanks to @zinserjan -* Fix code coverage - thanks to @zinserjan - -### 2.2.0 -* Upgrade to [`react-scripts@1.0.6`](https://github.com/facebookincubator/create-react-app/) - -### 2.1.0 -* Update to `tslint@5.2.0` - thanks to @mindjuice -* Fix test setup issue - thanks to @jonmpqts -* Add `source-map-loader` - thanks to @Place1 -* Update to `typescript@2.3.3` - thanks to @sjdweb - -### 2.0.1 -* Fix issue with jest finding test files - -### 2.0.0 -* Upgrade to [`react-scripts@1.x.x`](https://github.com/facebookincubator/create-react-app/blob/0d1521aabf5a0201ea1bcccc33e286afe048f820/CHANGELOG.md) - -### 1.4.0 -* Upgrade to typescript@2.3.2 - thanks to @patrick91 -* Add tests around react-scripts-ts - thanks to @migerh - -### 1.3.0 -* Upgrade to typescript@2.2.2 - thanks to @jeremistadler - -### 1.1.8 -* Fix regression where no `@types` were being installed on init - -### 1.1.7 -* Merge facebookincubator/create-react-app@0.9.5 into react-scripts-ts -* Merge facebookincubator/create-react-app@0.9.4 into react-scripts-ts -* Merge facebookincubator/create-react-app@0.9.3 into react-scripts-ts -* Merge facebookincubator/create-react-app@0.9.2 into react-scripts-ts -* Merge facebookincubator/create-react-app@0.9.1 into react-scripts-ts - -### 1.1.6 -* Merge facebookincubator/create-react-app@0.9.0 into react-scripts-ts - -### 1.0.6 -* Add missing `cli-highlight` dependency - -### 1.0.5 -* Print file names when running `npm run build` -* Add support for `setupTest.ts` -* Highlight source code when erroring in `npm run build` - -### 1.0.4 -* Change mentions of `eslint` to `tslint` - -### 1.0.3 -* Remove hidden character from `tsconfig.json` +## Sync with fork -### 1.0.2 -* Copy `typescriptTransform.js` when running `npm run eject` +https://help.github.com/articles/syncing-a-fork/ diff --git a/README.old.md b/README.old.md new file mode 100644 index 000000000..2300fc11d --- /dev/null +++ b/README.old.md @@ -0,0 +1,186 @@ +# `react-scripts-ts` [![npm version](https://badge.fury.io/js/react-scripts-ts.svg)](https://badge.fury.io/js/react-scripts-ts) [![Build Status](https://travis-ci.org/wmonk/create-react-app-typescript.svg?branch=master)](https://travis-ci.org/wmonk/create-react-app-typescript) + +Create React apps (with Typescript) with no build configuration. + + * [Getting Started](#tldr) – How to create a new app. + * [User Guide](https://github.com/wmonk/create-react-app-typescript/blob/master/packages/react-scripts/template/README.md) – How to develop apps bootstrapped with react scripts ts. + +_Do you know react and want to try out typescript? Or do you know typescript and want to try out react?_ Get all the benefits from `create-react-app` but you use typescript! πŸš€ + +## tl;dr + +```sh +npm install -g create-react-app + +create-react-app my-app --scripts-version=react-scripts-ts +cd my-app/ +npm start +``` + +## Migration + +In general, most upgrades won't require any migration steps to work, but if you experience problems after an upgrade, please file an issue, and we'll add it to the list of migration steps below. + +### From `<2.16.0` to `>=2.16.0` + +Since `2.16.0`, the template uses different `tsconfig` files for both development and production mode. For the latter, unfortunately, the path resolver is not smart enough to fall back to the basic `tsconfig.json` in case the expected `tsconfig.prod.json` is not present, so you have to create this file manually like shown [here](https://github.com/wmonk/create-react-app-typescript/blob/master/packages/react-scripts/template/tsconfig.prod.json). + +### From `<2.13.0` to `>=2.13.0` + +Since `2.13.0`, `typescript` is listed as a peer dependency of `react-scripts-ts`. For projects generated with at least this version, the init script takes care of properly installing it as dev dependency to the generated projects. Older projects require manual installation, in case you have not already done that. + +Using `npm`: +``` +npm i -D typescript +``` + +Using `yarn`: +``` +yarn add -D typescript +``` + +### From `<2.5.0` to `>=2.5.0` + +Version `2.5.0` introduces a new config file for jest, that is necessary for the tests to run. If you were previously running a version older than `v2.5.0` and upgraded to `v2.5.0` or newer, you need to manually add the new file, or else you'll get an error similar to this when trying to run your tests: + +```javascript +Test suite failed to run + +{ + "messageText": "Cannot read file 'C:\\[project]\\tsconfig.test.json': ENOENT: no such file or directory, open 'C:\\[project]\\tsconfig.test.json'.", + "category": 1, + "code": 5012 +} +``` + +To fix this, create a new file *in the root of the project* called `tsconfig.test.json`, and paste [the content of this file into it](https://raw.githubusercontent.com/wmonk/create-react-app-typescript/master/packages/react-scripts/template/tsconfig.test.json). Everything should work now. For more info, please see [this issue](https://github.com/wmonk/create-react-app-typescript/issues/141). + +## Changelog + +### 2.16.0 +* Allow `moduleNameMapper` config override - @sebald +* Fix travis build - @DorianGrey +* Allow using different tsconfig file for dev and build - @DorianGrey + +### 2.15.1 +* Fix duplicated mjs entry in Jest config - @StevenLangbroek +* Allow `--watchAll` to be set - @DorianGrey + +### 2.15.0 +* Replace TSLint rules with presets - @nielsdB97 +* Update file-loader exclusion rules - @winstonewert +* Fix Uglifyjs settings - @meandmax +* Merge react-script 1.1.x - @wmonk + +### 2.14.0 +* README fixes - @kaminskypavel +* README fixes - @adambowles +* Remove unused JS files - @DorianGrey +* README fixes - @stephtr +* Added the abillity to import js and jsx files with ts-loader - @GeeWee +* Uglifyjs update for es6 support - @thetric + +### 2.13.0 +* Remove tslint-loader from prod builds - @DorianGrey +* Include typescript as devDependency in boilerplate - @ianschmitz +* Document custom module formats - @joshtynjala +* Fix tsconfig.json - @diabelb + +### 2.12.0 +* Update typescript to 2.6.2 + +### 2.11.0 +* Upgrade to [`react-scripts@1.0.17`](https://github.com/facebookincubator/create-react-app/releases/tag/v1.0.17) + +### 2.10.0 +* README updates - StefanSchoof +* README updates - DorianGrey +* Add support for fork-ts-checker-webpack-plugin - johnnyreilly + +### 2.9.0 - UNPUBLISHED +This included changes that were not published by the facebook upstream, so was unpublished. + +### 2.8.0 +* Update typescript to 2.5.3 - @nicolaserny + +### 2.7.0 +* Merge react-scripts@1.0.13 - @JohnNilsson +* Fix git tempalte - @hktonylee +* Provide migration docs - @JReinhold +* Updated dependencies - @swengorschewski +* Fix tslint config - @comerc + +### 2.6.0 +* Merge react-scripts@1.0.10 - @wmonk +* Update component template - @pelotom + +### 2.5.0 +* Support dynamic imports - thanks @nicolaserny, @DorianGrey +* Fix up tsconfig - thanks @js-n +* Fix readme typo - thanks @adambowles +* Move to ts-jest - thanks @DorianGrey + +### 2.4.0 +* Upgrade typescript to 2.4 and ts-loader to 2.2.1 - thanks @frederickfogerty +* Fix readme typo - thanks @wrongway4you + +### 2.3.2 +* Fix `typescript` version to 2.3.x until 2.4 @types are fixed + +### 2.3.1 + +* All tsc to parse config (for `extend`) - Thanks to @DorianGrey +* Fix various jest issues - thanks to @zinserjan +* Fix code coverage - thanks to @zinserjan + +### 2.2.0 +* Upgrade to [`react-scripts@1.0.6`](https://github.com/facebookincubator/create-react-app/) + +### 2.1.0 +* Update to `tslint@5.2.0` - thanks to @mindjuice +* Fix test setup issue - thanks to @jonmpqts +* Add `source-map-loader` - thanks to @Place1 +* Update to `typescript@2.3.3` - thanks to @sjdweb + +### 2.0.1 +* Fix issue with jest finding test files + +### 2.0.0 +* Upgrade to [`react-scripts@1.x.x`](https://github.com/facebookincubator/create-react-app/blob/0d1521aabf5a0201ea1bcccc33e286afe048f820/CHANGELOG.md) + +### 1.4.0 +* Upgrade to typescript@2.3.2 - thanks to @patrick91 +* Add tests around react-scripts-ts - thanks to @migerh + +### 1.3.0 +* Upgrade to typescript@2.2.2 - thanks to @jeremistadler + +### 1.1.8 +* Fix regression where no `@types` were being installed on init + +### 1.1.7 +* Merge facebookincubator/create-react-app@0.9.5 into react-scripts-ts +* Merge facebookincubator/create-react-app@0.9.4 into react-scripts-ts +* Merge facebookincubator/create-react-app@0.9.3 into react-scripts-ts +* Merge facebookincubator/create-react-app@0.9.2 into react-scripts-ts +* Merge facebookincubator/create-react-app@0.9.1 into react-scripts-ts + +### 1.1.6 +* Merge facebookincubator/create-react-app@0.9.0 into react-scripts-ts + +### 1.0.6 +* Add missing `cli-highlight` dependency + +### 1.0.5 +* Print file names when running `npm run build` +* Add support for `setupTest.ts` +* Highlight source code when erroring in `npm run build` + +### 1.0.4 +* Change mentions of `eslint` to `tslint` + +### 1.0.3 +* Remove hidden character from `tsconfig.json` + +### 1.0.2 +* Copy `typescriptTransform.js` when running `npm run eject` diff --git a/packages/react-scripts/config/webpack.config.dev.js b/packages/react-scripts/config/webpack.config.dev.js index 924e3e4f0..76785caa3 100644 --- a/packages/react-scripts/config/webpack.config.dev.js +++ b/packages/react-scripts/config/webpack.config.dev.js @@ -31,6 +31,46 @@ const publicUrl = ''; // Get environment variables to inject into our app. const env = getClientEnvironment(publicUrl); +// Options for PostCSS as we reference these options twice +// Adds vendor prefixing based on your specified browser support in +// package.json +const postCSSLoaderOptions = { + // Necessary for external CSS imports to work + // https://github.com/facebook/create-react-app/issues/2677 + ident: 'postcss', + plugins: () => [ + require('postcss-flexbugs-fixes'), + autoprefixer({ + flexbox: 'no-2009', + }), + ], +}; + +// style files regexes +const cssRegex = /\.css$/; +const cssModuleRegex = /\.module\.css$/; +const sassRegex = /\.(scss|sass)$/; +const sassModuleRegex = /\.module\.(scss|sass)$/; + +// common function to get style loaders +const getStyleLoaders = (cssOptions, preProcessor) => { + const loaders = [ + require.resolve('style-loader'), + { + loader: require.resolve('css-loader'), + options: cssOptions, + }, + { + loader: require.resolve('postcss-loader'), + options: postCSSLoaderOptions, + }, + ]; + if (preProcessor) { + loaders.push(require.resolve(preProcessor)); + } + return loaders; +}; + // This is the development configuration. // It is focused on developer experience and fast rebuilds. // The production configuration is different and lives in a separate file. @@ -189,36 +229,16 @@ module.exports = { // In production, we use a plugin to extract that CSS to a file, but // in development "style" loader enables hot editing of CSS. { - test: /\.css$/, - use: [ - require.resolve('style-loader'), - { - loader: require.resolve('css-loader'), - options: { - importLoaders: 1, - }, - }, - { - loader: require.resolve('postcss-loader'), - options: { - // Necessary for external CSS imports to work - // https://github.com/facebookincubator/create-react-app/issues/2677 - ident: 'postcss', - plugins: () => [ - require('postcss-flexbugs-fixes'), - autoprefixer({ - browsers: [ - '>1%', - 'last 4 versions', - 'Firefox ESR', - 'not ie < 9', // React doesn't support IE8 anyway - ], - flexbox: 'no-2009', - }), - ], - }, - }, - ], + test: cssRegex, + exclude: cssModuleRegex, + use: getStyleLoaders({ + importLoaders: 1, + }), + }, + { + test: sassRegex, + exclude: sassModuleRegex, + use: getStyleLoaders({ importLoaders: 2 }, 'sass-loader'), }, // "file" loader makes sure those assets get served by WebpackDevServer. // When you `import` an asset, you get its (virtual) filename. diff --git a/packages/react-scripts/config/webpack.config.prod.js b/packages/react-scripts/config/webpack.config.prod.js index c267bf011..0491a4014 100644 --- a/packages/react-scripts/config/webpack.config.prod.js +++ b/packages/react-scripts/config/webpack.config.prod.js @@ -56,6 +56,64 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths { publicPath: Array(cssFilename.split('/').length).join('../') } : {}; +// Options for PostCSS as we reference these options twice +// Adds vendor prefixing based on your specified browser support in +// package.json +const postCSSLoaderOptions = { + // Necessary for external CSS imports to work + // https://github.com/facebook/create-react-app/issues/2677 + ident: 'postcss', + plugins: () => [ + require('postcss-flexbugs-fixes'), + autoprefixer({ + flexbox: 'no-2009', + }), + ], + sourceMap: shouldUseSourceMap, +}; + +// style files regexes +const cssRegex = /\.css$/; +const cssModuleRegex = /\.module\.css$/; +const sassRegex = /\.(scss|sass)$/; +const sassModuleRegex = /\.module\.(scss|sass)$/; + +// common function to get style loaders +const getStyleLoaders = (cssOptions, preProcessor) => { + const loaders = [ + { + loader: require.resolve('css-loader'), + options: cssOptions, + }, + { + loader: require.resolve('postcss-loader'), + options: postCSSLoaderOptions, + }, + ]; + if (preProcessor) { + loaders.push({ + loader: require.resolve(preProcessor), + options: { + sourceMap: shouldUseSourceMap, + }, + }); + } + return ExtractTextPlugin.extract( + Object.assign( + { + fallback: { + loader: require.resolve('style-loader'), + options: { + hmr: false, + }, + }, + use: loaders, + }, + extractTextPluginOptions + ) + ); +}; + // This is the production configuration. // It compiles slowly and is focused on producing a fast and minimal bundle. // The development configuration is different and lives in a separate file. @@ -201,52 +259,32 @@ module.exports = { // use the "style" loader inside the async code so CSS from them won't be // in the main CSS file. { - test: /\.css$/, - loader: ExtractTextPlugin.extract( - Object.assign( - { - fallback: { - loader: require.resolve('style-loader'), - options: { - hmr: false, - }, - }, - use: [ - { - loader: require.resolve('css-loader'), - options: { - importLoaders: 1, - minimize: true, - sourceMap: shouldUseSourceMap, - }, - }, - { - loader: require.resolve('postcss-loader'), - options: { - // Necessary for external CSS imports to work - // https://github.com/facebookincubator/create-react-app/issues/2677 - ident: 'postcss', - plugins: () => [ - require('postcss-flexbugs-fixes'), - autoprefixer({ - browsers: [ - '>1%', - 'last 4 versions', - 'Firefox ESR', - 'not ie < 9', // React doesn't support IE8 anyway - ], - flexbox: 'no-2009', - }), - ], - }, - }, - ], - }, - extractTextPluginOptions - ) - ), + test: cssRegex, + exclude: cssModuleRegex, + loader: getStyleLoaders({ + importLoaders: 1, + minimize: true, + sourceMap: shouldUseSourceMap, + }), // Note: this won't work without `new ExtractTextPlugin()` in `plugins`. }, + // Opt-in support for SASS. The logic here is somewhat similar + // as in the CSS routine, except that "sass-loader" runs first + // to compile SASS files into CSS. + // By default we support SASS Modules with the + // extensions .module.scss or .module.sass + { + test: sassRegex, + exclude: sassModuleRegex, + loader: getStyleLoaders( + { + importLoaders: 2, + minimize: true, + sourceMap: shouldUseSourceMap, + }, + 'sass-loader' + ), + }, // "file" loader makes sure assets end up in the `build` folder. // When you `import` an asset, you get its filename. // This loader doesn't use a "test" so it will catch all modules diff --git a/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json b/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json index b8500f804..295dc1517 100644 --- a/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json +++ b/packages/react-scripts/fixtures/kitchensink/.template.dependencies.json @@ -6,6 +6,7 @@ "chai": "3.5.0", "jsdom": "9.8.3", "mocha": "3.2.0", + "node-sass": "4.8.3", "normalize.css": "7.0.0", "prop-types": "15.5.6", "test-integrity": "1.0.0" diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 95bf68c2a..7c13a900f 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,8 +1,8 @@ { - "name": "react-scripts-ts", - "version": "2.16.0", + "name": "@gssfed/react-scripts-ts", + "version": "0.1.0", "description": "Configuration and scripts for Create React App.", - "repository": "wmonk/create-react-app", + "repository": "gssfed/create-react-app-vital", "license": "BSD-3-Clause", "engines": { "node": ">=6" @@ -45,6 +45,7 @@ "react-dev-utils": "^5.0.1", "resolve": "1.6.0", "style-loader": "0.19.0", + "sass-loader": "7.0.0", "sw-precache-webpack-plugin": "0.11.4", "ts-jest": "22.0.1", "ts-loader": "^2.3.7", diff --git a/packages/react-scripts/scripts/init.js b/packages/react-scripts/scripts/init.js index 1490efa4f..6dda06772 100644 --- a/packages/react-scripts/scripts/init.js +++ b/packages/react-scripts/scripts/init.js @@ -105,10 +105,13 @@ module.exports = function( // Install dev dependencies const types = [ + 'node-sass', '@types/node', '@types/react', '@types/react-dom', '@types/jest', + '@types/react-redux', + '@types/react-router-dom', 'typescript', ]; @@ -140,6 +143,28 @@ module.exports = function( fs.unlinkSync(templateDependenciesPath); } + // Install additional deps + const vitalDeps = [ + '@gssfed/vital-ui-kit-react', + 'redux', + 'react-redux', + 'react-router-dom', + 'styled-components', + ] + + console.log( + `Installing ${vitalDeps.join(', ')} as dependencies ${command}...` + ); + console.log(); + + const vitalProc = spawn.sync(command, args.concat(vitalDeps), { + stdio: 'inherit', + }); + if (vitalProc.status !== 0) { + console.error(`\`${command} ${args.join(' ')}\` failed`); + return; + } + // Install react and react-dom for backward compatibility with old CRA cli // which doesn't install react and react-dom along with react-scripts // or template is presetend (via --internal-testing-template) diff --git a/packages/react-scripts/template/public/favicon.ico b/packages/react-scripts/template/public/favicon.ico index a11777cc4..7a9b6c98b 100644 Binary files a/packages/react-scripts/template/public/favicon.ico and b/packages/react-scripts/template/public/favicon.ico differ diff --git a/packages/react-scripts/template/src/App.tsx b/packages/react-scripts/template/src/App.tsx index c1bc27ccd..4fc6ab5bb 100644 --- a/packages/react-scripts/template/src/App.tsx +++ b/packages/react-scripts/template/src/App.tsx @@ -1,19 +1,45 @@ import * as React from 'react'; import './App.css'; +import { Box, Button } from '@gssfed/vital-ui-kit-react'; +import { Link } from 'react-router-dom'; +import { Route } from 'react-router-dom'; -import logo from './logo.svg'; +import logo from './icon.png'; +import Overview from './components/Overview'; +import Form from './components/Form'; class App extends React.Component { public render() { return (
- logo -

Welcome to React

+ + logo + +

Welcome to React with Vital UI Kit

To get started, edit src/App.tsx and save to reload.

+ + Click here to learn more about Vital UI Kit React πŸ•Ή + + + + + + + +
+ + +
); } diff --git a/packages/react-scripts/template/src/components/CardCommon.tsx b/packages/react-scripts/template/src/components/CardCommon.tsx new file mode 100644 index 000000000..65a53050a --- /dev/null +++ b/packages/react-scripts/template/src/components/CardCommon.tsx @@ -0,0 +1,26 @@ +import * as React from 'react'; +import { Card } from '@gssfed/vital-ui-kit-react'; + +interface Props { + content?: React.ReactNode; + onConfirm?(): void; +}; + +const CardCommon = ({ content = null, onConfirm }: Props) => ( + + + + {content || 'Welcome to Vital UI Kit!'} + + + + Cancel + + + Confirm + + + +); + +export default CardCommon; diff --git a/packages/react-scripts/template/src/components/Form.tsx b/packages/react-scripts/template/src/components/Form.tsx new file mode 100644 index 000000000..bd386a588 --- /dev/null +++ b/packages/react-scripts/template/src/components/Form.tsx @@ -0,0 +1,42 @@ +import * as React from 'react'; +import styled from 'styled-components'; +import { FieldInput, Input, MultipleInput, Addon, TextArea } from '@gssfed/vital-ui-kit-react'; + +const FormWrapper = styled.div` + max-width: 500px; + padding: 40px; + margin: auto; + text-align: left; +`; + +const Form = () => ( + + + + + + + + + + + + + + + + + + + + http:// + + + + +