Skip to content

Commit 4690df0

Browse files
committed
improve tests and update packages
1 parent c447488 commit 4690df0

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "SASS loader for Webpack",
55
"main": "index.js",
66
"scripts": {
7-
"test": "./node_modules/webpack/bin/webpack.js -w --config=test/webpack.config.js"
7+
"test": "rm test/output/* && node ./node_modules/webpack/bin/webpack.js -d -w --config=test/webpack.config.js"
88
},
99
"keywords": [
1010
"sass",
@@ -23,7 +23,7 @@
2323
"sass-graph": "^0.1.2"
2424
},
2525
"devDependencies": {
26-
"css-loader": "^0.6.12",
27-
"webpack": "^1.2.0"
26+
"css-loader": "^0.9.0",
27+
"webpack": "^1.4.0"
2828
}
2929
}

test/src/entry.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
console.log(require('css!../../index.js!./index.scss'));
1+
var scss = require('css!../../index.js!./index.scss');
2+
var sass = require('css!../../index.js?indentedSyntax=sass!./index.sass');
3+
4+
console.log(scss, sass);

test/src/index.sass

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
body
2+
margin: 10px
3+
color: green

test/src/index.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
body {
22
margin: 10px;
3+
color: blue;
34
}
45

5-
@import "include";
6+
@import "_include";

test/test.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/webpack.config.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ var webpack = require('webpack');
33

44
module.exports = {
55
entry: {
6-
test: path.join(__dirname, "src/entry.js")
6+
test: path.join(__dirname, "src", "entry.js")
77
},
88
output: {
9-
path: __dirname,
10-
publicPath: "/",
9+
path: path.join(__dirname, "output"),
1110
filename: "[name].js",
1211
sourceMapFilename: "[file].map"
1312
},
1413
plugins: [
15-
new webpack.optimize.UglifyJsPlugin()
14+
//new webpack.optimize.UglifyJsPlugin()
1615
]
1716
};

0 commit comments

Comments
 (0)