fix(dev-env/basic): building and running development (#1646)

doczjs · Aug 2, 2021 · 7baaaf2 · 7baaaf2
1 parent d2ab7c3
commit 7baaaf2
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 294 deletions.
diff --git a/core/docz-rollup/package.json b/core/docz-rollup/package.json
@@ -28,7 +28,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-peer-deps-external": "^2.2.0",
     "rollup-plugin-postcss": "^2.0.3",
-    "rollup-plugin-progress": "^1.1.1",
+    "rollup-plugin-progress": "^1.1.2",
     "rollup-plugin-typescript2": "^0.22.0"
   },
   "devDependencies": {

diff --git a/dev-env/basic/dev.js b/dev-env/basic/dev.js
@@ -45,6 +45,7 @@ const watchPackage = async (name, outputDir) => {
   const destinationPath = getDestinationPath(name, outputDir)
   const sourceRootPath = path.join(rootPath, `core/${name}/`)
   const dev = runCommand(`yarn run dev`, { cwd: sourceRootPath })
+
   try {
     await runCommand(`yarn run build`, { cwd: sourceRootPath })
   } catch (err) {
@@ -65,8 +66,7 @@ const watchPackage = async (name, outputDir) => {
       cpx.watch(`${sourcePath}/lib/**/*`, getDestinationPath(name, 'lib'))
     )
   } else {
-    const sync = cpx.watch(`${sourcePath}/**/*`, destinationPath)
-    fileWatchers.push(sync)
+    fileWatchers.push(cpx.watch(`${sourcePath}/**/*`, destinationPath))
   }
 
   const unsubscribers = fileWatchers.map(fileWatcher => {
@@ -81,12 +81,15 @@ const watchPackage = async (name, outputDir) => {
     }
     return stop
   })
+
   const stop = () => {
     dev.cancel()
     unsubscribers.forEach(unsub => {
       unsub()
     })
   }
+
+  console.log('watching package: ', name)
   return stop
 }
 
@@ -97,20 +100,21 @@ const main = async () => {
     for (let stopWatching of watchStoppers) {
       stopWatching()
     }
+
     console.log(`\nTerminated ${watchStoppers.length} running processes\n`)
     process.exit(0)
   })
+
   const build = runCommand(`yarn packages:build`, { cwd: rootPath })
+
   watchStoppers.push(() => build.cancel())
+
   await build
-  for (let package of packages) {
-    const stopWatchingPackage = await watchPackage(
-      package.name,
-      package.outputDir
-    )
-    console.log('watching package ', package.name)
-    watchStoppers.push(stopWatchingPackage)
+
+  for (const package of packages) {
+    watchStoppers.push(await watchPackage(package.name, package.outputDir))
   }
+
   const dev = runCommand(`yarn docz dev`, { cwd: __dirname })
   watchStoppers.push(() => dev.cancel())
 }

diff --git a/dev-env/basic/package.json b/dev-env/basic/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "cpx": "^1.5.0",
-    "docz": "next",
+    "docz": "../../core/docz",
     "execa": "^2.0.4",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",