From ad192df269202248d753f8cee80bf9438dcce2ee Mon Sep 17 00:00:00 2001 From: Sandro Keil Date: Thu, 24 Jan 2019 08:40:12 +0100 Subject: [PATCH 1/5] Use React CRA with native typescript and update dependencies to latest version --- .gitignore | 3 +- README.md | 9 +- config/env.js | 93 - config/jest/cssTransform.js | 14 - config/jest/fileTransform.js | 12 - config/jest/typescriptTransform.js | 7 - config/paths.js | 57 - config/polyfills.js | 16 - config/webpack.config.dev.js | 270 - config/webpack.config.prod.js | 344 - config/webpackDevServer.config.js | 92 - package.json | 146 +- scripts/build.js | 127 - scripts/start.js | 90 - scripts/test.js | 25 - semantic.json | 5 +- semantic/gulpfile.js | 0 semantic/src/definitions/behaviors/api.js | 2 +- .../src/definitions/behaviors/colorize.js | 280 - semantic/src/definitions/behaviors/form.js | 244 +- semantic/src/definitions/behaviors/state.js | 708 - .../src/definitions/behaviors/visibility.js | 40 +- semantic/src/definitions/behaviors/visit.js | 525 - .../src/definitions/collections/form.less | 90 +- .../src/definitions/collections/grid.less | 12 +- .../src/definitions/collections/menu.less | 30 +- .../src/definitions/collections/message.less | 3 + .../src/definitions/collections/table.less | 11 +- semantic/src/definitions/elements/button.less | 144 +- semantic/src/definitions/elements/header.less | 6 +- semantic/src/definitions/elements/icon.less | 30 +- semantic/src/definitions/elements/image.less | 8 +- semantic/src/definitions/elements/input.less | 75 +- semantic/src/definitions/elements/label.less | 27 +- semantic/src/definitions/elements/list.less | 30 +- semantic/src/definitions/elements/loader.less | 1 - .../src/definitions/elements/placeholder.less | 232 + semantic/src/definitions/elements/reveal.less | 10 + .../src/definitions/elements/segment.less | 87 +- semantic/src/definitions/elements/step.less | 68 +- semantic/src/definitions/globals/site.less | 48 +- semantic/src/definitions/modules/accordion.js | 9 +- semantic/src/definitions/modules/checkbox.js | 2 +- semantic/src/definitions/modules/dimmer.js | 31 +- semantic/src/definitions/modules/dimmer.less | 62 +- semantic/src/definitions/modules/dropdown.js | 402 +- .../src/definitions/modules/dropdown.less | 116 +- semantic/src/definitions/modules/embed.js | 10 + semantic/src/definitions/modules/modal.js | 257 +- semantic/src/definitions/modules/modal.less | 153 +- semantic/src/definitions/modules/nag.js | 2 +- semantic/src/definitions/modules/popup.js | 145 +- semantic/src/definitions/modules/popup.less | 2 +- semantic/src/definitions/modules/progress.js | 2 +- semantic/src/definitions/modules/rating.js | 2 +- semantic/src/definitions/modules/rating.less | 2 +- semantic/src/definitions/modules/search.js | 244 +- semantic/src/definitions/modules/search.less | 65 +- semantic/src/definitions/modules/shape.js | 2 +- semantic/src/definitions/modules/sidebar.js | 7 +- semantic/src/definitions/modules/sidebar.less | 14 - semantic/src/definitions/modules/sticky.js | 29 +- semantic/src/definitions/modules/tab.js | 20 +- .../src/definitions/modules/transition.js | 2 +- semantic/src/definitions/views/card.less | 36 +- semantic/src/definitions/views/item.less | 24 +- semantic/src/definitions/views/statistic.less | 3 - semantic/src/semantic.less | 1 + semantic/src/site/collections/menu.overrides | 2 +- semantic/src/theme.config | 95 +- semantic/src/theme.less | 2 +- .../themes/basic/elements/button.variables | 2 +- .../themes/basic/modules/progress.variables | 4 +- .../themes/bookish/elements/header.variables | 4 +- .../bootstrap3/elements/button.variables | 4 +- .../themes/chubby/elements/button.variables | 2 +- .../default/assets/fonts/brand-icons.eot | Bin 0 -> 98640 bytes .../default/assets/fonts/brand-icons.svg | 1008 ++ .../default/assets/fonts/brand-icons.ttf | Bin 0 -> 98404 bytes .../default/assets/fonts/brand-icons.woff | Bin 0 -> 63728 bytes .../default/assets/fonts/brand-icons.woff2 | Bin 0 -> 54488 bytes .../src/themes/default/assets/fonts/icons.eot | Bin 165742 -> 106004 bytes .../src/themes/default/assets/fonts/icons.svg | 4183 ++---- .../src/themes/default/assets/fonts/icons.ttf | Bin 165548 -> 105784 bytes .../themes/default/assets/fonts/icons.woff | Bin 98024 -> 50524 bytes .../themes/default/assets/fonts/icons.woff2 | Bin 77160 -> 40148 bytes .../default/assets/fonts/outline-icons.eot | Bin 0 -> 31156 bytes .../default/assets/fonts/outline-icons.svg | 366 + .../default/assets/fonts/outline-icons.ttf | Bin 0 -> 30928 bytes .../default/assets/fonts/outline-icons.woff | Bin 0 -> 14712 bytes .../default/assets/fonts/outline-icons.woff2 | Bin 0 -> 12240 bytes .../default/collections/breadcrumb.variables | 2 +- .../themes/default/collections/form.variables | 2 +- .../themes/default/collections/menu.variables | 44 +- .../default/collections/message.variables | 2 +- .../default/collections/table.variables | 15 +- .../themes/default/elements/button.variables | 10 +- .../themes/default/elements/divider.variables | 4 +- .../themes/default/elements/flag.overrides | 5 + .../themes/default/elements/header.variables | 2 +- .../themes/default/elements/icon.overrides | 2535 ++-- .../themes/default/elements/icon.variables | 46 +- .../themes/default/elements/label.variables | 20 +- .../themes/default/elements/list.variables | 2 +- .../themes/default/elements/loader.variables | 1 + .../default/elements/placeholder.overrides | 3 + .../default/elements/placeholder.variables | 55 + .../themes/default/elements/reveal.variables | 3 +- .../themes/default/elements/segment.variables | 41 +- .../themes/default/elements/step.variables | 8 +- .../src/themes/default/globals/site.variables | 371 +- .../default/modules/accordion.overrides | 2 +- .../default/modules/accordion.variables | 2 +- .../themes/default/modules/checkbox.variables | 4 +- .../themes/default/modules/dimmer.variables | 7 +- .../themes/default/modules/dropdown.overrides | 25 +- .../themes/default/modules/dropdown.variables | 20 +- .../themes/default/modules/modal.variables | 62 +- .../themes/default/modules/popup.variables | 7 +- .../themes/default/modules/progress.variables | 4 +- .../themes/default/modules/search.variables | 13 +- .../default/modules/transition.overrides | 56 +- .../src/themes/default/views/ad.variables | 4 +- .../src/themes/default/views/card.variables | 2 +- .../themes/default/views/comment.variables | 2 +- .../src/themes/default/views/feed.variables | 8 +- .../src/themes/default/views/item.variables | 2 +- .../themes/default/views/statistic.variables | 15 +- semantic/tasks/README.md | 0 semantic/tasks/admin/components/create.js | 1 - semantic/tasks/admin/components/init.js | 4 +- semantic/tasks/admin/components/update.js | 4 +- semantic/tasks/admin/distributions/create.js | 0 semantic/tasks/admin/distributions/init.js | 0 semantic/tasks/admin/distributions/update.js | 4 +- semantic/tasks/admin/publish.js | 0 semantic/tasks/admin/register.js | 2 +- semantic/tasks/admin/release.js | 0 semantic/tasks/build.js | 0 semantic/tasks/build/assets.js | 0 semantic/tasks/build/css.js | 4 +- semantic/tasks/build/javascript.js | 4 +- semantic/tasks/check-install.js | 0 semantic/tasks/clean.js | 0 semantic/tasks/collections/README.md | 0 semantic/tasks/collections/admin.js | 0 semantic/tasks/collections/build.js | 0 semantic/tasks/collections/internal.js | 2 +- semantic/tasks/collections/rtl.js | 0 semantic/tasks/config/admin/github.js | 0 semantic/tasks/config/admin/oauth.example.js | 0 semantic/tasks/config/admin/release.js | 1 + .../tasks/config/admin/templates/README.md | 0 .../tasks/config/admin/templates/bower.json | 0 .../admin/templates/component-package.js | 0 .../config/admin/templates/composer.json | 0 .../config/admin/templates/css-package.js | 0 .../config/admin/templates/less-package.js | 0 .../tasks/config/admin/templates/package.json | 0 semantic/tasks/config/defaults.js | 1 + semantic/tasks/config/npm/gulpfile.js | 0 semantic/tasks/config/project/install.js | 11 +- semantic/tasks/config/project/release.js | 0 semantic/tasks/config/tasks.js | 12 +- semantic/tasks/docs/build.js | 6 +- semantic/tasks/docs/metadata.js | 0 semantic/tasks/docs/serve.js | 10 +- semantic/tasks/install.js | 6 +- semantic/tasks/rtl/build.js | 4 +- semantic/tasks/rtl/watch.js | 12 +- semantic/tasks/version.js | 0 semantic/tasks/watch.js | 10 +- tsconfig.json | 41 +- yarn.lock | 11403 +++++++++++----- 174 files changed, 15457 insertions(+), 10828 deletions(-) mode change 100644 => 100755 README.md delete mode 100644 config/env.js delete mode 100644 config/jest/cssTransform.js delete mode 100644 config/jest/fileTransform.js delete mode 100644 config/jest/typescriptTransform.js delete mode 100644 config/paths.js delete mode 100644 config/polyfills.js delete mode 100644 config/webpack.config.dev.js delete mode 100644 config/webpack.config.prod.js delete mode 100644 config/webpackDevServer.config.js delete mode 100644 scripts/build.js delete mode 100644 scripts/start.js delete mode 100644 scripts/test.js mode change 100755 => 100644 semantic/gulpfile.js delete mode 100644 semantic/src/definitions/behaviors/colorize.js delete mode 100644 semantic/src/definitions/behaviors/state.js mode change 100644 => 100755 semantic/src/definitions/behaviors/visibility.js delete mode 100644 semantic/src/definitions/behaviors/visit.js create mode 100644 semantic/src/definitions/elements/placeholder.less mode change 100644 => 100755 semantic/src/definitions/modules/dimmer.js mode change 100644 => 100755 semantic/src/definitions/modules/modal.js mode change 100644 => 100755 semantic/src/definitions/modules/sticky.js mode change 100644 => 100755 semantic/src/definitions/modules/transition.js mode change 100755 => 100644 semantic/src/theme.less create mode 100644 semantic/src/themes/default/assets/fonts/brand-icons.eot create mode 100644 semantic/src/themes/default/assets/fonts/brand-icons.svg create mode 100644 semantic/src/themes/default/assets/fonts/brand-icons.ttf create mode 100644 semantic/src/themes/default/assets/fonts/brand-icons.woff create mode 100644 semantic/src/themes/default/assets/fonts/brand-icons.woff2 create mode 100644 semantic/src/themes/default/assets/fonts/outline-icons.eot create mode 100644 semantic/src/themes/default/assets/fonts/outline-icons.svg create mode 100644 semantic/src/themes/default/assets/fonts/outline-icons.ttf create mode 100644 semantic/src/themes/default/assets/fonts/outline-icons.woff create mode 100644 semantic/src/themes/default/assets/fonts/outline-icons.woff2 mode change 100644 => 100755 semantic/src/themes/default/elements/icon.overrides create mode 100644 semantic/src/themes/default/elements/placeholder.overrides create mode 100644 semantic/src/themes/default/elements/placeholder.variables mode change 100644 => 100755 semantic/src/themes/default/modules/dropdown.overrides mode change 100755 => 100644 semantic/tasks/README.md mode change 100755 => 100644 semantic/tasks/admin/components/create.js mode change 100755 => 100644 semantic/tasks/admin/components/init.js mode change 100755 => 100644 semantic/tasks/admin/components/update.js mode change 100755 => 100644 semantic/tasks/admin/distributions/create.js mode change 100755 => 100644 semantic/tasks/admin/distributions/init.js mode change 100755 => 100644 semantic/tasks/admin/distributions/update.js mode change 100755 => 100644 semantic/tasks/admin/publish.js mode change 100755 => 100644 semantic/tasks/admin/register.js mode change 100755 => 100644 semantic/tasks/admin/release.js mode change 100755 => 100644 semantic/tasks/build.js mode change 100755 => 100644 semantic/tasks/build/assets.js mode change 100755 => 100644 semantic/tasks/check-install.js mode change 100755 => 100644 semantic/tasks/clean.js mode change 100755 => 100644 semantic/tasks/collections/README.md mode change 100755 => 100644 semantic/tasks/collections/admin.js mode change 100755 => 100644 semantic/tasks/collections/build.js mode change 100755 => 100644 semantic/tasks/collections/rtl.js mode change 100755 => 100644 semantic/tasks/config/admin/github.js mode change 100755 => 100644 semantic/tasks/config/admin/oauth.example.js mode change 100755 => 100644 semantic/tasks/config/admin/release.js mode change 100755 => 100644 semantic/tasks/config/admin/templates/README.md mode change 100755 => 100644 semantic/tasks/config/admin/templates/bower.json mode change 100755 => 100644 semantic/tasks/config/admin/templates/component-package.js mode change 100755 => 100644 semantic/tasks/config/admin/templates/composer.json mode change 100755 => 100644 semantic/tasks/config/admin/templates/css-package.js mode change 100755 => 100644 semantic/tasks/config/admin/templates/less-package.js mode change 100755 => 100644 semantic/tasks/config/admin/templates/package.json mode change 100755 => 100644 semantic/tasks/config/npm/gulpfile.js mode change 100755 => 100644 semantic/tasks/config/project/release.js mode change 100755 => 100644 semantic/tasks/docs/build.js mode change 100755 => 100644 semantic/tasks/docs/metadata.js mode change 100755 => 100644 semantic/tasks/docs/serve.js mode change 100755 => 100644 semantic/tasks/rtl/build.js mode change 100755 => 100644 semantic/tasks/rtl/watch.js mode change 100755 => 100644 semantic/tasks/version.js mode change 100644 => 100755 yarn.lock diff --git a/.gitignore b/.gitignore index c0e4c2d..037b3e7 100644 --- a/.gitignore +++ b/.gitignore @@ -26,4 +26,5 @@ app.env src/theme/semantic/ devSrvProxy.json -docker-compose.yml \ No newline at end of file + +docker-compose.yml diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 972223a..11fc824 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # react-semantic-ui-skeleton -React + Redux + Semantic UI Skeleton -Based on [wmonk/create-react-app-typescript](https://github.com/wmonk/create-react-app-typescript) but it's ejected for customization. +React + Redux + Semantic UI Skeleton with Typescript + +Based on [Create React App](https://github.com/facebook/create-react-app). This application uses [semantic ui themes](https://semantic-ui.com/usage/theming.html). Take a look at the `semantic` folder. **Note:** We have to copy the themes from the nodes_modules package `semantic-ui` to `semantic` manually after updates to get the latest assets. @@ -37,9 +38,9 @@ We have a two stage build. You have to manually install the dependencies and to compile the semantic ui theme. ```bash -docker run --rm --env-file=app.env.dist -i -v $(pwd):/app sandrokeil/typescript yarn install +docker run --rm -i -v $(pwd):/app sandrokeil/typescript yarn install -docker run --rm --env-file=app.env.dist -i -p 4000 -p 3000 -v $(pwd):/app sandrokeil/typescript yarn run semantic +docker run --rm -i -v $(pwd):/app sandrokeil/typescript yarn run semantic ``` Now you can start the development server and open [http://localhost:3000/](http://localhost:3000/) in your favourite browser. diff --git a/config/env.js b/config/env.js deleted file mode 100644 index 7c6133b..0000000 --- a/config/env.js +++ /dev/null @@ -1,93 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const path = require('path'); -const paths = require('./paths'); - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')]; - -const NODE_ENV = process.env.NODE_ENV; -if (!NODE_ENV) { - throw new Error( - 'The NODE_ENV environment variable is required but was not specified.' - ); -} - -// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use -var dotenvFiles = [ - `${paths.dotenv}.${NODE_ENV}.local`, - `${paths.dotenv}.${NODE_ENV}`, - // Don't include `.env.local` for `test` environment - // since normally you expect tests to produce the same - // results for everyone - NODE_ENV !== 'test' && `${paths.dotenv}.local`, - paths.dotenv, -].filter(Boolean); - -// Load environment variables from .env* files. Suppress warnings using silent -// if this file is missing. dotenv will never modify any environment variables -// that have already been set. -// https://github.com/motdotla/dotenv -dotenvFiles.forEach(dotenvFile => { - if (fs.existsSync(dotenvFile)) { - require('dotenv').config({ - path: dotenvFile, - }); - } -}); - -// We support resolving modules according to `NODE_PATH`. -// This lets you use absolute paths in imports inside large monorepos: -// https://github.com/facebookincubator/create-react-app/issues/253. -// It works similar to `NODE_PATH` in Node itself: -// https://nodejs.org/api/modules.html#modules_loading_from_the_global_folders -// Note that unlike in Node, only *relative* paths from `NODE_PATH` are honored. -// Otherwise, we risk importing Node.js core modules into an app instead of Webpack shims. -// https://github.com/facebookincubator/create-react-app/issues/1023#issuecomment-265344421 -// We also resolve them to make sure all tools using them work consistently. -const appDirectory = fs.realpathSync(process.cwd()); -process.env.NODE_PATH = (process.env.NODE_PATH || '') - .split(path.delimiter) - .filter(folder => folder && !path.isAbsolute(folder)) - .map(folder => path.resolve(appDirectory, folder)) - .join(path.delimiter); - -// Grab NODE_ENV and REACT_APP_* environment variables and prepare them to be -// injected into the application via DefinePlugin in Webpack configuration. -const REACT_APP = /^REACT_APP_/i; - -function getClientEnvironment(publicUrl) { - const raw = Object.keys(process.env) - .filter(key => REACT_APP.test(key)) - .reduce( - (env, key) => { - env[key] = process.env[key]; - return env; - }, - { - // Useful for determining whether we’re running in production mode. - // Most importantly, it switches React into the correct mode. - NODE_ENV: process.env.NODE_ENV || 'development', - // Useful for resolving the correct path to static assets in `public`. - // For example, . - // This should only be used as an escape hatch. Normally you would put - // images into the `src` and `import` them in code to get their paths. - PUBLIC_URL: publicUrl, - } - ); - // Stringify all values so we can feed into Webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce( - (env, key) => { - env[key] = JSON.stringify(raw[key]); - return env; - }, - {} - ), - }; - - return { raw, stringified }; -} - -module.exports = getClientEnvironment; diff --git a/config/jest/cssTransform.js b/config/jest/cssTransform.js deleted file mode 100644 index f1534f6..0000000 --- a/config/jest/cssTransform.js +++ /dev/null @@ -1,14 +0,0 @@ -'use strict'; - -// This is a custom Jest transformer turning style imports into empty objects. -// http://facebook.github.io/jest/docs/tutorial-webpack.html - -module.exports = { - process() { - return 'module.exports = {};'; - }, - getCacheKey() { - // The output is always the same. - return 'cssTransform'; - }, -}; diff --git a/config/jest/fileTransform.js b/config/jest/fileTransform.js deleted file mode 100644 index ffce0da..0000000 --- a/config/jest/fileTransform.js +++ /dev/null @@ -1,12 +0,0 @@ -'use strict'; - -const path = require('path'); - -// This is a custom Jest transformer turning file imports into filenames. -// http://facebook.github.io/jest/docs/tutorial-webpack.html - -module.exports = { - process(src, filename) { - return `module.exports = ${JSON.stringify(path.basename(filename))};`; - }, -}; diff --git a/config/jest/typescriptTransform.js b/config/jest/typescriptTransform.js deleted file mode 100644 index 9b138ac..0000000 --- a/config/jest/typescriptTransform.js +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2004-present Facebook. All Rights Reserved. - -'use strict'; - -const tsJestPreprocessor = require('ts-jest/preprocessor'); - -module.exports = tsJestPreprocessor; diff --git a/config/paths.js b/config/paths.js deleted file mode 100644 index ce64504..0000000 --- a/config/paths.js +++ /dev/null @@ -1,57 +0,0 @@ -'use strict'; - -const path = require('path'); -const fs = require('fs'); -const url = require('url'); - -// Make sure any symlinks in the project folder are resolved: -// https://github.com/facebookincubator/create-react-app/issues/637 -const appDirectory = fs.realpathSync(process.cwd()); -const resolveApp = relativePath => path.resolve(appDirectory, relativePath); - -const envPublicUrl = process.env.PUBLIC_URL; - -function ensureSlash(path, needsSlash) { - const hasSlash = path.endsWith('/'); - if (hasSlash && !needsSlash) { - return path.substr(path, path.length - 1); - } else if (!hasSlash && needsSlash) { - return `${path}/`; - } else { - return path; - } -} - -const getPublicUrl = appPackageJson => - envPublicUrl || require(appPackageJson).homepage; - -// We use `PUBLIC_URL` environment variable or "homepage" field to infer -// "public path" at which the app is served. -// Webpack needs to know it to put the right