diff --git a/scripts/build.js b/scripts/build.js index e60b554466f9ff87efeff3fa0006cd7349f58b79..71dcc798bba4ee5f1ff4e499c3eaf72a1d51e1d6 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -21,9 +21,12 @@ var rimrafSync = require('rimraf').sync; var webpack = require('webpack'); var config = require('../config/webpack.config.prod'); var paths = require('../config/paths'); +var checkRequiredFiles = require('./utils/checkRequiredFiles'); var recursive = require('recursive-readdir'); var stripAnsi = require('strip-ansi'); +checkRequiredFiles(); + // Input: /User/dan/app/build/static/js/main.82be8.js // Output: /static/js/main.js function removeFileNameHash(fileName) { diff --git a/scripts/eject.js b/scripts/eject.js index 3e5e18af38779e3f481e0e548093765012b82030..74c5c9ef99b838f3fc44fcfc592b88864e0f2647 100644 --- a/scripts/eject.js +++ b/scripts/eject.js @@ -44,6 +44,7 @@ prompt( path.join('config', 'jest', 'transform.js'), path.join('scripts', 'build.js'), path.join('scripts', 'start.js'), + path.join('scripts', 'utils', 'checkRequiredFiles.js'), path.join('scripts', 'utils', 'chrome.applescript'), path.join('scripts', 'utils', 'prompt.js'), path.join('scripts', 'utils', 'WatchMissingNodeModulesPlugin.js') diff --git a/scripts/start.js b/scripts/start.js index 185299052bfde433c6d54a3d9ca476b281ab9e73..84d1e7c4b48d11ed7e95c1febaf97273ab3338f4 100644 --- a/scripts/start.js +++ b/scripts/start.js @@ -11,7 +11,6 @@ process.env.NODE_ENV = 'development'; -var fs = require('fs'); var path = require('path'); var chalk = require('chalk'); var webpack = require('webpack'); @@ -21,6 +20,7 @@ var httpProxyMiddleware = require('http-proxy-middleware'); var execSync = require('child_process').execSync; var opn = require('opn'); var detect = require('detect-port'); +var checkRequiredFiles = require('./utils/checkRequiredFiles'); var prompt = require('./utils/prompt'); var config = require('../config/webpack.config.dev'); var paths = require('../config/paths'); @@ -171,20 +171,6 @@ function openBrowser(port, protocol) { opn(protocol + '://localhost:' + port + '/'); } -function checkRequiredFiles() { - var filesPathToCheck = [paths.appHtml, paths.appIndexJs]; - filesPathToCheck.forEach(function(filePath) { - try { - fs.accessSync(filePath, fs.F_OK); - } catch (err) { - var fileName = path.basename(filePath); - console.log( - chalk.red(`Cannot find ${fileName} in ${filePath} directory`) - ); - process.exit(1); - } - }); -} // We need to provide a custom onError function for httpProxyMiddleware. // It allows us to log custom error messages on the console. function onProxyError(proxy) { diff --git a/scripts/utils/checkRequiredFiles.js b/scripts/utils/checkRequiredFiles.js new file mode 100644 index 0000000000000000000000000000000000000000..8110eb01cdb902d2e5c23b035303609a1cb257a1 --- /dev/null +++ b/scripts/utils/checkRequiredFiles.js @@ -0,0 +1,33 @@ +// @remove-on-eject-begin +/** + * Copyright (c) 2015-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + */ +// @remove-on-eject-end + +const fs = require('fs'); +const path = require('path'); +const chalk = require('chalk'); +const paths = require('../../config/paths'); + +function checkRequiredFiles() { + const filesPathToCheck = [paths.appHtml, paths.appIndexJs]; + filesPathToCheck.forEach(filePath => { + try { + fs.accessSync(filePath, fs.F_OK); + } catch (err) { + const dirName = path.dirname(filePath); + const fileName = path.basename(filePath); + console.log(chalk.red('Could not find a required file.')); + console.log(chalk.red(' Name: ') + chalk.cyan(fileName)); + console.log(chalk.red(' Searched in: ') + chalk.cyan(dirName)); + process.exit(1); + } + }); +} + +module.exports = checkRequiredFiles;