diff --git a/packages/webpack5/__tests__/index.spec.ts b/packages/webpack5/__tests__/index.spec.ts index 22cc9e2d3..53814ce17 100644 --- a/packages/webpack5/__tests__/index.spec.ts +++ b/packages/webpack5/__tests__/index.spec.ts @@ -55,7 +55,7 @@ describe('@nativescript/webpack', () => { webpack.resolveChainableConfig(); }); - it('prints plugin name that errored out', () => { + it('prints plugin name that has a chain function that throws an error', () => { webpack.useConfig(false); webpack.setCurrentPlugin('test-plugin'); const chainFn = jest.fn(() => { diff --git a/packages/webpack5/src/helpers/index.ts b/packages/webpack5/src/helpers/index.ts index f983b1b27..d34c3a845 100644 --- a/packages/webpack5/src/helpers/index.ts +++ b/packages/webpack5/src/helpers/index.ts @@ -1,12 +1,18 @@ import { merge } from 'webpack-merge'; -import { getValue } from './config'; -import { getAllDependencies, getDependencyPath } from './dependencies'; + +import { + getAllDependencies, + hasDependency, + getDependencyPath, +} from './dependencies'; import { determineProjectFlavor } from './flavor'; import { error, info, warn } from './log'; +import { getValue } from './config'; import { getAbsoluteDistPath, getDistPath, getEntryPath, + getEntryDirPath, getPackageJson, getPlatform, getProjectRootPath, @@ -23,6 +29,7 @@ export default { }, dependencies: { getAllDependencies, + hasDependency, getDependencyPath, }, flavor: { @@ -37,6 +44,7 @@ export default { getProjectRootPath, getAbsoluteDistPath, getEntryPath, + getEntryDirPath, getDistPath, getPlatform, getPackageJson, diff --git a/packages/webpack5/src/helpers/project.ts b/packages/webpack5/src/helpers/project.ts index 104ff7bae..a7423ae04 100644 --- a/packages/webpack5/src/helpers/project.ts +++ b/packages/webpack5/src/helpers/project.ts @@ -1,5 +1,6 @@ -import { env, Platform } from '../index'; import { resolve, basename, dirname } from 'path'; + +import { env, Platform } from '../index'; import { error } from './log'; export function getProjectRootPath(): string { diff --git a/packages/webpack5/src/index.ts b/packages/webpack5/src/index.ts index 731c70b27..0f7010035 100644 --- a/packages/webpack5/src/index.ts +++ b/packages/webpack5/src/index.ts @@ -1,11 +1,12 @@ +import { highlight } from 'cli-highlight'; import { merge } from 'webpack-merge'; import Config from 'webpack-chain'; import webpack from 'webpack'; -import { highlight } from 'cli-highlight'; -import { configs } from './configuration'; -import { determineProjectFlavor } from './helpers/flavor'; + import { applyExternalConfigs } from './helpers/externalConfigs'; +import { determineProjectFlavor } from './helpers/flavor'; import { error, info } from './helpers/log'; +import { configs } from './configuration'; import helpers from './helpers'; export type Platform = 'android' | 'ios' | string; diff --git a/packages/webpack5/src/plugins/PlatformSuffixPlugin.ts b/packages/webpack5/src/plugins/PlatformSuffixPlugin.ts index a9e54e86c..4e0e186a6 100644 --- a/packages/webpack5/src/plugins/PlatformSuffixPlugin.ts +++ b/packages/webpack5/src/plugins/PlatformSuffixPlugin.ts @@ -1,5 +1,5 @@ -import { existsSync } from 'fs'; import { extname, resolve } from 'path'; +import { existsSync } from 'fs'; const id = 'PlatformSuffixPlugin';