Skip to content

Commit ade6778

Browse files
Fix nojQuery issue. Updated node-sass.
1 parent a114709 commit ade6778

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

generators/app/templates/_config/webpack/global.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports = function (_path) {
137137
}
138138
}),
139139
new webpack.ProvidePlugin({
140-
<% if (props.jQuery) { %>
140+
<% if (props.jQuery.key !== 'jqLite') { %>
141141
$: 'jquery',
142142
jQuery: 'jquery',
143143
'window.jQuery': 'jquery',

generators/app/templates/_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"moment": "^2.20.1",
6363
"ng-storage": "^0.3.2",
6464
"ngtemplate-loader": "^1.3.1",
65-
"node-sass": "^3.10.0",
65+
"node-sass": "^4.9.3",
6666
"phantomjs-prebuilt": "^2.1.16",
6767
"postcss-loader": "^0.13.0",
6868
"protractor": "^5.3.0",

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-angular-webpack-es6",
3-
"version": "1.0.5",
3+
"version": "1.0.6",
44
"description": "Angular Webpack ES6 generator. Uses SASS as CSS preprocessor, UI router as default angular router, LazyLoading example included. Inspired by generator-gulp-angular.",
55
"homepage": "",
66
"author": {

0 commit comments

Comments
 (0)