diff --git a/.dockerignore b/.dockerignore index de4d1f0..e3fbd98 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,2 @@ -dist +build node_modules diff --git a/.eslintignore b/.eslintignore index cab4bb7..4fad398 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,3 +1,3 @@ -dist +build dll node_modules diff --git a/.gitignore b/.gitignore index 586e528..63f6535 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules -/dist +/build /dll config/* !config/template.* diff --git a/.prettierignore b/.prettierignore index 309d143..eee9316 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,4 @@ -dist +build dll *.jpg *.png diff --git a/.travis.yml b/.travis.yml index 06cc40e..483b177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,24 +28,24 @@ before_deploy: - chmod 600 /tmp/deploy_rsa - ssh-add /tmp/deploy_rsa # Removing unneeded files - - rm -rf dist/messages - - rm -rf dist/*.css.map + - rm -rf build/messages + - rm -rf build/*.css.map # Move all source maps to it's own directory - mkdir -p source-maps - - mv dist/*.js.map source-maps/ 2>/dev/null; true - - cp dist/*.js source-maps/ + - mv build/*.js.map source-maps/ 2>/dev/null; true + - cp build/*.js source-maps/ # Creating tar.gz and zip archives - - cd dist - - tar -zcf ../dist.tar.gz --exclude="*.map" * - - zip -rq ../dist.zip * -x "*.map" + - cd build + - tar -zcf ../build.tar.gz --exclude="*.map" * + - zip -rq ../build.zip * -x "*.map" - cd .. deploy: - provider: releases api_key: "$GITHUB_TOKEN" file: - - dist.tar.gz - - dist.zip + - build.tar.gz + - build.zip skip_cleanup: true draft: true on: @@ -53,7 +53,7 @@ deploy: # - provider: script # skip_cleanup: true - # script: echo "put -r $TRAVIS_BUILD_DIR/dist/* accounts-frontend/" | sftp deploy@account.ely.by + # script: echo "put -r $TRAVIS_BUILD_DIR/build/* accounts-frontend/" | sftp deploy@account.ely.by # on: # branch: master diff --git a/babel.config.js b/babel.config.js index 3665a32..0cf2fa4 100644 --- a/babel.config.js +++ b/babel.config.js @@ -22,7 +22,7 @@ module.exports = { corejs: 3, }, ], - ['react-intl', { messagesDir: './dist/messages/' }], + ['react-intl', { messagesDir: './build/messages/' }], ], env: { webpack: { diff --git a/package.json b/package.json index 22184da..25f1103 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ ], "scripts": { "start": "yarn run clean && yarn run build:dll && webpack-dev-server --colors", - "clean": "rm -rf ./dist && mkdir ./dist", + "clean": "rm -rf ./build && mkdir ./build", "e2e": "yarn --cwd ./tests-e2e test", "test": "jest", "test:watch": "yarn test --watch", @@ -43,7 +43,7 @@ "build:webpack": "NODE_ENV=production webpack --colors -p --bail", "build:quiet": "yarn run clean && yarn run build:webpack --quiet", "build:dll": "node ./packages/scripts/build-dll.js", - "build:serve": "http-server --proxy https://dev.account.ely.by ./dist", + "build:serve": "http-server --proxy https://dev.account.ely.by ./build", "sb": "start-storybook -p 9009 --ci", "build-storybook": "build-storybook" }, diff --git a/packages/scripts/i18n-collect.ts b/packages/scripts/i18n-collect.ts index b1e7325..50579b8 100644 --- a/packages/scripts/i18n-collect.ts +++ b/packages/scripts/i18n-collect.ts @@ -7,7 +7,7 @@ import chalk from 'chalk'; import prompt from 'prompt'; import localesMap from 'app/i18n'; -const MESSAGES_PATTERN = `${__dirname}/../../dist/messages/**/*.json`; +const MESSAGES_PATTERN = `${__dirname}/../../build/messages/**/*.json`; const LANG_DIR = `${__dirname}/../app/i18n`; const DEFAULT_LOCALE = 'en'; const SUPPORTED_LANGS = [DEFAULT_LOCALE, ...Object.keys(localesMap)]; diff --git a/webpack.config.js b/webpack.config.js index 44b8c08..49d9a5b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -19,7 +19,7 @@ const config = require('./config'); const SUPPORTED_LANGUAGES = Object.keys(require('app/i18n')); const localeFlags = require('app/components/i18n/localeFlags').default; const rootPath = path.resolve('./packages'); -const outputPath = path.join(__dirname, 'dist'); +const outputPath = path.join(__dirname, 'build'); const isProduction = process.env.NODE_ENV === 'production'; const isAnalyze = process.argv.some(arg => arg === '--analyze');