Skip to content

Commit

Permalink
Merge pull request #55 from andyjansson/rewrite
Browse files Browse the repository at this point in the history
Rewrite
  • Loading branch information
andyjansson authored Oct 10, 2018
2 parents b2c38b8 + 532a4e4 commit 9d021a8
Show file tree
Hide file tree
Showing 12 changed files with 5,074 additions and 171 deletions.
22 changes: 13 additions & 9 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
{
"presets": [["env", {
"targets": {
"node": 4
}
}]],
"plugins": ["add-module-exports"],
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": 4
}
}
]
],
"plugins": [
"add-module-exports"
],
"env": {
"development": {
"sourceMaps": "inline"
},
"test": {
"plugins": ["istanbul"]
}
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
test/fixtures/*.actual.css
dist
dist
yarn-error.log
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
cache: yarn
node_js:
- stable
- node
- "8"
- "6"
- "4"
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
- Changed: Updated postcss-selector-parser to version 5.0.0-rc.3
- Changed: Dropped reduce-css-calc as a dependency
- Fixed: Support constant() and env() ([#42](https://github.com/postcss/postcss-calc/issues/42), [#48](https://github.com/postcss/postcss-calc/issues/48))
- Fixed: Support custom properties with "calc" in its name ([#50](https://github.com/postcss/postcss-calc/issues/50))
- Fixed: Remove unnecessary whitespace around `*` and `/` ([cssnano#625](https://github.com/cssnano/cssnano/issues/625))
- Fixed: Arithmetic bugs around subtraction ([#49](https://github.com/postcss/postcss-calc/issues/49))
- Fixed: Handling of nested calc statements ([reduce-css-calc#49](https://github.com/MoOx/reduce-css-calc/issues/49))
- Fixed: Bugs regarding complex calculations ([reduce-cs-calc#45](https://github.com/MoOx/reduce-css-calc/issues/45))
- Fixed: `100%` incorrectly being transformed to `1` ([reduce-css-calc#44](https://github.com/MoOx/reduce-css-calc/issues/44))
- Added: support for case-insensitive calc statements

# 6.0.2 - 2018-09-25

- Fixed: use PostCSS 7 (thanks to @douglasduteil)
Expand Down
45 changes: 25 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,45 @@
"LICENSE"
],
"scripts": {
"prepublish": "npm run build && del-cli dist/__tests__",
"build": "del-cli dist && cross-env BABEL_ENV=publish babel src --out-dir dist",
"prepublish": "npm run build",
"build": "del-cli dist && cross-env BABEL_ENV=publish babel src --out-dir dist --ignore src/__tests__/**/*.js && jison src/parser.jison -o dist/parser.js",
"pretest": "eslint src && npm run build",
"test": "ava src/__tests__/"
"test": "ava"
},
"author": "Maxime Thirouin",
"author": "Andy Jansson",
"license": "MIT",
"repository": "https://github.com/postcss/postcss-calc.git",
"eslintConfig": {
"parser": "babel-eslint",
"extends": "eslint-config-i-am-meticulous"
},
"devDependencies": {
"ava": "^0.19.1",
"babel-cli": "^6.18.0",
"babel-core": "^6.21.0",
"babel-eslint": "^7.1.1",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-env": "^1.4.0",
"babel-register": "^6.18.0",
"cross-env": "^4.0.0",
"del-cli": "^0.2.1",
"eslint": "^3.12.2",
"eslint-config-i-am-meticulous": "^6.0.1",
"eslint-plugin-babel": "^4.0.0",
"eslint-plugin-import": "^2.2.0"
"@babel/cli": "^7.0.0",
"@babel/core": "^7.0.0",
"@babel/polyfill": "^7.0.0",
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.0.0",
"ava": "^1.0.0-beta.8",
"babel-eslint": "^10.0.1",
"babel-plugin-add-module-exports": "^1.0.0",
"cross-env": "^5.2.0",
"del-cli": "^1.1.0",
"eslint": "^5.6.1",
"eslint-config-i-am-meticulous": "^11.0.0",
"eslint-plugin-babel": "^5.2.1",
"eslint-plugin-import": "^2.2.0",
"jison-gho": "^0.6.1-215"
},
"dependencies": {
"css-unit-converter": "^1.1.1",
"postcss": "^7.0.2",
"postcss-selector-parser": "^2.2.2",
"reduce-css-calc": "^2.0.0"
"postcss-selector-parser": "^5.0.0-rc.3",
"postcss-value-parser": "^3.3.0"
},
"ava": {
"require": "babel-register"
"require": [
"@babel/register",
"@babel/polyfill"
]
}
}
Loading

0 comments on commit 9d021a8

Please sign in to comment.