Skip to content
This repository was archived by the owner on Jun 20, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ _Before_ submitting a pull request, please make sure the following is done…

```sh
# build packages continuously:
yarn run build:watch
yarn dev
# in website folder have to run:
yarn && yarn run dev
yarn && yarn dev
# each time you want to update the documentation to reflect your change, use:
yarn update-website
```
Expand Down
18 changes: 16 additions & 2 deletions config/rollup.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,14 @@ export const getRollupConfig = ({ pwd, buildName, name }) => {
plugins: [
babel(getBabelOptions({ useESModules: false })),
nodeResolve(),
commonjs(),
commonjs({
namedExports: {
'../../node_modules/body-scroll-lock/lib/bodyScrollLock.min.js': [
'disableBodyScroll',
'enableBodyScroll',
],
},
}),
replace({ 'process.env.NODE_ENV': JSON.stringify('development') }),
],
}
Expand All @@ -64,7 +71,14 @@ export const getRollupConfig = ({ pwd, buildName, name }) => {
plugins: [
babel(getBabelOptions({ useESModules: true })),
nodeResolve(),
commonjs(),
commonjs({
namedExports: {
'../../node_modules/body-scroll-lock/lib/bodyScrollLock.min.js': [
'disableBodyScroll',
'enableBodyScroll',
],
},
}),
replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
terser(),
],
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
"packages/*"
],
"version": "11.0.2",
"version": "11.0.3-alpha.2",
"npmClient": "yarn",
"useWorkspaces": true
}
35 changes: 17 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@
],
"scripts": {
"build": "lerna run build",
"build:docs": "yarn build && docz build && cp _redirects .docz/dist",
"build:watch": "WATCH_MODE=true lerna run --parallel build -- --watch",
"dev": "WATCH_MODE=true lerna run --parallel build -- --watch",
"update-website": "cp -r ./packages/core-sc/dist ./website/node_modules/smooth-ui-sc-next && cp -r ./packages/core-em/dist ./website/node_modules/smooth-ui-em-next",
"ci": "yarn lint && yarn test && yarn build && bundlesize && yarn tsc:check || true",
"dev": "docz dev",
"format": "prettier --write \"**/*.{js,json,md,mdx}\"",
"lint": "eslint .",
"release": "lerna publish --conventional-commits --force-publish=* && conventional-github-releaser --preset angular",
"prerelease": "lerna publish prerelease --force-publish=* && conventional-github-releaser --preset angular",
"test": "jest"
},
"bundlesize": [
Expand All @@ -26,32 +25,32 @@
}
],
"devDependencies": {
"@babel/cli": "^7.5.5",
"@babel/core": "^7.5.5",
"@babel/cli": "^7.6.0",
"@babel/core": "^7.6.0",
"@babel/plugin-external-helpers": "^7.2.0",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-transform-modules-commonjs": "^7.5.0",
"@babel/plugin-transform-runtime": "^7.5.5",
"@babel/preset-env": "^7.5.5",
"@babel/plugin-transform-modules-commonjs": "^7.6.0",
"@babel/plugin-transform-runtime": "^7.6.0",
"@babel/preset-env": "^7.6.0",
"@babel/preset-react": "^7.0.0",
"@emotion/core": "^10.0.16",
"@emotion/styled": "^10.0.15",
"@emotion/core": "^10.0.17",
"@emotion/styled": "^10.0.17",
"@xstyled/emotion": "^1.11.0",
"@xstyled/styled-components": "^1.11.0",
"@xstyled/system": "^1.11.0",
"babel-eslint": "^10.0.2",
"babel-jest": "^24.8.0",
"babel-plugin-annotate-pure-calls": "^0.4.0",
"babel-plugin-emotion": "^10.0.15",
"babel-plugin-emotion": "^10.0.19",
"babel-plugin-styled-components": "^1.10.6",
"babel-plugin-transform-rename-import": "^2.3.0",
"bundlesize": "^0.18.0",
"conventional-github-releaser": "^3.1.3",
"cross-env": "^5.2.0",
"emotion-theming": "^10.0.14",
"eslint": "^6.1.0",
"cross-env": "^6.0.0",
"emotion-theming": "^10.0.19",
"eslint": "^6.4.0",
"eslint-config-airbnb": "^18.0.1",
"eslint-config-prettier": "^6.0.0",
"eslint-config-prettier": "^6.3.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jsx-a11y": "^6.2.3",
"eslint-plugin-react": "^7.14.3",
Expand All @@ -60,14 +59,14 @@
"lerna": "^3.16.4",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"reakit": "^1.0.0-beta.4",
"rollup": "^1.20.3",
"reakit": "^1.0.0-beta.7",
"rollup": "^1.21.4",
"rollup-plugin-babel": "^4.3.3",
"rollup-plugin-commonjs": "^10.0.2",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-size-snapshot": "^0.10.0",
"rollup-plugin-terser": "^5.1.1",
"rollup-plugin-terser": "^5.1.2",
"shx": "^0.3.2",
"styled-components": "^4.3.2"
}
Expand Down
7 changes: 4 additions & 3 deletions packages/core-em/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@smooth-ui/core-em",
"description": "Modern React UI Library",
"version": "11.0.2",
"version": "11.0.3-alpha.2",
"keywords": [
"emotion",
"ui",
Expand All @@ -24,13 +24,14 @@
"access": "public"
},
"dependencies": {
"@babel/runtime": "^7.5.5",
"@babel/runtime": "^7.6.0",
"@xstyled/emotion": "^1.11.0",
"@xstyled/util": "^1.11.0",
"polished": "^3.4.1",
"prop-desc": "^1.0.0",
"prop-types": "^15.7.2",
"react-flatten-children": "^1.0.0"
"react-flatten-children": "^1.0.0",
"react-merge-refs": "^1.0.0"
},
"peerDependencies": {
"@emotion/core": "^10.0.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/core-sc/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@smooth-ui/core-sc",
"description": "Modern React UI Library",
"version": "11.0.2",
"version": "11.0.3-alpha.2",
"keywords": [
"styled-components",
"ui",
Expand All @@ -24,13 +24,14 @@
"access": "public"
},
"dependencies": {
"@babel/runtime": "^7.5.5",
"@babel/runtime": "^7.6.0",
"@xstyled/styled-components": "^1.11.0",
"@xstyled/util": "^1.11.0",
"polished": "^3.4.1",
"prop-desc": "^1.0.0",
"prop-types": "^15.7.2",
"react-flatten-children": "^1.0.0"
"react-flatten-children": "^1.0.0",
"react-merge-refs": "^1.0.0"
},
"peerDependencies": {
"react": ">=16.8.0",
Expand Down
5 changes: 5 additions & 0 deletions packages/shared/core/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ export const Button = createComponent({
/* When used as link */
text-decoration: none;

&[type='button'] {
appearance: none;
}

&:disabled {
opacity: 0.8;
}
Expand All @@ -67,6 +71,7 @@ export const Button = createComponent({

&:not(:disabled):hover,
&:not(:disabled):active {
color: ${colorYik(baseColor)(p)};
background-color: ${darken(0.05, baseColor)};
}
`(p)}
Expand Down
Loading