diff --git a/packages/angular-cli/commands/build.ts b/packages/angular-cli/commands/build.ts index 744b405fe567..54b4a6b76ac1 100644 --- a/packages/angular-cli/commands/build.ts +++ b/packages/angular-cli/commands/build.ts @@ -11,6 +11,7 @@ export interface BuildOptions { supressSizes: boolean; baseHref?: string; aot?: boolean; + publicPath?: string; } const BuildCommand = Command.extend({ diff --git a/packages/angular-cli/models/webpack-build-common.ts b/packages/angular-cli/models/webpack-build-common.ts index c2c90f91f1e5..371b5a5d0a34 100644 --- a/packages/angular-cli/models/webpack-build-common.ts +++ b/packages/angular-cli/models/webpack-build-common.ts @@ -11,7 +11,8 @@ export function getWebpackCommonConfig( projectRoot: string, environment: string, appConfig: any, - baseHref: string + baseHref: string, + publicPath: string, ) { const appRoot = path.resolve(projectRoot, appConfig.root); @@ -41,7 +42,8 @@ export function getWebpackCommonConfig( entry: entry, output: { path: path.resolve(projectRoot, appConfig.outDir), - filename: '[name].bundle.js' + filename: '[name].bundle.js', + publicPath: publicPath }, module: { rules: [ diff --git a/packages/angular-cli/models/webpack-config.ts b/packages/angular-cli/models/webpack-config.ts index 6317fef937a3..35ed44ebb548 100644 --- a/packages/angular-cli/models/webpack-config.ts +++ b/packages/angular-cli/models/webpack-config.ts @@ -23,7 +23,8 @@ export class NgCliWebpackConfig { public environment: string, outputDir?: string, baseHref?: string, - isAoT = false + isAoT = false, + publicPath?: string ) { const config: CliConfig = CliConfig.fromProject(); const appConfig = config.config.apps[0]; @@ -34,7 +35,8 @@ export class NgCliWebpackConfig { this.ngCliProject.root, environment, appConfig, - baseHref + baseHref, + publicPath ); let targetConfigPartial = this.getTargetConfig(this.ngCliProject.root, appConfig); const typescriptConfigPartial = isAoT diff --git a/packages/angular-cli/tasks/build-webpack.ts b/packages/angular-cli/tasks/build-webpack.ts index 80fc0b9e62a5..e53c411e2605 100644 --- a/packages/angular-cli/tasks/build-webpack.ts +++ b/packages/angular-cli/tasks/build-webpack.ts @@ -23,7 +23,8 @@ export default Task.extend({ runTaskOptions.environment, outputDir, runTaskOptions.baseHref, - runTaskOptions.aot + runTaskOptions.aot, + runTaskOptions.publicPath ).config; // fail on build error