8000 add support for publicPath option in webpack by Mischi · Pull Request #3136 · angular/angular-cli · GitHub
[go: up one dir, main page]
Skip to content

add support for publicPath option in webpack #3136

New issue

Have a question about this project? Sign up 8000 for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

add support for publicPath option in webpack #3136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d6120f
add publicPath to the config schema
Mischi Nov 14, 2016
fa882aa
pass "publicPath" from the config to webpack
Mischi Nov 14, 2016
87b0b3e
test for 'publicPath' config
jbellmann Nov 18, 2016
d012772
Merge branch 'master' into feat-webpack-publicPath
Mischi Nov 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
8000
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/angular-cli/lib/config/schema.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export interface CliConfig {
apps?: {
root?: string;
outDir?: string;
assets?: string;
publicPath?: string;
assets?: string[];
index?: string;
main?: string;
test?: string;
Expand Down
3 changes: 3 additions & 0 deletions packages/angular-cli/lib/config/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
"type": "string",
"default": "dist/"
},
"publicPath": {
"type": "string"
},
"assets": {
"fixme": true,
"type": "array",
Expand Down
1 change: 1 addition & 0 deletions packages/angular-cli/models/webpack-build-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export function getWebpackCommonConfig(
entry: entry,
output: {
path: path.resolve(projectRoot, appConfig.outDir),
publicPath: appConfig.publicPath,
filename: '[name].bundle.js',
sourceMapFilename: '[name].bundle.map',
chunkFilename: '[id].chunk.js'
Expand Down
31 changes: 31 additions & 0 deletions tests/e2e/tests/third-party/bootstrap_publicPath.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import {npm, ng} from '../../utils/process';
import {updateJsonFile} from '../../utils/project';
import {expectFileToMatch} from '../../utils/fs';
import {oneLineTrim} from 'common-tags';


export default function() {
return Promise.resolve()
.then(() => npm('install', 'bootstrap@next'))
.then(() => updateJsonFile('angular-cli.json', configJson => {
const app = configJson['apps'][0];
app['styles'].push('../node_modules/bootstrap/dist/css/bootstrap.css');
app['scripts'].push(
'../node_modules/jquery/dist/jquery.js',
'../node_modules/tether/dist/js/tether.js',
'../node_modules/bootstrap/dist/js/bootstrap.js'
);
app['publicPath'] = '/publicPathValue/';
}))
.then(() => ng('build'))
.then(() => expectFileToMatch('dist/scripts.bundle.js', '/*!\\n * jQuery JavaScript'))
.then(() => expectFileToMatch('dist/scripts.bundle.js', '/*! tether '))
.then(() => expectFileToMatch('dist/scripts.bundle.js', '/*!\\n * Bootstrap'))
.then(() => expectFileToMatch('dist/styles.bundle.js', '/*!\\n * Bootstrap'))
.then(() => expectFileToMatch('dist/index.html', oneLineTrim`
<script type="text/javascript" src="/publicPathValue/inline.bundle.js"></script>
<script type="text/javascript" src="/publicPathValue/styles.bundle.js"></script>
<script type="text/javascript" src="/publicPathValue/scripts.bundle.js"></script>
<script type="text/javascript" src="/publicPathValue/main.bundle.js"></script>
`));
}
0