Skip to content

Commit cd7d866

Browse files
author
Henri Beck
committed
Merge remote-tracking branch 'origin/react-jss/update-theming' into react-jss/update-theming
* origin/react-jss/update-theming: use https on our site remove nag message from postinstall script (#914) [docs] Add Onepixel (#912) Add TS type defs (#889) Don't use undefined as a selector (#906) Ignore undefine, null, or empty value rules when generate style. (#905) Fixed cannot find top level reference issue inside @media query (#900) Improve scripts output (#904) # Conflicts: # packages/react-jss/.size-snapshot.json
2 parents 929e42a + fb92e0f commit cd7d866

File tree

61 files changed

+598
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+598
-205
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
flow-typed/
22
**/node_modules/**
33
packages/**/dist/
4+
*.ts

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ script:
1111
- yarn format:ci
1212
- yarn build
1313
- yarn lint
14+
- yarn ts-check
1415
- yarn typecheck
1516
- yarn test
1617
env:

changelog.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
- [react-jss] Added flow types ([#818](https://github.com/cssinjs/jss/pull/818))
99
- [jss] Fix sheet ordering when the last sheet was the last sibling in the head element ([#819](https://github.com/cssinjs/jss/pull/819))
1010
- [jss] Migrated to a monorepo structure ([#729](https://github.com/cssinjs/jss/pull/729))
11+
- [all] Added TypeScript definitions to all packages ([#889](https://github.com/cssinjs/jss/pull/889))
12+
- [jss-plugin-syntax-nested] Fixed referencing rules inside media queries ([#900](https://github.com/cssinjs/jss/pull/900))
13+
- [jss-plugin-syntax-global] TypeError: Cannot read property '@global' of undefined ([#905](https://github.com/cssinjs/jss/pull/905))
1114

1215
### Breaking changes
1316

docs/users.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
[Kijiji](https://www.kijiji.ca/)
66

7-
[Material UI](https://github.com/callemall/material-ui)
7+
[Material-UI](https://material-ui.com/)
88

9-
[Bootstrap JSS](https://sammi.github.io/bootstrap-jss)([source](https://github.com/sammi/bootstrap-jss))
9+
[Bootstrap JSS](https://sammi.github.io/bootstrap-jss) ([source](https://github.com/sammi/bootstrap-jss))
1010

1111
[React Styleguidist](https://github.com/styleguidist/react-styleguidist)
1212

@@ -33,3 +33,5 @@
3333
[Trioxis](https://www.trioxis.com/)
3434

3535
[Real World React](https://realworldreact.com) ([source](https://github.com/realworldreact/realworldreact-website))
36+
37+
[Onepixel](https://www.onepixel.com/)

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@
55
"packages/*"
66
],
77
"scripts": {
8-
"build": "lerna run prepare",
8+
"build": "lerna run build",
99
"prepublishOnly": "yarn check-snapshots && yarn build && yarn typecheck && yarn lint && yarn format:ci && yarn test",
1010
"publish": "lerna publish",
1111
"typecheck": "flow check --max-warnings=0",
12+
"ts-check": "tsc",
1213
"lint": "eslint scripts/ packages/ docs/ --ext js,md",
1314
"format": "prettier \"*.{js,md,json}\" \"{docs,packages,scripts}/**/*.{js,md,json}\" --write",
1415
"format:ci": "yarn format -- --list-different",
1516
"test": "cross-env NODE_ENV=test VERSION=\"1\" karma start --single-run",
1617
"test:watch": "cross-env NODE_ENV=test VERSION=\"1\" karma start",
17-
"check-snapshots": "lerna exec -- cross-env SNAPSHOT=match rollup --config ../../rollup.config.js",
18-
"posttest": "yarn check-snapshots && [ -z \"$TRAVIS\" ] || codecov",
18+
"check-snapshots": "lerna run check-snapshot",
19+
"posttest": "[ -z \"$TRAVIS\" ] || codecov",
1920
"codecov": "codecov",
2021
"bench": "cross-env BENCHMARK=true karma start --single-run",
21-
"pre-commit": "lint-staged && yarn typecheck"
22+
"pre-commit": "lint-staged && yarn typecheck && yarn ts-check"
2223
},
2324
"lint-staged": {
24-
"**/*.{js,md,json}": [
25+
"**/*.{js,md,json,ts}": [
2526
"prettier --write",
2627
"git add"
2728
],
@@ -31,7 +32,7 @@
3132
},
3233
"pre-commit": "pre-commit",
3334
"engines": {
34-
"node": ">=4"
35+
"node": ">=8"
3536
},
3637
"devDependencies": {
3738
"@babel/core": "^7.0.0",
@@ -69,8 +70,6 @@
6970
"eslint": "^5.7.0",
7071
"eslint-config-jss": "^5.0.1",
7172
"eslint-config-prettier": "^2.9.0",
72-
"eslint-plugin-flowtype": "^2.29.1",
73-
"eslint-plugin-markdown": "^1.0.0-beta.6",
7473
"expect.js": "^0.3.1",
7574
"flow-bin": "^0.83.0",
7675
"json-loader": "^0.5.4",
@@ -103,6 +102,7 @@
103102
"rollup-plugin-uglify": "^4.0.0",
104103
"shelljs": "^0.8.2",
105104
"sinon": "4.5.0",
105+
"typescript": "^3.1.3",
106106
"webpack": "^2.3.3",
107107
"zen-observable": "^0.6.0"
108108
}

packages/jss-plugin-cache/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"description": "JSS plugin that caches the rules and delivers insane performance.",
44
"version": "3.0.0",
55
"license": "MIT",
6-
"homepage": "http://cssinjs.org/jss-cache",
6+
"homepage": "https://cssinjs.org/jss-cache",
77
"main": "dist/jss-plugin-cache.cjs.js",
88
"module": "dist/jss-plugin-cache.esm.js",
9+
"typings": "./src/index.d.ts",
910
"author": {
1011
"name": "Oleg Slobodskoi",
1112
"email": "oleg008@gmail.com"
@@ -32,7 +33,8 @@
3233
"insane"
3334
],
3435
"scripts": {
35-
"prepare": "node ../../scripts/prepare.js"
36+
"build": "node ../../scripts/build.js",
37+
"check-snapshot": "node ../../scripts/match-snapshot.js"
3638
},
3739
"devDependencies": {
3840
"jss": "^9.0.0"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// @flow
2+
3+
import {Plugin} from 'jss'
4+
5+
export default function jssPluginCache(): Plugin

packages/jss-plugin-isolate/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"description": "True rules isolation through automatic properties reset.",
44
"version": "5.1.0",
55
"license": "MIT",
6+
"homepage": "https://cssinjs.org/jss-isolate",
67
"main": "dist/jss-plugin-isolate.cjs.js",
78
"module": "dist/jss-plugin-isolate.esm.js",
8-
"homepage": "http://cssinjs.org/jss-isolate",
9+
"typings": "./src/index.d.ts",
910
"author": {
1011
"name": "Maksim Koretskiy",
1112
"email": "mr.green.tv@gmail.com"
@@ -32,7 +33,8 @@
3233
"reset"
3334
],
3435
"scripts": {
35-
"prepare": "node ../../scripts/prepare.js"
36+
"build": "node ../../scripts/build.js",
37+
"check-snapshot": "node ../../scripts/match-snapshot.js"
3638
},
3739
"devDependencies": {
3840
"jss": "^9.0.0",
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import {Plugin} from 'jss'
2+
3+
type Options = {
4+
isolate?: boolean | string
5+
reset?: 'all' | 'inherited' | object | ['all' | 'inherited', object]
6+
}
7+
8+
export default function jssPluginIsolate(options?: Options): Plugin

packages/jss-plugin-props-sort/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
"description": "JSS plugin that ensures style properties extend each other instead of override",
44
"version": "6.0.0",
55
"license": "MIT",
6+
"homepage": "https://cssinjs.org/jss-props-sort",
67
"main": "dist/jss-plugin-props-sort.cjs.js",
78
"module": "dist/jss-plugin-props-sort.esm.js",
8-
"homepage": "http://cssinjs.org/jss-props-sort",
9+
"typings": "./src/index.d.ts",
910
"author": {
1011
"name": "Oleg Slobodskoi",
1112
"email": "oleg008@gmail.com"
@@ -32,7 +33,8 @@
3233
"props"
3334
],
3435
"scripts": {
35-
"prepare": "node ../../scripts/prepare.js"
36+
"build": "node ../../scripts/build.js",
37+
"check-snapshot": "node ../../scripts/match-snapshot.js"
3638
},
3739
"devDependencies": {
3840
"jss": "^9.0.0"

0 commit comments

Comments
 (0)