Skip to content

Added support for running the webpack dev server in ssl mode #2089

New issue

Have a question about this project? Sign up 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 13 commits into from
Closed

Added support for running the webpack dev server in ssl mode #2089

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
42bb30d
Added support for running the webpack dev server in ssl mode through …
sbaramov Sep 13, 2016
a2b739b
Corrected previous commit related to adding support for running the …
sbaramov Sep 13, 2016
a790dd4
Merge remote-tracking branch 'upstream/master' into pull-request-webp…
sbaramov Sep 13, 2016
67c1b49
Merge remote-tracking branch 'upstream/master' into pull-request-webp…
sbaramov Sep 14, 2016
aae5053
added white spaces to make tslint happy
sbaramov Sep 14, 2016
0d61398
Merge remote-tracking branch 'upstream/master' into pull-request-webp…
sbaramov Sep 21, 2016
22fe010
made https field optional
sbaramov Sep 21, 2016
0cd50be
chore(ssl): merge with the latest beta 16, commit 'b00ac7d900b6389c9…
sbaramov Sep 28, 2016
52a1ec1
chore(ssl): added e2e tests and requested in the code review
sbaramov Oct 4, 2016
0ed6fd7
chore(ssl): fix the ssl tests to pass lint
sbaramov Oct 4, 2016
ddcc5db
chore(ssl): fix a small configuration error
sbaramov Oct 4, 2016
9e04e60
chore: merge commit '1b46c1189c1b7e31d009ef0f5b221edb5f161117', 1.0.0…
sbaramov Oct 11, 2016
604c4c9
Merge branch 'master' into pull-request-webpack-ssl
Brocco Oct 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
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/angular-cli/custom-typings.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ interface IWebpackDevServerConfigurationOptions {
headers?: { [key: string]: string };
stats?: { [key: string]: boolean };
inline: boolean;
https: boolean;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field should probably be optional.

key?: string;
cert?: string;
}

interface WebpackProgressPluginOutputOptions {
Expand Down
23 changes: 21 additions & 2 deletions packages/angular-cli/tasks/serve-webpack.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,19 @@ export default Task.extend({
}
}

let sslKey: string = null;
let sslCert: string = null;
if (commandOptions.ssl) {
const keyPath = path.resolve(this.project.root, commandOptions.sslKey);
if (fs.existsSync(keyPath)) {
sslKey = fs.readFileSync(keyPath, 'utf-8');
}
const certPath = path.resolve(this.project.root, commandOptions.sslCert);
if (fs.existsSync(certPath)) {
sslCert = fs.readFileSync(certPath, 'utf-8');
}
}

const webpackDevServerConfiguration: IWebpackDevServerConfigurationOptions = {
contentBase: path.resolve(
this.project.root,
Expand All @@ -54,13 +67,19 @@ export default Task.extend({
historyApiFallback: true,
stats: webpackDevServerOutputOptions,
inline: true,
proxy: proxyConfig
proxy: proxyConfig,
https: commandOptions.ssl
};

if (sslKey != null && sslCert != null) {
webpackDevServerConfiguration.key = sslKey;
webpackDevServerConfiguration.cert = sslCert;
}

ui.writeLine(chalk.green(oneLine`
**
NG Live Development Server is running on
http://${commandOptions.host}:${commandOptions.port}.
http${commandOptions.ssl ? 's' : ''}://${commandOptions.host}:${commandOptions.port}.
**
`));

Expand Down