Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 5bdca48

Browse files
adbaybrenatobenks
andauthored
fix(docz): dependency issues (#1647)
Co-authored-by: Renato Benkendorf <[email protected]>
1 parent 35dc842 commit 5bdca48

File tree

21 files changed

+1248
-14367
lines changed

21 files changed

+1248
-14367
lines changed

core/docz-core/package.json

+8-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "docz-core",
3-
"version": "2.3.2-alpha.1",
3+
"version": "2.3.2-alpha.0",
44
"description": "All docz core logic of bundle and parsing is included on this package",
55
"license": "MIT",
66
"main": "dist/index.js",
@@ -20,6 +20,9 @@
2020
"prepare": "yarn build",
2121
"test": "yarn jest"
2222
},
23+
"peerDependencies": {
24+
"typescript": "^3.5.0 || ^4.0.0"
25+
},
2326
"dependencies": {
2427
"@sindresorhus/slugify": "^0.9.1",
2528
"chalk": "^2.4.2",
@@ -32,9 +35,10 @@
3235
"fast-glob": "^3.0.4",
3336
"find-up": "^4.1.0",
3437
"fs-extra": "^8.1.0",
35-
"get-pkg-repo": "^4.1.0",
38+
"gatsby-plugin-eslint": "^2.0.5",
39+
"gatsby-plugin-typescript": "^2.1.6",
40+
"get-pkg-repo": "4.1.1",
3641
"humanize-string": "^2.1.0",
37-
"latest-version": "^5.1.0",
3842
"load-cfg": "^2.1.0",
3943
"lodash": "^4.17.14",
4044
"minimatch": "^3.0.4",
@@ -43,29 +47,15 @@
4347
"react-docgen": "^4.1.1",
4448
"react-docgen-actual-name-handler": "^2.1.0",
4549
"react-docgen-external-proptypes-handler": "^1.0.3",
46-
"react-docgen-typescript": "^1.12.5",
50+
"react-docgen-typescript": "^2.1.0",
4751
"recast": "^0.18.1",
4852
"resolve": "^1.11.1",
4953
"shelljs": "^0.8.3",
5054
"signale": "^1.4.0",
5155
"titleize": "^2.1.0",
5256
"tslib": "^1.11.1",
53-
"typescript": "3.5.3",
5457
"wait-on": "^3.3.0",
5558
"xstate": "^4.6.7",
5659
"yargs": "^13.3.0"
57-
},
58-
"devDependencies": {
59-
"@types/cross-spawn": "^6.0.0",
60-
"@types/resolve": "^0.0.8",
61-
"@types/shelljs": "^0.8.5",
62-
"@types/signale": "^1.2.1",
63-
"@types/wait-on": "^3.2.0",
64-
"cpy": "^7.3.0",
65-
"cross-env": "^5.2.1",
66-
"docz-rollup": "^2.1.0",
67-
"eslint": "^6.5.1",
68-
"eslint-config-docz-ts": "^2.1.0",
69-
"jest": "^24.9.0"
7060
}
7161
}

core/docz-core/src/bundler/machine/services/exec-dev-command.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const execDevCommand = async ({ args }: ServerMachineCtx) => {
5858
...caFileOption,
5959
...keyFileOption,
6060
...certFileOption,
61-
],
61+
].filter(Boolean),
6262
{
6363
stdio: 'inherit',
6464
cwd: paths.docz,

core/docz-rollup/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
"lint": "eslint . --ext .js",
1313
"precommit": "lint-staged"
1414
},
15+
"peerDependencies": {
16+
"typescript": "^3.5.0 || ^4.0.0"
17+
},
1518
"dependencies": {
1619
"chalk": "^2.4.2",
1720
"figures": "3.0.0",
@@ -30,8 +33,5 @@
3033
"rollup-plugin-postcss": "^2.0.3",
3134
"rollup-plugin-progress": "^1.1.2",
3235
"rollup-plugin-typescript2": "^0.22.0"
33-
},
34-
"devDependencies": {
35-
"eslint-config-docz-js": "^2.1.0"
3636
}
3737
}

core/docz-rollup/src/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const progress = require('rollup-plugin-progress')
1212
const clean = require('./plugins/clean')
1313
const size = require('./plugins/size')
1414
const copy = require('./plugins/copy')
15-
15+
const isDevMode = ['--watch', '-w'].some(devFlag =>
16+
process.argv.includes(devFlag)
17+
)
1618
const EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.es6', '.es', '.mjs']
1719
const omitOpts = omit([
1820
'alias',
@@ -41,7 +43,7 @@ const createOutput = (dir = 'dist', defaultOpts) => {
4143
} = defaultOpts
4244

4345
const defaultPlugins = [
44-
clean(dir),
46+
!isDevMode && clean(dir),
4547
postcss({
4648
plugins: [autoprefixer()],
4749
inject: false,

core/docz-utils/package.json

-5
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,5 @@
4141
"unist-util-find": "^1.0.1",
4242
"unist-util-is": "^3.0.0",
4343
"unist-util-visit": "^1.4.1"
44-
},
45-
"devDependencies": {
46-
"docz-rollup": "^2.1.0",
47-
"eslint-config-docz-ts": "^2.1.0",
48-
"trash": "^6.0.0"
4944
}
5045
}

core/docz/package.json

+2-14
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727
"@mdx-js/react": "^1.0.27",
2828
"array-sort": "^1.0.0",
2929
"capitalize": "^2.0.0",
30-
"docz-core": "2.3.2-alpha.0",
30+
"docz-core": "^2.3.2-alpha.0",
3131
"fast-deep-equal": "^2.0.1",
3232
"gatsby": "^2.13.27",
3333
"gatsby-plugin-eslint": "^2.0.5",
3434
"gatsby-plugin-typescript": "^2.1.6",
35-
"gatsby-theme-docz": "^2.3.1",
35+
"gatsby-theme-docz": "^2.3.1-alpha.0",
3636
"lodash": "^4.17.14",
3737
"marksy": "^8.0.0",
3838
"match-sorter": "^3.1.1",
@@ -45,17 +45,5 @@
4545
"peerDependencies": {
4646
"react": "^16.8.0",
4747
"react-dom": "^16.8.0"
48-
},
49-
"devDependencies": {
50-
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
51-
"@types/lodash": "^4.14.136",
52-
"@types/node": "^12.6.8",
53-
"@types/pascal-case": "^1.1.2",
54-
"@types/reach__router": "^1.2.4",
55-
"@types/react": "^16.8.23",
56-
"@types/react-dom": "^16.8.4",
57-
"docz-rollup": "^2.1.0",
58-
"eslint": "^6.5.1",
59-
"eslint-config-docz-ts": "^2.1.0"
6048
}
6149
}

core/gatsby-theme-docz/package.json

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "gatsby-theme-docz",
3-
"version": "2.3.1",
3+
"version": "2.3.1-alpha.0",
44
"description": "Gatsby theme created to use Docz",
55
"license": "MIT",
66
"author": "Pedro Nauck ([email protected])",
@@ -49,15 +49,10 @@
4949
"remark-docz": "^2.1.0",
5050
"remark-frontmatter": "^1.3.2",
5151
"theme-ui": "^0.2.38",
52-
"typescript": "3.5.3",
52+
"to-style": "^1.3.3",
5353
"typography-theme-moraga": "^0.16.19",
5454
"yargs": "^13.3.0"
5555
},
56-
"devDependencies": {
57-
"babel-eslint": "10.0.2",
58-
"eslint": "^6.5.1",
59-
"eslint-config-docz-js": "^2.1.0"
60-
},
6156
"peerDependencies": {
6257
"docz": ">=2.0.0",
6358
"react": "^16.8.0",

core/rehype-docz/package.json

-6
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,5 @@
2727
"lodash": "^4.17.14",
2828
"react-ace": "^7.0.2",
2929
"unist-util-is": "^3.0.0"
30-
},
31-
"devDependencies": {
32-
"@mdx-js/mdx": "^1.1.0",
33-
"docz-rollup": "^2.1.0",
34-
"eslint-config-docz-ts": "^2.1.0",
35-
"remark-docz": "^2.1.0"
3630
}
3731
}

core/remark-docz/package.json

-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,5 @@
2424
"@babel/types": "^7.5.5",
2525
"unist-util-remove": "^1.0.3",
2626
"unist-util-visit": "^1.4.1"
27-
},
28-
"devDependencies": {
29-
"@mdx-js/mdx": "^1.1.0",
30-
"docz-rollup": "^2.1.0",
31-
"eslint-config-docz-ts": "^2.1.0"
3227
}
3328
}

dev-env/basic/.eslintrc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
// Empty file to disable gatsby linting accordingly to https://www.gatsbyjs.com/docs/how-to/custom-configuration/eslint/#disabling-eslint.
2+
// Since the monorepo is already in charge of linting.

dev-env/basic/dev.js

-128
This file was deleted.

dev-env/basic/package.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,14 @@
99
"package.json"
1010
],
1111
"scripts": {
12-
"dev": "node dev.js",
12+
"dev": "docz dev",
1313
"build": "docz build",
1414
"serve": "docz serve"
1515
},
1616
"dependencies": {
17-
"cpx": "^1.5.0",
18-
"docz": "../../core/docz",
19-
"execa": "^2.0.4",
17+
"docz": "^2.3.2-alpha.0",
2018
"prop-types": "^15.7.2",
2119
"react": "^16.8.6",
22-
"react-dom": "^16.8.6",
23-
"scheduler": "^0.15.0"
20+
"react-dom": "^16.8.6"
2421
}
2522
}

dev-env/basic/src/components/Alert.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import React from 'react'
22
import t from 'prop-types'
3-
//@ts-ignore do not remove this to get live-reloading from changes made in packages
4-
import ChangesWhenAPackageSourceIsEdited from '../last-change-timestamp' // eslint-disable-line no-unused-vars
53

64
const kinds = {
75
info: '#5352ED',

0 commit comments

Comments
 (0)