Skip to content

Commit

Permalink
Merge pull request #19 from css-modules/media-queries
Browse files Browse the repository at this point in the history
v1.0 prep
  • Loading branch information
geelen committed Sep 19, 2015
2 parents fb66953 + bf2bd70 commit 97d3d6b
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"jsx": true
},
"rules": {
"quotes": "single"
"quotes": [2, "single"]
}
}
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
sudo: false
language: node_js
node_js:
- "0.10"
- "0.12"
- "iojs"
- "4.0"
script: npm run travis

before_install:
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "postcss-modules-scope",
"version": "0.0.8",
"version": "1.0.0-beta1",
"description": "A CSS Modules transform to extract export statements from local-scope classes",
"main": "lib/index.js",
"scripts": {
"lint": "eslint src",
"build": "babel --out-dir lib src",
"watch": "chokidar src -c 'npm run build'",
"pretest": "npm run lint && npm run build",
"test": "mocha",
"test": "mocha --compilers js:babel/register",
"posttest": "npm run lint && npm run build",
"autotest": "chokidar src test -c 'npm test'",
"precover": "npm run lint && npm run build",
"cover": "istanbul cover node_modules/mocha/bin/_mocha",
"cover": "babel-istanbul cover node_modules/.bin/_mocha",
"travis": "npm run cover -- --report lcovonly",
"prepublish": "npm run build"
},
Expand Down Expand Up @@ -39,14 +39,14 @@
},
"devDependencies": {
"babel": "^5.4.7",
"babel-eslint": "^3.1.9",
"babel-eslint": "^4.1.3",
"babel-istanbul": "^0.3.20",
"babelify": "^6.1.2",
"chokidar-cli": "^0.2.1",
"chokidar-cli": "^1.0.1",
"codecov.io": "^0.1.2",
"coveralls": "^2.11.2",
"css-selector-parser": "^1.0.4",
"eslint": "^0.21.2",
"istanbul": "^0.3.14",
"eslint": "^1.5.0",
"mocha": "^2.2.5"
}
}
16 changes: 8 additions & 8 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
function localizeNode(node) {
let newNode = Object.create(node);
switch(node.type) {
case "selector":
case 'selector':
newNode.nodes = node.nodes.map(localizeNode);
return newNode;
case "class":
case "id":
case 'class':
case 'id':
let scopedName = exportScopedName(node.name);
newNode.name = scopedName;
return newNode;
Expand All @@ -61,7 +61,7 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
function traverseNode(node) {
switch(node.type) {
case 'nested-pseudo-class':
if(node.name === "local") {
if(node.name === 'local') {
if(node.nodes.length !== 1) {
throw new Error('Unexpected comma (",") in :local block');
}
Expand Down Expand Up @@ -92,7 +92,7 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
let selector = Tokenizer.parse(rule.selector);
let newSelector = traverseNode(selector);
rule.selector = Tokenizer.stringify(newSelector);
rule.walkDecls("composes", decl => {
rule.walkDecls('composes', decl => {
let localNames = getSingleLocalNamesForComposes(selector);
let classes = decl.value.split(/\s+/);
classes.forEach((className) => {
Expand All @@ -107,7 +107,7 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
});
});
} else {
throw decl.error("referenced class name \"" + className + "\" in composes not found");
throw decl.error('referenced class name "' + className + '" in composes not found');
}
});
decl.remove();
Expand Down Expand Up @@ -147,8 +147,8 @@ const processor = postcss.plugin('postcss-modules-scope', function(options) {
selector: `:export`,
nodes: exportedNames.map(exportedName => postcss.decl({
prop: exportedName,
value: exports[exportedName].join(" "),
raws: { before: "\n " },
value: exports[exportedName].join(' '),
raws: { before: '\n ' },
_autoprefixerDisabled: true
}))
}));
Expand Down
2 changes: 1 addition & 1 deletion test/test-cases.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var assert = require("assert");
var fs = require("fs");
var path = require("path");
var postcss = require("postcss");
var processor = require("../");
var processor = require("../src");

function generateInvalidCSS(css) {
css.walkDecls(function(decl) {
Expand Down

0 comments on commit 97d3d6b

Please sign in to comment.