@nx/web 16.3.0-beta.3 → 16.3.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/web",
|
|
3
|
-
"version": "16.3.0-beta.
|
|
3
|
+
"version": "16.3.0-beta.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"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.",
|
|
6
6
|
"repository": {
|
|
@@ -30,11 +30,12 @@
|
|
|
30
30
|
"migrations": "./migrations.json"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@nrwl/web": "16.3.0-beta.
|
|
34
|
-
"@nx/devkit": "16.3.0-beta.
|
|
35
|
-
"@nx/js": "16.3.0-beta.
|
|
33
|
+
"@nrwl/web": "16.3.0-beta.5",
|
|
34
|
+
"@nx/devkit": "16.3.0-beta.5",
|
|
35
|
+
"@nx/js": "16.3.0-beta.5",
|
|
36
36
|
"chalk": "^4.1.0",
|
|
37
37
|
"chokidar": "^3.5.1",
|
|
38
|
+
"detect-port": "^1.5.1",
|
|
38
39
|
"http-server": "^14.1.0",
|
|
39
40
|
"ignore": "^5.0.4",
|
|
40
41
|
"tslib": "^2.3.0"
|
|
@@ -43,5 +44,5 @@
|
|
|
43
44
|
"access": "public"
|
|
44
45
|
},
|
|
45
46
|
"types": "./index.d.ts",
|
|
46
|
-
"gitHead": "
|
|
47
|
+
"gitHead": "11bb99316d977adfc3e0599076a73461ec8c48a1"
|
|
47
48
|
}
|
|
@@ -10,6 +10,7 @@ const chokidar_1 = require("chokidar");
|
|
|
10
10
|
const os_1 = require("os");
|
|
11
11
|
const path_1 = require("path");
|
|
12
12
|
const package_json_1 = require("nx/src/utils/package-json");
|
|
13
|
+
const detectPort = require("detect-port");
|
|
13
14
|
// platform specific command name
|
|
14
15
|
const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
|
|
15
16
|
function getHttpServerArgs(options) {
|
|
@@ -17,9 +18,6 @@ function getHttpServerArgs(options) {
|
|
|
17
18
|
if (options.cors) {
|
|
18
19
|
args.push(`--cors`);
|
|
19
20
|
}
|
|
20
|
-
if (options.port) {
|
|
21
|
-
args.push(`-p=${options.port}`);
|
|
22
|
-
}
|
|
23
21
|
if (options.host) {
|
|
24
22
|
args.push(`-a=${options.host}`);
|
|
25
23
|
}
|
|
@@ -89,13 +87,9 @@ function getIgnoredGlobs(root) {
|
|
|
89
87
|
catch (_b) { }
|
|
90
88
|
return ig;
|
|
91
89
|
}
|
|
92
|
-
function createFileWatcher(root, changeHandler) {
|
|
90
|
+
function createFileWatcher(root, projectRoot, changeHandler) {
|
|
93
91
|
const ignoredGlobs = getIgnoredGlobs(root);
|
|
94
|
-
const
|
|
95
|
-
const watcher = (0, chokidar_1.watch)([
|
|
96
|
-
(0, devkit_1.joinPathFragments)(layout.appsDir, '**'),
|
|
97
|
-
(0, devkit_1.joinPathFragments)(layout.libsDir, '**'),
|
|
98
|
-
], {
|
|
92
|
+
const watcher = (0, chokidar_1.watch)([(0, devkit_1.joinPathFragments)(projectRoot, '**')], {
|
|
99
93
|
cwd: root,
|
|
100
94
|
ignoreInitial: true,
|
|
101
95
|
});
|
|
@@ -128,7 +122,8 @@ function fileServerExecutor(options, context) {
|
|
|
128
122
|
};
|
|
129
123
|
let disposeWatch;
|
|
130
124
|
if (options.watch) {
|
|
131
|
-
|
|
125
|
+
const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
|
|
126
|
+
disposeWatch = createFileWatcher(context.root, projectRoot, run);
|
|
132
127
|
}
|
|
133
128
|
// perform initial run
|
|
134
129
|
run();
|
|
@@ -143,6 +138,10 @@ function fileServerExecutor(options, context) {
|
|
|
143
138
|
const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
|
|
144
139
|
const pathToHttpServerBin = packageJson.bin['http-server'];
|
|
145
140
|
const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
|
|
141
|
+
// detect port as close to when used to prevent port being used by another process
|
|
142
|
+
// when running in parallel
|
|
143
|
+
const port = yield tslib_1.__await(detectPort(options.port || 8080));
|
|
144
|
+
args.push(`-p=${port}`);
|
|
146
145
|
const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
|
|
147
146
|
stdio: 'pipe',
|
|
148
147
|
cwd: context.root,
|
|
@@ -169,7 +168,7 @@ function fileServerExecutor(options, context) {
|
|
|
169
168
|
});
|
|
170
169
|
yield yield tslib_1.__await({
|
|
171
170
|
success: true,
|
|
172
|
-
baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${
|
|
171
|
+
baseUrl: `${options.ssl ? 'https' : 'http'}://${options.host}:${port}`,
|
|
173
172
|
});
|
|
174
173
|
return yield tslib_1.__await(new Promise((res) => {
|
|
175
174
|
serve.on('exit', (code) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/web/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AACnD,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"file-server.impl.js","sourceRoot":"","sources":["../../../../../../packages/web/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"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"}
|