Skip to content

Commit

Permalink
fix(Push a bunch of changes. 021218 Update.):
Browse files Browse the repository at this point in the history
  • Loading branch information
Jason Hodges committed Feb 12, 2018
1 parent da80a8e commit 29c7ee6
Show file tree
Hide file tree
Showing 57 changed files with 16,045 additions and 1,675 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ Run development server:
Project Plan:
- [] About page
- [] Disqus comments
- [] Angular Flex Layout (https://github.com/angular/angular-cli/wiki/stories-include-angular-flex)
6 changes: 6 additions & 0 deletions config/util.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions config/util.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 16 additions & 19 deletions config/webpack.common.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,28 +63,25 @@ module.exports = function(options) {
* See: http:https://webpack.github.io/docs/configuration.html#module
*/
module: {
rules: [
{
rules: [{
test: /\.js$/,
exclude: /node_modules/,
use: [
{
loader: 'babel-loader',
options: {
presets: ['es2015', {'modules': false}]
}
use: [{
loader: 'babel-loader',
options: {
presets: ['es2015', { 'modules': false }]
}
]
}]
},
{
test: /\.ts$/,
loaders: [{
loader: 'awesome-typescript-loader',
options: {
configFileName: helpers.root('src', 'tsconfig.json'),
useCache: !isProd
}
},
loader: 'awesome-typescript-loader',
options: {
configFileName: helpers.root('src', 'tsconfig.json'),
useCache: !isProd
}
},
'angular2-template-loader'
]
},
Expand All @@ -104,8 +101,8 @@ module.exports = function(options) {
test: /\.(css|scss)$/,
exclude: /node_modules/,
use: [
'to-string-loader',
'style-loader',
{ loader: 'to-string-loader' },
{ loader: 'style-loader' },
{
loader: 'css-loader',
options: {
Expand All @@ -126,7 +123,7 @@ module.exports = function(options) {
// Workaround for angular/angular#11580
new webpack.ContextReplacementPlugin(
// The (\\|\/) piece accounts for path separators in *nix and Windows
/angular(\\|\/)core(\\|\/)@angular/,
/angular([\\\/])core([\\\/])@angular/,
helpers.root('./src'), // location of your src
{} // a map of your routes
),
Expand All @@ -147,4 +144,4 @@ module.exports = function(options) {

]
};
};
};
1 change: 1 addition & 0 deletions config/webpack.dev.babel.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ module.exports = function(options) {
port: METADATA.port,
host: METADATA.host,
public: METADATA.public,
watchContentBase: true,
watchOptions: {
ignored: /node_modules/
}
Expand Down
Loading

0 comments on commit 29c7ee6

Please sign in to comment.