@nx/web 16.8.0-beta.3 → 16.8.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "16.8.0-beta.3",
+  "version": "16.8.0-beta.5",
   "private": false,
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -30,19 +30,17 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/web": "16.8.0-beta.3",
-    "@nx/devkit": "16.8.0-beta.3",
-    "@nx/js": "16.8.0-beta.3",
+    "@nrwl/web": "16.8.0-beta.5",
+    "@nx/devkit": "16.8.0-beta.5",
+    "@nx/js": "16.8.0-beta.5",
     "chalk": "^4.1.0",
-    "chokidar": "^3.5.1",
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
-    "ignore": "^5.0.4",
     "tslib": "^2.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "type": "commonjs",
-  "gitHead": "dcd48165a485bc8db57a1fb02b96a0772de3b7e9"
+  "gitHead": "ad2d1e8a55b2d1b358bb5e7483343d9757ff2c53"
 }

package/src/executors/file-server/file-server.impl.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
 const chalk = require("chalk");
 const devkit_1 = require("@nx/devkit");
-const ignore_1 = require("ignore");
 const fs_1 = require("fs");
-const chokidar_1 = require("chokidar");
 const os_1 = require("os");
 const path_1 = require("path");
 const package_json_1 = require("nx/src/utils/package-json");
 const detectPort = require("detect-port");
+const client_1 = require("nx/src/daemon/client/client");
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 function getHttpServerArgs(options) {
@@ -75,111 +73,104 @@ function getBuildTargetOutputPath(options, context) {
     }
     return outputPath;
 }
-function getIgnoredGlobs(root) {
-    const ig = (0, ignore_1.default)();
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
-    }
-    catch (_a) { }
-    try {
-        ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
-    }
-    catch (_b) { }
-    return ig;
-}
-function createFileWatcher(root, projectRoot, changeHandler) {
-    const ignoredGlobs = getIgnoredGlobs(root);
-    const watcher = (0, chokidar_1.watch)([(0, devkit_1.joinPathFragments)(projectRoot, '**')], {
-        cwd: root,
-        ignoreInitial: true,
-    });
-    watcher.on('all', (_event, path) => {
-        if (ignoredGlobs.ignores(path))
-            return;
-        changeHandler();
+function createFileWatcher(project, changeHandler) {
+    return client_1.daemonClient.registerFileWatcher({
+        watchProjects: project ? [project] : 'all',
+        includeGlobalWorkspaceFiles: true,
+        includeDependentProjects: true,
+    }, async (error, { changedFiles }) => {
+        if (error === 'closed') {
+            throw new Error('Watch error: Daemon closed the connection');
+        }
+        else if (error) {
+            throw new Error(`Watch error: ${error?.message ?? 'Unknown'}`);
+        }
+        else if (changedFiles.length > 0) {
+            changeHandler();
+        }
     });
-    return () => watcher.close();
 }
-function fileServerExecutor(options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* fileServerExecutor_1() {
-        let running = false;
-        const run = () => {
-            if (!running) {
-                running = true;
-                try {
-                    const args = getBuildTargetCommand(options);
-                    (0, child_process_1.execFileSync)(pmCmd, args, {
-                        stdio: [0, 1, 2],
-                    });
-                }
-                catch (_a) {
-                    throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
-                }
-                finally {
-                    running = false;
-                }
+async function* fileServerExecutor(options, context) {
+    let running = false;
+    const run = () => {
+        if (!running) {
+            running = true;
+            try {
+                const args = getBuildTargetCommand(options);
+                (0, child_process_1.execFileSync)(pmCmd, args, {
+                    stdio: [0, 1, 2],
+                });
+            }
+            catch {
+                throw new Error(`Build target failed: ${chalk.bold(options.buildTarget)}`);
             }
-        };
-        let disposeWatch;
-        if (options.watch) {
-            const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-            disposeWatch = createFileWatcher(context.root, projectRoot, run);
+            finally {
+                running = false;
+            }
+        }
+    };
+    let disposeWatch;
+    if (options.watch) {
+        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
+        disposeWatch = await createFileWatcher(context.projectName, run);
+    }
+    // perform initial run
+    run();
+    const outputPath = getBuildTargetOutputPath(options, context);
+    if (options.spa) {
+        const src = (0, path_1.join)(outputPath, 'index.html');
+        const dst = (0, path_1.join)(outputPath, '404.html');
+        // See: https://github.com/http-party/http-server#magic-files
+        (0, fs_1.copyFileSync)(src, dst);
+    }
+    const args = getHttpServerArgs(options);
+    const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
+    const pathToHttpServerBin = packageJson.bin['http-server'];
+    const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
+    // detect port as close to when used to prevent port being used by another process
+    // when running in  parallel
+    const port = await detectPort(options.port || 8080);
+    args.push(`-p=${port}`);
+    const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
+        stdio: 'pipe',
+        cwd: context.root,
+        env: {
+            FORCE_COLOR: 'true',
+            ...process.env,
+        },
+    });
+    const processExitListener = () => {
+        serve.kill();
+        if (disposeWatch) {
+            disposeWatch();
         }
-        // perform initial run
-        run();
-        const outputPath = getBuildTargetOutputPath(options, context);
         if (options.spa) {
-            const src = (0, path_1.join)(outputPath, 'index.html');
-            const dst = (0, path_1.join)(outputPath, '404.html');
-            // See: https://github.com/http-party/http-server#magic-files
-            (0, fs_1.copyFileSync)(src, dst);
+            (0, fs_1.unlinkSync)((0, path_1.join)(outputPath, '404.html'));
         }
-        const args = getHttpServerArgs(options);
-        const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
-        const pathToHttpServerBin = packageJson.bin['http-server'];
-        const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
-        // detect port as close to when used to prevent port being used by another process
-        // when running in  parallel
-        const port = yield tslib_1.__await(detectPort(options.port || 8080));
-        args.push(`-p=${port}`);
-        const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
-            stdio: 'pipe',
-            cwd: context.root,
-            env: Object.assign({ FORCE_COLOR: 'true' }, process.env),
-        });
-        const processExitListener = () => {
-            serve.kill();
-            if (disposeWatch) {
-                disposeWatch();
-            }
-            if (options.spa) {
-                (0, fs_1.unlinkSync)((0, path_1.join)(outputPath, '404.html'));
+    };
+    process.on('exit', processExitListener);
+    process.on('SIGTERM', processExitListener);
+    serve.stdout.on('data', (chunk) => {
+        if (chunk.toString().indexOf('GET') === -1) {
+            process.stdout.write(chunk);
+        }
+    });
+    serve.stderr.on('data', (chunk) => {
+        process.stderr.write(chunk);
+    });
+    yield {
+        success: true,
+        baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${port}`,
+    };
+    return new Promise((res) => {
+        serve.on('exit', (code) => {
+            if (code == 0) {
+                res({ success: true });
             }
-        };
-        process.on('exit', processExitListener);
-        process.on('SIGTERM', processExitListener);
-        serve.stdout.on('data', (chunk) => {
-            if (chunk.toString().indexOf('GET') === -1) {
-                process.stdout.write(chunk);
+            else {
+                res({ success: false });
             }
         });
-        serve.stderr.on('data', (chunk) => {
-            process.stderr.write(chunk);
-        });
-        yield yield tslib_1.__await({
-            success: true,
-            baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${port}`,
-        });
-        return yield tslib_1.__await(new Promise((res) => {
-            serve.on('exit', (code) => {
-                if (code == 0) {
-                    res({ success: true });
-                }
-                else {
-                    res({ success: false });
-                }
-            });
-        }));
     });
 }
 exports.default = fileServerExecutor;