From 0119965287dd52a42beacffe7c05b51174ebbcd5 Mon Sep 17 00:00:00 2001 From: James Date: Sun, 29 Nov 2020 11:36:01 -0500 Subject: [PATCH] fixes build script --- src/bin/build.ts | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/src/bin/build.ts b/src/bin/build.ts index 4b4d0a7416..4fcb0ee726 100755 --- a/src/bin/build.ts +++ b/src/bin/build.ts @@ -1,37 +1,21 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable global-require */ -/* eslint-disable import/no-dynamic-require */ import webpack from 'webpack'; import getWebpackProdConfig from '../webpack/getWebpackProdConfig'; import findConfig from '../config/find'; import loadConfig from '../config/load'; -import getBabelConfig from '../babel.config'; - -const babelConfig = getBabelConfig({ - env: () => false, -}); +import { buildConfig } from '../config/build'; +import babelConfig from '../babel.config'; const configPath = findConfig(); const build = (): void => { try { - require('@babel/register')({ - ...babelConfig, - extensions: ['.js', '.jsx', '.ts', '.tsx'], - plugins: [ - [ - require('babel-plugin-ignore-html-and-css-imports'), - { - removeExtensions: ['.svg', '.css', '.scss', '.png', '.jpg'], - }, - ], - ...babelConfig.plugins, - ], - }); - - const config = loadConfig(); + require('@babel/register')(babelConfig); + const loadedConfig = loadConfig(); + const config = buildConfig(loadedConfig); const webpackProdConfig = getWebpackProdConfig({ ...config, paths: {