Skip to content

Commit

Permalink
Merge branch 'master' into normalized-fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
GreenGremlin authored and Jonathan Felchlin committed May 2, 2019
2 parents 2a92e3c + a81e8df commit cb53260
Show file tree
Hide file tree
Showing 275 changed files with 16,707 additions and 14,683 deletions.
7 changes: 2 additions & 5 deletions .editorconfig
Expand Up @@ -2,15 +2,12 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{json,yml}]
indent_size = 2

[*.md]
trim_trailing_whitespace = false
72 changes: 72 additions & 0 deletions .eslintrc.js
@@ -0,0 +1,72 @@
module.exports = {
root: true,
parser: 'babel-eslint',
parserOptions: {
sourceType: 'module',
ecmaVersion: 2019,
jsx: true,
},
env: {
browser: true,
node: true,
es6: true,
},
plugins: ['prettier', 'import'],
extends: [
'eslint:recommended',
'plugin:import/recommended',
'plugin:react/recommended',
],
settings: {
react: {
version: '16.4.1', // React version. "detect" automatically picks the version you have installed.
},
'import/ignore': ['node_modules', '.json$'],
},
rules: {
'prettier/prettier': ['error'],
camelcase: ['error'],
curly: ['error', 'all'],
'dot-notation': ['error'],
eqeqeq: ['error'],
'handle-callback-err': ['error'],
'new-cap': ['error'],
'no-alert': ['error'],
'no-caller': ['error'],
'no-eval': ['error'],
'no-labels': ['error'],
'no-lonely-if': ['error'],
'no-new': ['error'],
'no-proto': ['error'],
'no-return-assign': ['error'],
'no-self-compare': ['error'],
'no-shadow': ['error'],
'no-shadow-restricted-names': ['error'],
'no-useless-call': ['error'],
'no-var': ['error'],
'no-void': ['error'],
'no-warning-comments': ['error'],
'no-with': ['error'],
radix: ['error'],
'spaced-comment': ['error', 'always'],
strict: ['error', 'global'],
yoda: ['error', 'never'],

// Import rules
// Search way how integrate with `lerna`
'import/no-unresolved': 'off',
'import/imports-first': ['error'],
'import/newline-after-import': ['error'],
'import/no-duplicates': ['error'],
'import/no-mutable-exports': ['error'],
'import/no-named-as-default': ['error'],
'import/no-named-as-default-member': ['error'],
'import/order': ['error'],
'import/prefer-default-export': ['error'],

// React
// Need enable in future
'react/prop-types': ['off'],
'react/display-name': ['off'],
},
};
5 changes: 5 additions & 0 deletions .prettierrc.js
@@ -0,0 +1,5 @@
module.exports = {
singleQuote: true,
trailingComma: 'es5',
arrowParens: 'always',
};
40 changes: 20 additions & 20 deletions .remarkrc.js
@@ -1,28 +1,28 @@
const bookmarks = {
/* Packages */
'autoprefixer': 'https://github.com/postcss/autoprefixer',
'browserslist': 'https://github.com/ai/browserslist',
'css-size': 'https://npmjs.org/package/css-size',
/* Documentation/Online */
'node.js': 'https://nodejs.org',
'npm': 'https://npmjs.com',
'postcss': 'http://postcss.org',
/* Guides */
'guidePresets': '/guides/presets',
'guideGettingStarted': '/guides/getting-started',
'guideAdvancedTransforms': '/guides/advanced-transforms',
'guideContributing': '/guides/contributing',
/* Packages */
autoprefixer: 'https://github.com/postcss/autoprefixer',
browserslist: 'https://github.com/ai/browserslist',
'css-size': 'https://npmjs.org/package/css-size',
/* Documentation/Online */
'node.js': 'https://nodejs.org',
npm: 'https://npmjs.com',
postcss: 'http://postcss.org',
/* Guides */
guidePresets: '/guides/presets',
guideGettingStarted: '/guides/getting-started',
guideAdvancedTransforms: '/guides/advanced-transforms',
guideContributing: '/guides/contributing',
};

exports.settings = {
bullet: '-',
fences: true,
listItemIndent: '1',
paddedTable: false,
bullet: '-',
fences: true,
listItemIndent: '1',
paddedTable: false,
};

exports.plugins = [
[require('remark-heading-gap'), {}],
[require('remark-bookmarks'), {bookmarks}],
[require('remark-frontmatter')]
[require('remark-heading-gap'), {}],
[require('remark-bookmarks'), { bookmarks }],
[require('remark-frontmatter')],
];
8 changes: 3 additions & 5 deletions README.md
Expand Up @@ -10,7 +10,7 @@
[![NPM version](https://img.shields.io/npm/v/cssnano.svg)](https://www.npmjs.org/package/cssnano)
[![Build Status](https://travis-ci.org/cssnano/cssnano.svg?branch=master)](https://travis-ci.org/cssnano/cssnano)
[![Build status](https://ci.appveyor.com/api/projects/status/t1chyvhobtju7jy8/branch/master?svg=true)](https://ci.appveyor.com/project/cssnano/cssnano/branch/master)
[![Build status](https://ci.appveyor.com/api/projects/status/t1chyvhobtju7jy8/branch/master?svg=true)](https://ci.appveyor.com/project/cssnano/cssnano/branch/master)
[![Coverage Status](https://coveralls.io/repos/github/cssnano/cssnano/badge.svg?branch=master)](https://coveralls.io/github/cssnano/cssnano?branch=master)
[![Gitter](https://img.shields.io/badge/Gitter-Join_the_PostCSS_chat-brightgreen.svg)](https://gitter.im/postcss/postcss)

Expand All @@ -32,17 +32,15 @@ to provide different output depending on the browsers that you support.

For further details check out the [website](http://cssnano.co/):

* [Installation guide for your build process](http://cssnano.co/guides/getting-started).
* [Full list of optimisations](http://cssnano.co/optimisations/).
- [Installation guide for your build process](http://cssnano.co/guides/getting-started).
- [Full list of optimisations](http://cssnano.co/optimisations/).

You can now [try cssnano online](https://cssnano.co/playground/)!


## Contributing

See [CONTRIBUTING.md](CONTRIBUTING.md).


## License

MIT © [Ben Briggs](http://beneb.info)
8 changes: 2 additions & 6 deletions lerna.json
Expand Up @@ -3,13 +3,9 @@
"npmClient": "yarn",
"command": {
"publish": {
"ignoreChanges": [
"package-lock.json"
]
"ignoreChanges": ["package-lock.json"]
}
},
"packages": [
"packages/*"
],
"packages": ["packages/*"],
"version": "independent"
}
32 changes: 13 additions & 19 deletions package.json
Expand Up @@ -3,18 +3,18 @@
"private": true,
"scripts": {
"all-contributors": "all-contributors add",
"lint": "eslint --ignore-path .gitignore packages/**/src util",
"fixlint": "eslint --fix --ignore-path .gitignore packages/**/src util",
"lint": "eslint . --cache --ignore-path .gitignore",
"fixlint": "yarn lint -- --fix",
"postinstall": "lerna bootstrap",
"build:packages": "babel-node ./util/buildPackages.js",
"build:aliases": "babel-node ./util/buildAliases.js",
"build:metadata": "babel-node ./util/buildMetadata.js",
"build:site": "remark site/content/**/*.md -o && npm run build:metadata && babel-node ./util/buildSiteMarkdown.js && cd site && npm run build",
"build:integration": "babel-node ./util/buildFrameworks.js",
"pretest": "npm run lint",
"build:site": "remark site/content/**/*.md -o && yarn build:metadata && babel-node ./util/buildSiteMarkdown.js && cd site && yarn build",
"build:integration": "cross-env BABEL_ENV=test babel-node ./util/buildFrameworks.js",
"pretest": "yarn lint",
"test-only": "cross-env BABEL_ENV=test ava",
"test-only:coverage": "nyc --reporter=lcov --reporter=text npm run test-only",
"test": "npm run test-only",
"test-only:coverage": "nyc --reporter=lcov --reporter=text yarn test-only",
"test": "yarn test-only",
"deploy": "gh-pages -t -d site/dist",
"publish": "lerna publish"
},
Expand All @@ -24,6 +24,7 @@
"devDependencies": {
"all-contributors-cli": "^5.0.0",
"ava": "^0.25.0",
"babel-eslint": "^10.0.1",
"babel-cli": "^6.0.0",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-plugin-module-resolver": "^2.5.0",
Expand All @@ -34,10 +35,10 @@
"coveralls": "^3.0.1",
"cross-env": "^5.1.6",
"dox": "^0.9.0",
"eslint": "^3.0.0",
"eslint-config-cssnano": "^3.0.0",
"eslint-plugin-babel": "^3.3.0",
"eslint-plugin-import": "^2.0.0",
"eslint": "^5.16.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-react": "^7.12.4",
"eslint-plugin-prettier": "^3.0.1",
"fs-extra": "^6.0.1",
"get-pkg-repo": "^2.0.0",
"gh-pages": "^1.2.0",
Expand All @@ -46,6 +47,7 @@
"mdast-util-heading-range": "^2.0.1",
"nyc": "^12.0.2",
"postcss": "^7.0.0",
"prettier": "^1.17.0",
"remark": "^9.0.0",
"remark-behead": "^2.0.1",
"remark-bookmarks": "^1.0.0",
Expand Down Expand Up @@ -198,14 +200,6 @@
]
]
},
"eslintConfig": {
"extends": "cssnano",
"rules": {
"import/no-unresolved": [
0
]
}
},
"browserslist": {
"chrome58": [
"Chrome 58"
Expand Down
3 changes: 1 addition & 2 deletions packages/css-size/css-size.d.ts
@@ -1,6 +1,5 @@
export = cssSize;


declare function cssSize(
css: string,
options: cssSize.ProcessOptions,
Expand Down Expand Up @@ -46,4 +45,4 @@ declare namespace cssSize {
gzip: SizeInfo<T>;
brotli: SizeInfo<T>;
}
}
}
3 changes: 2 additions & 1 deletion packages/css-size/index.js
@@ -1,4 +1,5 @@
var cssSize = require("./dist/index.js");
const cssSize = require('./dist/index.js');

module.exports = cssSize.default;
module.exports.table = cssSize.table;
module.exports.numeric = cssSize.numeric;
6 changes: 3 additions & 3 deletions packages/css-size/processors/nano.js
@@ -1,5 +1,5 @@
let nano = require("cssnano");
let nano = require('cssnano');

module.exports = function (css, opts) {
return nano.process(css, opts);
module.exports = function(css, opts) {
return nano.process(css, opts);
};
4 changes: 2 additions & 2 deletions packages/css-size/processors/noop.js
@@ -1,3 +1,3 @@
module.exports = function (css) {
return Promise.resolve({css: css});
module.exports = function(css) {
return Promise.resolve({ css: css });
};

0 comments on commit cb53260

Please sign in to comment.