diff --git a/packages/webpack5/src/configuration/angular.ts b/packages/webpack5/src/configuration/angular.ts index 4f5fe5bcb..6499805cd 100644 --- a/packages/webpack5/src/configuration/angular.ts +++ b/packages/webpack5/src/configuration/angular.ts @@ -1,7 +1,8 @@ -import base from './base'; -import { IWebpackEnv } from '@nativescript/webpack'; import Config from 'webpack-chain'; +import { IWebpackEnv } from '../index'; +import base from './base'; + export default function (config: Config, env: IWebpackEnv): Config { base(config, env); diff --git a/packages/webpack5/src/configuration/base.ts b/packages/webpack5/src/configuration/base.ts index 85f4fafa5..80ba6561b 100644 --- a/packages/webpack5/src/configuration/base.ts +++ b/packages/webpack5/src/configuration/base.ts @@ -1,13 +1,6 @@ -import Config from 'webpack-chain'; -import { IWebpackEnv } from '../index'; -import { - getAbsoluteDistPath, - getEntryPath, - getPlatform, - getProjectRootPath, -} from '../helpers/project'; - import { DefinePlugin, HotModuleReplacementPlugin } from 'webpack'; +import Config from 'webpack-chain'; +import path from 'path'; import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'; import { CleanWebpackPlugin } from 'clean-webpack-plugin'; @@ -16,7 +9,12 @@ import TerserPlugin from 'terser-webpack-plugin'; // import { WatchStateLoggerPlugin } from '../plugins/WatchStateLoggerPlugin'; import { WatchStatePlugin } from '../plugins/WatchStatePlugin'; -import path from 'path'; +import { IWebpackEnv } from '../index'; +import { + getAbsoluteDistPath, + getEntryPath, + getPlatform, +} from '../helpers/project'; export default function (config: Config, env: IWebpackEnv): Config { const entryPath = getEntryPath(); @@ -199,9 +197,6 @@ export default function (config: Config, env: IWebpackEnv): Config { }, ]); - // todo: we should probably move away from CopyWebpackPlugin - // it has many issues we can solve by simply copying files **before** the build even starts - // this is just a temp inline plugin that does nothing while building out the configs. const copyPaths = ['assets/**', 'fonts/**', '**/*.+(jpg|png)']; config.plugin('CopyWebpackPlugin').use(CopyWebpackPlugin, [ { @@ -211,6 +206,7 @@ export default function (config: Config, env: IWebpackEnv): Config { noErrorOnMissing: true, globOptions: { dot: false, + // todo: ignore AppResources if inside app folder! // ignore: [``] }, })), diff --git a/packages/webpack5/src/configuration/javascript.ts b/packages/webpack5/src/configuration/javascript.ts index 0993b6fe0..c64c19089 100644 --- a/packages/webpack5/src/configuration/javascript.ts +++ b/packages/webpack5/src/configuration/javascript.ts @@ -1,7 +1,8 @@ -import base from './base'; -import { IWebpackEnv } from '@nativescript/webpack'; import Config from 'webpack-chain'; +import { IWebpackEnv } from '../index'; +import base from './base'; + // todo: add base configuration for core with javascript export default function (config: Config, env: IWebpackEnv): Config { base(config, env); diff --git a/packages/webpack5/src/configuration/react.ts b/packages/webpack5/src/configuration/react.ts index 6810952a7..bffdf4ccc 100644 --- a/packages/webpack5/src/configuration/react.ts +++ b/packages/webpack5/src/configuration/react.ts @@ -1,8 +1,9 @@ -import base from './base'; -import { env as _env, IWebpackEnv } from '@nativescript/webpack'; -import Config from 'webpack-chain'; import { merge } from 'webpack-merge'; +import Config from 'webpack-chain'; + +import { env as _env, IWebpackEnv } from '../index'; import { getPlatform } from '../helpers/project'; +import base from './base'; export default function (config: Config, env: IWebpackEnv = _env): Config { base(config, env); diff --git a/packages/webpack5/src/configuration/typescript.ts b/packages/webpack5/src/configuration/typescript.ts index b56f8176d..d3f7b73eb 100644 --- a/packages/webpack5/src/configuration/typescript.ts +++ b/packages/webpack5/src/configuration/typescript.ts @@ -1,7 +1,8 @@ -import base from './base'; -import { IWebpackEnv } from '@nativescript/webpack'; import Config from 'webpack-chain'; +import { IWebpackEnv } from '../index'; +import base from './base'; + // todo: add base configuration for core export default function (config: Config, env: IWebpackEnv): Config { base(config, env); diff --git a/packages/webpack5/src/configuration/vue.ts b/packages/webpack5/src/configuration/vue.ts index feb232897..acf1c53c3 100644 --- a/packages/webpack5/src/configuration/vue.ts +++ b/packages/webpack5/src/configuration/vue.ts @@ -1,9 +1,10 @@ import { VueLoaderPlugin } from 'vue-loader'; import { merge } from 'webpack-merge'; import Config from 'webpack-chain'; -import base from './base'; + import { env as _env, IWebpackEnv } from '../index'; import { getPlatform } from '../helpers/project'; +import base from './base'; export default function (config: Config, env: IWebpackEnv = _env): Config { base(config, env);