fix(docz): dependency issues (#1647)

Co-authored-by: Renato Benkendorf <[email protected]>
doczjs · Aug 31, 2021 · 5bdca48 · 5bdca48
1 parent 35dc842
commit 5bdca48
Show file tree

Hide file tree

Showing 21 changed files with 1,248 additions and 14,367 deletions.
diff --git a/core/docz-core/package.json b/core/docz-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docz-core",
-  "version": "2.3.2-alpha.1",
+  "version": "2.3.2-alpha.0",
   "description": "All docz core logic of bundle and parsing is included on this package",
   "license": "MIT",
   "main": "dist/index.js",
@@ -20,6 +20,9 @@
     "prepare": "yarn build",
     "test": "yarn jest"
   },
+  "peerDependencies": {
+    "typescript": "^3.5.0 || ^4.0.0"
+  },
   "dependencies": {
     "@sindresorhus/slugify": "^0.9.1",
     "chalk": "^2.4.2",
@@ -32,9 +35,10 @@
     "fast-glob": "^3.0.4",
     "find-up": "^4.1.0",
     "fs-extra": "^8.1.0",
-    "get-pkg-repo": "^4.1.0",
+    "gatsby-plugin-eslint": "^2.0.5",
+    "gatsby-plugin-typescript": "^2.1.6",
+    "get-pkg-repo": "4.1.1",
     "humanize-string": "^2.1.0",
-    "latest-version": "^5.1.0",
     "load-cfg": "^2.1.0",
     "lodash": "^4.17.14",
     "minimatch": "^3.0.4",
@@ -43,29 +47,15 @@
     "react-docgen": "^4.1.1",
     "react-docgen-actual-name-handler": "^2.1.0",
     "react-docgen-external-proptypes-handler": "^1.0.3",
-    "react-docgen-typescript": "^1.12.5",
+    "react-docgen-typescript": "^2.1.0",
     "recast": "^0.18.1",
     "resolve": "^1.11.1",
     "shelljs": "^0.8.3",
     "signale": "^1.4.0",
     "titleize": "^2.1.0",
     "tslib": "^1.11.1",
-    "typescript": "3.5.3",
     "wait-on": "^3.3.0",
     "xstate": "^4.6.7",
     "yargs": "^13.3.0"
-  },
-  "devDependencies": {
-    "@types/cross-spawn": "^6.0.0",
-    "@types/resolve": "^0.0.8",
-    "@types/shelljs": "^0.8.5",
-    "@types/signale": "^1.2.1",
-    "@types/wait-on": "^3.2.0",
-    "cpy": "^7.3.0",
-    "cross-env": "^5.2.1",
-    "docz-rollup": "^2.1.0",
-    "eslint": "^6.5.1",
-    "eslint-config-docz-ts": "^2.1.0",
-    "jest": "^24.9.0"
   }
 }
diff --git a/core/docz-core/src/bundler/machine/services/exec-dev-command.ts b/core/docz-core/src/bundler/machine/services/exec-dev-command.ts
@@ -58,7 +58,7 @@ export const execDevCommand = async ({ args }: ServerMachineCtx) => {
       ...caFileOption,
       ...keyFileOption,
       ...certFileOption,
-    ],
+    ].filter(Boolean),
     {
       stdio: 'inherit',
       cwd: paths.docz,

diff --git a/core/docz-rollup/package.json b/core/docz-rollup/package.json
@@ -12,6 +12,9 @@
     "lint": "eslint . --ext .js",
     "precommit": "lint-staged"
   },
+  "peerDependencies": {
+    "typescript": "^3.5.0 || ^4.0.0"
+  },
   "dependencies": {
     "chalk": "^2.4.2",
     "figures": "3.0.0",
@@ -30,8 +33,5 @@
     "rollup-plugin-postcss": "^2.0.3",
     "rollup-plugin-progress": "^1.1.2",
     "rollup-plugin-typescript2": "^0.22.0"
-  },
-  "devDependencies": {
-    "eslint-config-docz-js": "^2.1.0"
   }
 }
diff --git a/core/docz-rollup/src/index.js b/core/docz-rollup/src/index.js
@@ -12,7 +12,9 @@ const progress = require('rollup-plugin-progress')
 const clean = require('./plugins/clean')
 const size = require('./plugins/size')
 const copy = require('./plugins/copy')
-
+const isDevMode = ['--watch', '-w'].some(devFlag =>
+  process.argv.includes(devFlag)
+)
 const EXTENSIONS = ['.ts', '.tsx', '.js', '.jsx', '.es6', '.es', '.mjs']
 const omitOpts = omit([
   'alias',
@@ -41,7 +43,7 @@ const createOutput = (dir = 'dist', defaultOpts) => {
   } = defaultOpts
 
   const defaultPlugins = [
-    clean(dir),
+    !isDevMode && clean(dir),
     postcss({
       plugins: [autoprefixer()],
       inject: false,

diff --git a/core/docz-utils/package.json b/core/docz-utils/package.json
@@ -41,10 +41,5 @@
     "unist-util-find": "^1.0.1",
     "unist-util-is": "^3.0.0",
     "unist-util-visit": "^1.4.1"
-  },
-  "devDependencies": {
-    "docz-rollup": "^2.1.0",
-    "eslint-config-docz-ts": "^2.1.0",
-    "trash": "^6.0.0"
   }
 }
diff --git a/core/docz/package.json b/core/docz/package.json
@@ -27,12 +27,12 @@
     "@mdx-js/react": "^1.0.27",
     "array-sort": "^1.0.0",
     "capitalize": "^2.0.0",
-    "docz-core": "2.3.2-alpha.0",
+    "docz-core": "^2.3.2-alpha.0",
     "fast-deep-equal": "^2.0.1",
     "gatsby": "^2.13.27",
     "gatsby-plugin-eslint": "^2.0.5",
     "gatsby-plugin-typescript": "^2.1.6",
-    "gatsby-theme-docz": "^2.3.1",
+    "gatsby-theme-docz": "^2.3.1-alpha.0",
     "lodash": "^4.17.14",
     "marksy": "^8.0.0",
     "match-sorter": "^3.1.1",
@@ -45,17 +45,5 @@
   "peerDependencies": {
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
-  },
-  "devDependencies": {
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@types/lodash": "^4.14.136",
-    "@types/node": "^12.6.8",
-    "@types/pascal-case": "^1.1.2",
-    "@types/reach__router": "^1.2.4",
-    "@types/react": "^16.8.23",
-    "@types/react-dom": "^16.8.4",
-    "docz-rollup": "^2.1.0",
-    "eslint": "^6.5.1",
-    "eslint-config-docz-ts": "^2.1.0"
   }
 }
diff --git a/core/gatsby-theme-docz/package.json b/core/gatsby-theme-docz/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-theme-docz",
-  "version": "2.3.1",
+  "version": "2.3.1-alpha.0",
   "description": "Gatsby theme created to use Docz",
   "license": "MIT",
   "author": "Pedro Nauck ([email protected])",
@@ -49,15 +49,10 @@
     "remark-docz": "^2.1.0",
     "remark-frontmatter": "^1.3.2",
     "theme-ui": "^0.2.38",
-    "typescript": "3.5.3",
+    "to-style": "^1.3.3",
     "typography-theme-moraga": "^0.16.19",
     "yargs": "^13.3.0"
   },
-  "devDependencies": {
-    "babel-eslint": "10.0.2",
-    "eslint": "^6.5.1",
-    "eslint-config-docz-js": "^2.1.0"
-  },
   "peerDependencies": {
     "docz": ">=2.0.0",
     "react": "^16.8.0",

diff --git a/core/rehype-docz/package.json b/core/rehype-docz/package.json
@@ -27,11 +27,5 @@
     "lodash": "^4.17.14",
     "react-ace": "^7.0.2",
     "unist-util-is": "^3.0.0"
-  },
-  "devDependencies": {
-    "@mdx-js/mdx": "^1.1.0",
-    "docz-rollup": "^2.1.0",
-    "eslint-config-docz-ts": "^2.1.0",
-    "remark-docz": "^2.1.0"
   }
 }
diff --git a/core/remark-docz/package.json b/core/remark-docz/package.json
@@ -24,10 +24,5 @@
     "@babel/types": "^7.5.5",
     "unist-util-remove": "^1.0.3",
     "unist-util-visit": "^1.4.1"
-  },
-  "devDependencies": {
-    "@mdx-js/mdx": "^1.1.0",
-    "docz-rollup": "^2.1.0",
-    "eslint-config-docz-ts": "^2.1.0"
   }
 }
diff --git a/dev-env/basic/.eslintrc b/dev-env/basic/.eslintrc
@@ -0,0 +1,2 @@
+// Empty file to disable gatsby linting accordingly to https://www.gatsbyjs.com/docs/how-to/custom-configuration/eslint/#disabling-eslint.
+// Since the monorepo is already in charge of linting.
diff --git a/dev-env/basic/dev.js b/dev-env/basic/dev.js
diff --git a/dev-env/basic/package.json b/dev-env/basic/package.json
@@ -9,17 +9,14 @@
     "package.json"
   ],
   "scripts": {
-    "dev": "node dev.js",
+    "dev": "docz dev",
     "build": "docz build",
     "serve": "docz serve"
   },
   "dependencies": {
-    "cpx": "^1.5.0",
-    "docz": "../../core/docz",
-    "execa": "^2.0.4",
+    "docz": "^2.3.2-alpha.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
-    "react-dom": "^16.8.6",
-    "scheduler": "^0.15.0"
+    "react-dom": "^16.8.6"
   }
 }
diff --git a/dev-env/basic/src/components/Alert.jsx b/dev-env/basic/src/components/Alert.jsx
@@ -1,7 +1,5 @@
 import React from 'react'
 import t from 'prop-types'
-//@ts-ignore do not remove this to get live-reloading from changes made in packages
-import ChangesWhenAPackageSourceIsEdited from '../last-change-timestamp' // eslint-disable-line no-unused-vars
 
 const kinds = {
   info: '#5352ED',