Skip to content
This repository was archived by the owner on May 17, 2019. It is now read-only.

Commit 924d87e

Browse files
rtsaofusion-bot[bot]
authored andcommitted
Add AtomicPrefixToken
#180 Co-authored-by: Ryan Tsao <ryan.j.tsao@gmail.com>
1 parent ca10cc0 commit 924d87e

24 files changed

+4232
-2302
lines changed

.babelrc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
presets: [require.resolve('@babel/preset-react')],
3+
};

.buildkite/browserTests

Lines changed: 0 additions & 6 deletions
This file was deleted.

.buildkite/nodeTests

Lines changed: 0 additions & 3 deletions
This file was deleted.

.buildkite/pipeline.yml

Lines changed: 1 addition & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,6 @@ steps:
66
image-repository: 027047743804.dkr.ecr.us-east-2.amazonaws.com/uber
77
agents:
88
queue: builders
9-
- name: ':docker: :package: node8'
10-
plugins:
11-
'docker-compose#v1.7.0':
12-
build: fusion-plugin-styletron-react-node-last
13-
image-repository: 027047743804.dkr.ecr.us-east-2.amazonaws.com/uber
14-
agents:
15-
queue: builders
169
- wait
1710
- command: yarn flow
1811
name: ':flowtype:'
@@ -21,52 +14,17 @@ steps:
2114
run: fusion-plugin-styletron-react
2215
agents:
2316
queue: workers
24-
- command: yarn flow
25-
name: ':flowtype: node8'
26-
plugins:
27-
'docker-compose#v1.7.0':
28-
run: fusion-plugin-styletron-react-node-last
29-
agents:
30-
queue: workers
3117
- name: ':eslint:'
3218
command: yarn lint
3319
plugins:
3420
'docker-compose#v1.7.0':
3521
run: fusion-plugin-styletron-react
3622
agents:
3723
queue: workers
38-
- name: ':eslint: node8'
39-
command: yarn lint
40-
plugins:
41-
'docker-compose#v1.7.0':
42-
run: fusion-plugin-styletron-react-node-last
43-
agents:
44-
queue: workers
45-
- name: ':chrome: :white_check_mark:'
46-
command: .buildkite/browserTests
47-
plugins:
48-
'docker-compose#v1.7.0':
49-
run: fusion-plugin-styletron-react
50-
agents:
51-
queue: workers
52-
- name: ':chrome: :white_check_mark: node8'
53-
command: .buildkite/browserTests
54-
plugins:
55-
'docker-compose#v1.7.0':
56-
run: fusion-plugin-styletron-react-node-last
57-
agents:
58-
queue: workers
5924
- name: ':node: :white_check_mark:'
60-
command: .buildkite/nodeTests
25+
command: yarn test
6126
plugins:
6227
'docker-compose#v1.7.0':
6328
run: fusion-plugin-styletron-react
6429
agents:
6530
queue: workers
66-
- name: ':node: :white_check_mark: node8'
67-
command: .buildkite/nodeTests
68-
plugins:
69-
'docker-compose#v1.7.0':
70-
run: fusion-plugin-styletron-react-node-last
71-
agents:
72-
queue: workers

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
node_modules/
2-
dist/
3-
dist-tests/
2+
dist-browser-esm/
3+
dist-node-cjs/
4+
dist-node-esm/
45
coverage/
56
.nyc_output/
7+
test/*/.fusion
68

79
.DS_Store
810
npm-debug.log

Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
ARG BASE_IMAGE=uber/web-base-image:2.0.0
1+
ARG BASE_IMAGE=uber/web-base-image:10.15.3
22
FROM $BASE_IMAGE
33

44
WORKDIR /fusion-plugin-styletron-react
55

66
COPY . .
77

88
RUN yarn
9-
10-
RUN yarn build-test

README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ export default () => {
3232
}
3333
```
3434

35+
### Atomic class prefix
36+
37+
By default, it is assumed there is no global CSS that will result in collisions with the generated atomic class names. If this is not the case, collisions can be avoided by adding a prefix to the generated atomic class names via `AtomicPrefixToken`.
38+
39+
```js
40+
import Styletron, {AtomicPrefixToken} from 'fusion-plugin-styletron-react';
41+
42+
app.register(Styletron);
43+
app.register(AtomicPrefixToken, "_");
44+
```
45+
3546
### Creating styled components
3647
For API details and usage examples, see [the official `styletron-react` documentation](https://github.com/rtsao/styletron/tree/master/packages/styletron-react)
3748

docker-compose.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
version: '2'
1+
version: "2"
22
services:
33
fusion-plugin-styletron-react:
44
build: .
55
volumes:
6-
- '.:/fusion-plugin-styletron-react'
6+
- ".:/fusion-plugin-styletron-react"
77
- /fusion-plugin-styletron-react/node_modules/
8-
- /fusion-plugin-styletron-react/dist/
9-
- /fusion-plugin-styletron-react/dist-tests/
8+
- /fusion-plugin-styletron-react/dist-browser-esm/
9+
- /fusion-plugin-styletron-react/dist-node-cjs/
10+
- /fusion-plugin-styletron-react/dist-node-esm/
1011
environment:
1112
- CODECOV_TOKEN
1213
- CI=true
@@ -17,9 +18,3 @@ services:
1718
- BUILDKITE_BUILD_URL
1819
- BUILDKITE_PROJECT_SLUG
1920
- BUILDKITE_COMMIT
20-
fusion-plugin-styletron-react-node-last:
21-
extends: fusion-plugin-styletron-react
22-
build:
23-
context: .
24-
args:
25-
BASE_IMAGE: 'uber/web-base-image:1.0.9'

package.json

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,36 @@
22
"name": "fusion-plugin-styletron-react",
33
"version": "2.5.4",
44
"description": "The Fusion plugin for Styletron, which, in addition to providing a easy-to-use styled-component-like interface, provides powerful server-side CSS optimizations, yielding less CSS code down the wire.",
5-
"license": "MIT",
65
"repository": "fusionjs/fusion-plugin-styletron-react",
76
"files": [
8-
"dist",
7+
"dist-browser-esm",
8+
"dist-node-cjs",
9+
"dist-node-esm",
910
"src"
1011
],
11-
"main": "./dist/index.js",
12-
"module": "./dist/index.es.js",
13-
"browser": {
14-
"./dist/index.js": "./dist/browser.es5.js",
15-
"./dist/index.es.js": "./dist/browser.es5.es.js"
16-
},
17-
"es2015": {
18-
"./dist/browser.es5.es.js": "./dist/browser.es2015.es.js"
19-
},
20-
"es2017": {
21-
"./dist/browser.es5.es.js": "./dist/browser.es2017.es.js",
22-
"./dist/browser.es2015.es.js": "./dist/browser.es2017.es.js"
12+
"main": "./dist-node-cjs/index.js",
13+
"module": "./dist-node-esm/index.js",
14+
"browser": "./dist-browser-esm/index.js",
15+
"scripts": {
16+
"clean": "rm -rf dist",
17+
"lint": "eslint . --ignore-path .gitignore",
18+
"transpile": "npm run clean && cup build",
19+
"test": "jest",
20+
"prepublish": "npm run transpile"
2321
},
2422
"dependencies": {
2523
"css-to-js-sourcemap-worker": "^2.0.4",
2624
"styletron-engine-atomic": "^1.0.13"
2725
},
26+
"peerDependencies": {
27+
"fusion-core": "^1.10.1",
28+
"react": "14.x - 16.x",
29+
"styletron-react": "^4.3.0"
30+
},
2831
"devDependencies": {
2932
"@babel/preset-react": "7.0.0",
3033
"babel-eslint": "10.0.1",
31-
"create-universal-package": "3.4.6",
32-
"enzyme": "3.8.0",
33-
"enzyme-adapter-react-16": "1.9.1",
34+
"create-universal-package": "^4.0.0",
3435
"eslint": "5.13.0",
3536
"eslint-config-fusion": "^4.0.0",
3637
"eslint-plugin-cup": "2.0.1",
@@ -40,30 +41,19 @@
4041
"eslint-plugin-prettier": "3.0.1",
4142
"eslint-plugin-react": "7.11.1",
4243
"flow-bin": "^0.87.0",
44+
"fusion-cli": "^1.17.0",
4345
"fusion-core": "1.10.1",
44-
"nyc": "13.1.0",
46+
"fusion-react": "^2.0.0",
47+
"get-port": "^4.2.0",
48+
"jest": "^24.1.0",
4549
"prettier": "1.15.2",
46-
"react": "16.6.3",
47-
"react-dom": "16.6.3",
48-
"styletron-react": "^4.3.6",
49-
"tape-cup": "4.7.1",
50-
"unitest": "2.1.1"
51-
},
52-
"peerDependencies": {
53-
"fusion-core": "^1.10.1",
54-
"react": "14.x - 16.x",
55-
"styletron-react": "^4.3.0"
56-
},
57-
"scripts": {
58-
"clean": "rm -rf dist",
59-
"lint": "eslint . --ignore-path .gitignore",
60-
"transpile": "npm run clean && cup build",
61-
"build-test": "rm -rf dist-tests && cup build-tests",
62-
"just-test": "node_modules/.bin/unitest --browser=dist-tests/browser.js && node dist-tests/node.js",
63-
"test": "npm run build-test && npm run just-test",
64-
"prepublish": "npm run transpile"
50+
"puppeteer": "^1.13.0",
51+
"react": "^16.8.4",
52+
"react-dom": "^16.8.4",
53+
"styletron-react": "^4.4.5"
6554
},
6655
"engines": {
6756
"node": ">= 8.9.0"
68-
}
57+
},
58+
"license": "MIT"
6959
}

src/__tests__/index.browser.js

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)