Skip to content
This repository has been archived by the owner on Aug 16, 2023. It is now read-only.

Commit

Permalink
feat: update dependencies
Browse files Browse the repository at this point in the history
affects: @stylegator/app, @stylegator/cli, @stylegator/core, @stylegator/docs, stylegator
  • Loading branch information
farism committed Dec 4, 2019
1 parent 07c0d69 commit e36bc52
Show file tree
Hide file tree
Showing 15 changed files with 6,576 additions and 3,147 deletions.
58 changes: 2 additions & 56 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,61 +1,7 @@
{
"lerna": "2.7.1",
"version": "0.19.0",
"npmClient": "yarn",
"parallel": true,
"message": "[ci skip] publish %s",
"useWorkspaces": true,
"changelog": {
"repo": "farism/stylegator",
"ignoreCommitters": [
"renovate"
],
"labels": {
"Tag: Breaking Change": ":boom: Breaking Change",
"Tag: Bug Fix": ":bug: Bug Fix",
"Tag: Dependencies": ":books: Dependencies",
"Tag: Enhancement": ":nail_care: Enhancement",
"Tag: New Feature": ":rocket: New Feature",
"Tag: Internal": ":house: Internal"
},
"cacheDir": ".changelog"
},
"deploys": {
"repo": "farism/stylegator",
"semver": {
"major": [
":boom: Breaking Change"
],
"minor": [
":nail_care: Enhancement",
":rocket: New Feature"
],
"patch": [
":bug: Bug Fix",
":house: Internal",
":books: Dependencies"
]
},
"gitflow": {
"master": "master",
"develop": "develop"
},
"types": {
"stable": {
"tag": "latest",
"publish": {
"stable": true,
"npm": true,
"git": true
}
},
"next": {
"preid": "rc",
"tag": "next",
"publish": {
"npm": true
}
}
}
}
"message": "chore: publish %s [ci skip]",
"useWorkspaces": true
}
45 changes: 36 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{
"private": true,
"devDependencies": {
"execa-pro": "1.0.8",
"husky": "1.1.0",
"lerna": "2.11.0",
"lerna-git-flow-deploy": "0.5.3"
},
"workspaces": [
"packages/*"
],
"scripts": {
"build": "lerna run --no-parallel build",
"dev": "lerna run dev",
Expand All @@ -16,7 +13,37 @@
"pretty": "lerna run pretty",
"test": "lerna run test"
},
"workspaces": [
"packages/*"
]
"husky": {
"hooks": {
"commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
"pre-commit": "lerna run lint-staged",
"prepare-commit-msg": "node scripts/prepare-commit-msg.js"
}
},
"commitlint": {
"extends": [
"@commitlint/config-conventional",
"@commitlint/config-lerna-scopes"
]
},
"config": {
"commitizen": {
"path": "./node_modules/cz-lerna-changelog"
}
},
"devDependencies": {
"@commitlint/cli": "8.2.0",
"@commitlint/config-conventional": "8.2.0",
"@commitlint/config-lerna-scopes": "8.2.0",
"@octokit/rest": "16.35.0",
"commitizen": "4.0.3",
"conventional-changelog-cli": "2.0.27",
"conventional-recommended-bump": "6.0.4",
"cz-conventional-changelog": "3.0.2",
"cz-lerna-changelog": "2.0.2",
"execa": "3.4.0",
"fs-extra": "8.1.0",
"husky": "3.1.0",
"lerna": "3.19.0"
}
}
38 changes: 21 additions & 17 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,32 @@
"pretty": "prettier --write --no-semi --single-quote --trailing-comma es5",
"test": "jest"
},
"peerDependencies": {
"react": "16.12.0",
"react-dom": "16.12.0"
},
"dependencies": {
"fuzzy": "0.1.3",
"highlight.js": "9.12.0",
"highlight.js": "9.16.2",
"marked": "0.5.1",
"ramda": "0.25.0",
"react": "16.5.2",
"react-dom": "16.5.2",
"react-live": "1.11.0",
"react-router-dom": "4.3.1",
"ramda": "0.26.1",
"react-live": "2.2.2",
"react-router-dom": "5.1.2",
"recompose": "0.30.0",
"slugify": "1.3.1"
"slugify": "1.3.6"
},
"devDependencies": {
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/plugin-syntax-dynamic-import": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/preset-react": "7.0.0",
"husky": "1.1.0",
"lint-staged": "7.3.0",
"prettier": "1.14.3",
"rimraf": "2.6.2"
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.4",
"@babel/plugin-syntax-dynamic-import": "7.7.4",
"@babel/preset-env": "7.7.4",
"@babel/preset-react": "7.7.4",
"husky": "3.1.0",
"lint-staged": "9.5.0",
"prettier": "1.19.1",
"react": "16.12.0",
"react-dom": "16.12.0",
"rimraf": "3.0.0"
}
}
13 changes: 9 additions & 4 deletions packages/app/src/partials/LiveMarkdown/liveMarkdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,17 @@
}

.live-markdown-editor {
background: #1d1f21;
color: white;
font-size: 16px;
position: relative;

:global {
.prism-code {
padding: 15px;
overflow-x: auto;
> div {
overflow-x: auto !important;

> textarea,
> pre {
padding: 15px !important;
}
}
}
Expand Down
13 changes: 8 additions & 5 deletions packages/app/src/partials/StaticMarkdown/StaticMarkdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ marked.setOptions({
highlight: code => highlight.highlightAuto(code).value,
})

const StaticMarkdown = ({ content }) => (
<article className="markdown-body">
<div dangerouslySetInnerHTML={{ __html: marked(content) }} />
</article>
)
const StaticMarkdown = ({ content }) => {
console.log(content)
return (
<article className="markdown-body">
<div dangerouslySetInnerHTML={{ __html: marked(content) }} />
</article>
)
}

StaticMarkdown.propTypes = {
content: PropTypes.string,
Expand Down
22 changes: 12 additions & 10 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@
"test": "jest"
},
"dependencies": {
"@stylegator/core": "^0.19.0",
"find-up": "3.0.0",
"yargs": "12.0.2"
"@stylegator/core": "0.19.0",
"conventional-changelog-cli": "2.0.28",
"conventional-recommended-bump": "6.0.5",
"find-up": "4.1.0",
"yargs": "15.0.2"
},
"devDependencies": {
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/preset-env": "7.1.0",
"husky": "1.1.0",
"lint-staged": "7.3.0",
"prettier": "1.14.3",
"rimraf": "2.6.2"
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/preset-env": "7.7.4",
"husky": "3.1.0",
"lint-staged": "9.5.0",
"prettier": "1.19.1",
"rimraf": "3.0.0"
}
}
58 changes: 30 additions & 28 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,39 @@
"test": "jest"
},
"dependencies": {
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/plugin-syntax-dynamic-import": "7.0.0",
"@babel/polyfill": "7.0.0",
"@babel/preset-env": "7.1.0",
"@babel/preset-react": "7.0.0",
"babel-loader": "8.0.4",
"copy-webpack-plugin": "4.5.2",
"css-loader": "1.0.0",
"file-loader": "2.0.0",
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.4",
"@babel/plugin-syntax-dynamic-import": "7.7.4",
"@babel/polyfill": "7.7.0",
"@babel/preset-env": "7.7.4",
"@babel/preset-react": "7.7.4",
"babel-loader": "8.0.6",
"copy-webpack-plugin": "5.0.5",
"css-loader": "3.2.1",
"file-loader": "5.0.2",
"html-webpack-plugin": "3.2.0",
"node-sass": "4.9.3",
"raw-loader": "0.5.1",
"resolve-url-loader": "3.0.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.0",
"url-loader": "1.1.1",
"webpack": "4.20.2",
"webpack-dev-server": "3.1.9",
"webpack-merge": "4.1.4",
"webpack-sources": "1.3.0",
"node-sass": "4.13.0",
"raw-loader": "4.0.0",
"resolve-url-loader": "3.1.1",
"sass-loader": "8.0.0",
"style-loader": "1.0.1",
"url-loader": "3.0.0",
"webpack": "4.41.2",
"webpack-dev-server": "3.9.0",
"webpack-merge": "4.2.2",
"webpack-sources": "1.4.3",
"webpack-stylish": "0.1.8"
},
"devDependencies": {
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/preset-env": "7.1.0",
"husky": "1.1.0",
"lint-staged": "7.3.0",
"prettier": "1.14.3",
"rimraf": "2.6.2"
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/preset-env": "7.7.4",
"conventional-changelog-cli": "2.0.28",
"conventional-recommended-bump": "6.0.5",
"husky": "3.1.0",
"lint-staged": "9.5.0",
"prettier": "1.19.1",
"rimraf": "3.0.0"
}
}
5 changes: 3 additions & 2 deletions packages/core/src/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,9 @@ export default userConfig => {
{
loader: `css-loader`,
options: {
modules: true,
localIdentName: '[local]--[hash:base64:5]',
modules: {
localIdentName: '[local]--[hash:base64:5]',
},
},
},
'sass-loader',
Expand Down
10 changes: 5 additions & 5 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
"test": "jest"
},
"dependencies": {
"prop-types-docs": "0.3.0",
"prop-types-docs": "0.5.0",
"stylegator": "^0.19.0"
},
"devDependencies": {
"husky": "1.1.0",
"lint-staged": "7.3.0",
"prettier": "1.14.3",
"rimraf": "2.6.2"
"husky": "3.1.0",
"lint-staged": "9.5.0",
"prettier": "1.19.1",
"rimraf": "3.0.0"
}
}
8 changes: 4 additions & 4 deletions packages/docs/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ const sections = [
},
],
},
{
title: 'Appendix',
loader: pageLoader(() => import('./sections/__appendix.md')),
},
// {
// title: 'Appendix',
// loader: pageLoader(() => import('./sections/__appendix.md')),
// },
]

const components = { MyComponent }
Expand Down
1 change: 1 addition & 0 deletions packages/docs/src/sections/authoring-content.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ ReactDOM.render(
<Stylegator sections={sections} />,
document.getElementById('app')
)

```

## Interactive code samples
Expand Down
3 changes: 1 addition & 2 deletions packages/docs/src/sections/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ npm install -D stylegator
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<meta charset="UTF-8" />
<title><%= htmlWebpackPlugin.options.title %></title>
</head>
<body>
<div id="app" />
</body>
</html>

```

```js
Expand Down
10 changes: 5 additions & 5 deletions packages/stylegator/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
"@stylegator/core": "^0.19.0"
},
"devDependencies": {
"@babel/cli": "7.1.2",
"@babel/core": "7.1.2",
"@babel/plugin-proposal-object-rest-spread": "7.0.0",
"@babel/preset-env": "7.1.0",
"rimraf": "2.6.2"
"@babel/cli": "7.7.4",
"@babel/core": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.4",
"@babel/preset-env": "7.7.4",
"rimraf": "3.0.0"
}
}
Loading

0 comments on commit e36bc52

Please sign in to comment.