-
-
Notifications
You must be signed in to change notification settings - Fork 407
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feat/974-extra-infos-profile
Bring latest changes to branch 974 Conflicts: src/pages/User/content/UserPage/UserPage.tsx
- Loading branch information
Showing
70 changed files
with
505 additions
and
132 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| 'use strict' | ||
|
|
||
| // Do this as the first thing so that any code reading it knows the right env. | ||
| process.env.BABEL_ENV = 'production' | ||
| process.env.NODE_ENV = 'production' | ||
|
|
||
| // Makes the script crash on unhandled rejections instead of silently | ||
| // ignoring them. In the future, promise rejections that are not handled will | ||
| // terminate the Node.js process with a non-zero exit code. | ||
| process.on('unhandledRejection', err => { | ||
| throw err | ||
| }) | ||
|
|
||
| // Ensure environment variables are read. | ||
| require('../config/env') | ||
|
|
||
| const path = require('path') | ||
| const chalk = require('react-dev-utils/chalk') | ||
| const fs = require('fs-extra') | ||
| const webpack = require('webpack') | ||
| const bfj = require('bfj') | ||
| const configFactory = require('../config/webpack.config') | ||
| const paths = require('../config/paths') | ||
| const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles') | ||
| const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages') | ||
| const printHostingInstructions = require('react-dev-utils/printHostingInstructions') | ||
| const FileSizeReporter = require('react-dev-utils/FileSizeReporter') | ||
| const printBuildError = require('react-dev-utils/printBuildError') | ||
|
|
||
| const measureFileSizesBeforeBuild = FileSizeReporter.measureFileSizesBeforeBuild | ||
| const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild | ||
| const useYarn = fs.existsSync(paths.yarnLockFile) | ||
|
|
||
| // These sizes are pretty large. We'll warn for bundles exceeding them. | ||
| const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024 | ||
| const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024 | ||
|
|
||
| const isInteractive = process.stdout.isTTY | ||
|
|
||
| // Warn and crash if required files are missing | ||
| if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) { | ||
| process.exit(1) | ||
| } | ||
|
|
||
| // Process CLI arguments | ||
| const argv = process.argv.slice(2) | ||
| const writeStatsJson = argv.indexOf('--stats') !== -1 | ||
|
|
||
| // Generate configuration | ||
| const config = configFactory('production') | ||
|
|
||
| // We require that you explicitly set browsers and do not fall back to | ||
| // browserslist defaults. | ||
| const { checkBrowsers } = require('react-dev-utils/browsersHelper') | ||
| checkBrowsers(paths.appPath, isInteractive) | ||
| .then(() => { | ||
| // First, read the current file sizes in build directory. | ||
| // This lets us display how much they changed later. | ||
| return measureFileSizesBeforeBuild(paths.appBuild) | ||
| }) | ||
| .then(previousFileSizes => { | ||
| // Remove all content but keep the directory so that | ||
| // if you're in it, you don't end up in Trash | ||
| fs.emptyDirSync(paths.appBuild) | ||
| // Merge with the public folder | ||
| copyPublicFolder() | ||
| // Start the webpack build | ||
| return build(previousFileSizes) | ||
| }) | ||
| .then( | ||
| ({ stats, previousFileSizes, warnings }) => { | ||
| if (warnings.length) { | ||
| console.log(chalk.yellow('Compiled with warnings.\n')) | ||
| console.log(warnings.join('\n\n')) | ||
| console.log( | ||
| '\nSearch for the ' + | ||
| chalk.underline(chalk.yellow('keywords')) + | ||
| ' to learn more about each warning.', | ||
| ) | ||
| console.log( | ||
| 'To ignore, add ' + | ||
| chalk.cyan('// eslint-disable-next-line') + | ||
| ' to the line before.\n', | ||
| ) | ||
| } else { | ||
| console.log(chalk.green('Compiled successfully.\n')) | ||
| } | ||
|
|
||
| console.log('File sizes after gzip:\n') | ||
| printFileSizesAfterBuild( | ||
| stats, | ||
| previousFileSizes, | ||
| paths.appBuild, | ||
| WARN_AFTER_BUNDLE_GZIP_SIZE, | ||
| WARN_AFTER_CHUNK_GZIP_SIZE, | ||
| ) | ||
| console.log() | ||
|
|
||
| const appPackage = require(paths.appPackageJson) | ||
| const publicUrl = paths.publicUrl | ||
| const publicPath = config.output.publicPath | ||
| const buildFolder = path.relative(process.cwd(), paths.appBuild) | ||
| printHostingInstructions( | ||
| appPackage, | ||
| publicUrl, | ||
| publicPath, | ||
| buildFolder, | ||
| useYarn, | ||
| ) | ||
| }, | ||
| err => { | ||
| console.log(chalk.red('Failed to compile.\n')) | ||
| printBuildError(err) | ||
| process.exit(1) | ||
| }, | ||
| ) | ||
| .catch(err => { | ||
| if (err && err.message) { | ||
| console.log(err.message) | ||
| } | ||
| process.exit(1) | ||
| }) | ||
|
|
||
| // Create the production build and print the deployment instructions. | ||
| function build(previousFileSizes) { | ||
| console.log('Creating an optimized production build...') | ||
|
|
||
| const compiler = webpack(config) | ||
| return new Promise((resolve, reject) => { | ||
| compiler.run((err, stats) => { | ||
| let messages | ||
| if (err) { | ||
| if (!err.message) { | ||
| return reject(err) | ||
| } | ||
| messages = formatWebpackMessages({ | ||
| errors: [err.message], | ||
| warnings: [], | ||
| }) | ||
| } else { | ||
| messages = formatWebpackMessages( | ||
| stats.toJson({ all: false, warnings: true, errors: true }), | ||
| ) | ||
| } | ||
| if (messages.errors.length) { | ||
| // Only keep the first error. Others are often indicative | ||
| // of the same problem, but confuse the reader with noise. | ||
| if (messages.errors.length > 1) { | ||
| messages.errors.length = 1 | ||
| } | ||
| return reject(new Error(messages.errors.join('\n\n'))) | ||
| } | ||
| if ( | ||
| process.env.CI && | ||
| (typeof process.env.CI !== 'string' || | ||
| process.env.CI.toLowerCase() !== 'false') && | ||
| messages.warnings.length | ||
| ) { | ||
| console.log( | ||
| chalk.yellow( | ||
| '\nTreating warnings as errors because process.env.CI = true.\n' + | ||
| 'Most CI servers set it automatically.\n', | ||
| ), | ||
| ) | ||
| return reject(new Error(messages.warnings.join('\n\n'))) | ||
| } | ||
|
|
||
| const resolveArgs = { | ||
| stats, | ||
| previousFileSizes, | ||
| warnings: messages.warnings, | ||
| } | ||
| if (writeStatsJson) { | ||
| return bfj | ||
| .write(paths.appBuild + '/bundle-stats.json', stats.toJson()) | ||
| .then(() => resolve(resolveArgs)) | ||
| .catch(error => reject(new Error(error))) | ||
| } | ||
|
|
||
| return resolve(resolveArgs) | ||
| }) | ||
| }) | ||
| } | ||
|
|
||
| function copyPublicFolder() { | ||
| fs.copySync(paths.appPublic, paths.appBuild, { | ||
| dereference: true, | ||
| filter: file => file !== paths.appHtml, | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| 'use strict' | ||
|
|
||
| // Do this as the first thing so that any code reading it knows the right env. | ||
| process.env.BABEL_ENV = 'development' | ||
| process.env.NODE_ENV = 'development' | ||
|
|
||
| // Makes the script crash on unhandled rejections instead of silently | ||
| // ignoring them. In the future, promise rejections that are not handled will | ||
| // terminate the Node.js process with a non-zero exit code. | ||
| process.on('unhandledRejection', err => { | ||
| throw err | ||
| }) | ||
|
|
||
| // Ensure environment variables are read. | ||
| require('../config/env') | ||
|
|
||
| const fs = require('fs') | ||
| const chalk = require('react-dev-utils/chalk') | ||
| const webpack = require('webpack') | ||
| const WebpackDevServer = require('webpack-dev-server') | ||
| const clearConsole = require('react-dev-utils/clearConsole') | ||
| const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles') | ||
| const { | ||
| choosePort, | ||
| createCompiler, | ||
| prepareProxy, | ||
| prepareUrls, | ||
| } = require('react-dev-utils/WebpackDevServerUtils') | ||
| const openBrowser = require('react-dev-utils/openBrowser') | ||
| const paths = require('../config/paths') | ||
| const configFactory = require('../config/webpack.config') | ||
| const createDevServerConfig = require('../config/webpackDevServer.config') | ||
|
|
||
| const useYarn = fs.existsSync(paths.yarnLockFile) | ||
| const isInteractive = process.stdout.isTTY | ||
|
|
||
| // Warn and crash if required files are missing | ||
| if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) { | ||
| process.exit(1) | ||
| } | ||
|
|
||
| // Tools like Cloud9 rely on this. | ||
| const DEFAULT_PORT = parseInt(process.env.PORT, 10) || 3000 | ||
| const HOST = process.env.HOST || '0.0.0.0' | ||
|
|
||
| if (process.env.HOST) { | ||
| console.log( | ||
| chalk.cyan( | ||
| `Attempting to bind to HOST environment variable: ${chalk.yellow( | ||
| chalk.bold(process.env.HOST), | ||
| )}`, | ||
| ), | ||
| ) | ||
| console.log( | ||
| `If this was unintentional, check that you haven't mistakenly set it in your shell.`, | ||
| ) | ||
| console.log( | ||
| `Learn more here: ${chalk.yellow('http://bit.ly/CRA-advanced-config')}`, | ||
| ) | ||
| console.log() | ||
| } | ||
|
|
||
| // We require that you explictly set browsers and do not fall back to | ||
| // browserslist defaults. | ||
| const { checkBrowsers } = require('react-dev-utils/browsersHelper') | ||
| checkBrowsers(paths.appPath, isInteractive) | ||
| .then(() => { | ||
| // We attempt to use the default port but if it is busy, we offer the user to | ||
| // run on a different port. `choosePort()` Promise resolves to the next free port. | ||
| return choosePort(HOST, DEFAULT_PORT) | ||
| }) | ||
| .then(port => { | ||
| if (port == null) { | ||
| // We have not found a port. | ||
| return | ||
| } | ||
| const config = configFactory('development') | ||
| const protocol = process.env.HTTPS === 'true' ? 'https' : 'http' | ||
| const appName = require(paths.appPackageJson).name | ||
| const urls = prepareUrls(protocol, HOST, port) | ||
| // Create a webpack compiler that is configured with custom messages. | ||
| const compiler = createCompiler(webpack, config, appName, urls, useYarn) | ||
| // Load proxy config | ||
| const proxySetting = require(paths.appPackageJson).proxy | ||
| const proxyConfig = prepareProxy(proxySetting, paths.appPublic) | ||
| // Serve webpack assets generated by the compiler over a web server. | ||
| const serverConfig = createDevServerConfig( | ||
| proxyConfig, | ||
| urls.lanUrlForConfig, | ||
| ) | ||
| const devServer = new WebpackDevServer(compiler, serverConfig) | ||
| // Launch WebpackDevServer. | ||
| devServer.listen(port, HOST, err => { | ||
| if (err) { | ||
| return console.log(err) | ||
| } | ||
| if (isInteractive) { | ||
| clearConsole() | ||
| } | ||
| console.log(chalk.cyan('Starting the development server...\n')) | ||
| openBrowser(urls.localUrlForBrowser) | ||
| }) | ||
| ;['SIGINT', 'SIGTERM'].forEach(function(sig) { | ||
| process.on(sig, function() { | ||
| devServer.close() | ||
| process.exit() | ||
| }) | ||
| }) | ||
| }) | ||
| .catch(err => { | ||
| if (err && err.message) { | ||
| console.log(err.message) | ||
| } | ||
| process.exit(1) | ||
| }) |
Oops, something went wrong.