@nrwl/workspace 13.0.0-beta.2 → 13.0.0-beta.6

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.
Files changed (51) hide show
  1. package/package.json +5 -5
  2. package/src/command-line/dep-graph.js +17 -21
  3. package/src/command-line/dep-graph.js.map +1 -1
  4. package/src/command-line/nx-commands.js +25 -2
  5. package/src/command-line/nx-commands.js.map +1 -1
  6. package/src/command-line/supported-nx-commands.js +1 -0
  7. package/src/command-line/supported-nx-commands.js.map +1 -1
  8. package/src/core/dep-graph/main.es5.js +1 -1
  9. package/src/core/dep-graph/main.esm.js +1 -1
  10. package/src/core/dep-graph/polyfills.es5.js +1 -1
  11. package/src/core/dep-graph/polyfills.esm.js +1 -1
  12. package/src/core/dep-graph/runtime.es5.js +1 -1
  13. package/src/core/dep-graph/runtime.esm.js +1 -1
  14. package/src/core/file-utils.d.ts +2 -10
  15. package/src/core/file-utils.js +18 -29
  16. package/src/core/file-utils.js.map +1 -1
  17. package/src/core/project-graph/build-project-graph.d.ts +0 -11
  18. package/src/core/project-graph/build-project-graph.js +2 -39
  19. package/src/core/project-graph/build-project-graph.js.map +1 -1
  20. package/src/core/project-graph/daemon/cache.d.ts +5 -13
  21. package/src/core/project-graph/daemon/cache.js +39 -16
  22. package/src/core/project-graph/daemon/cache.js.map +1 -1
  23. package/src/core/project-graph/daemon/client/client.js +16 -44
  24. package/src/core/project-graph/daemon/client/client.js.map +1 -1
  25. package/src/core/project-graph/daemon/client/exec-is-server-available.d.ts +1 -0
  26. package/src/core/project-graph/daemon/client/exec-is-server-available.js +13 -0
  27. package/src/core/project-graph/daemon/client/exec-is-server-available.js.map +1 -0
  28. package/src/core/project-graph/daemon/client/generate-help-output.d.ts +1 -0
  29. package/src/core/project-graph/daemon/client/generate-help-output.js +28 -0
  30. package/src/core/project-graph/daemon/client/generate-help-output.js.map +1 -0
  31. package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.d.ts +6 -0
  32. package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +120 -0
  33. package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -0
  34. package/src/core/project-graph/daemon/server/server.js +28 -83
  35. package/src/core/project-graph/daemon/server/server.js.map +1 -1
  36. package/src/core/project-graph/daemon/server/stop.js +1 -11
  37. package/src/core/project-graph/daemon/server/stop.js.map +1 -1
  38. package/src/core/project-graph/daemon/socket-utils.d.ts +6 -0
  39. package/src/core/project-graph/daemon/socket-utils.js +4 -8
  40. package/src/core/project-graph/daemon/socket-utils.js.map +1 -1
  41. package/src/core/project-graph/daemon/tmp-dir.d.ts +7 -0
  42. package/src/core/project-graph/daemon/tmp-dir.js +59 -0
  43. package/src/core/project-graph/daemon/tmp-dir.js.map +1 -0
  44. package/src/core/project-graph/project-graph.js +3 -10
  45. package/src/core/project-graph/project-graph.js.map +1 -1
  46. package/src/generators/init/init.js +27 -27
  47. package/src/generators/init/init.js.map +1 -1
  48. package/src/utilities/run-webpack.d.ts +3 -2
  49. package/src/utilities/run-webpack.js +18 -34
  50. package/src/utilities/run-webpack.js.map +1 -1
  51. package/src/utils/versions.js +1 -1
package/src/generators/init/init.js CHANGED
@@ -135,6 +135,7 @@ function updateAngularCLIJson(host, options) {
135
135
  implicitDependencies: [appName],
136
136
  tags: [],
137
137
  });
138
+ delete defaultProject.targets.e2e;
138
139
  }
139
140
  devkit_1.updateProjectConfiguration(host, appName, defaultProject);
140
141
  workspaceConfig.cli = workspaceConfig.cli || {};
@@ -166,9 +167,8 @@ function updateTsConfig(host) {
166
167
  }
167
168
  }
168
169
  function updateTsConfigsJson(host, options) {
169
- const workspaceJson = devkit_1.readJson(host, 'angular.json');
170
- const app = workspaceJson.projects[options.name];
171
- const e2eProject = getE2eProject(workspaceJson);
170
+ const app = devkit_1.readProjectConfiguration(host, options.name);
171
+ const e2eProject = getE2eProject(host);
172
172
  const tsConfigPath = getRootTsConfigPath(host);
173
173
  const appOffset = devkit_1.offsetFromRoot(app.root);
174
174
  devkit_1.updateJson(host, app.targets.build.options.tsConfig, (json) => {
@@ -256,32 +256,33 @@ function moveOutOfSrc(tree, appName, filePath, required = true) {
256
256
  : devkit_1.joinPathFragments('apps', appName);
257
257
  renameSyncInTree(tree, from, to, required);
258
258
  }
259
- function getE2eKey(workspaceJson) {
260
- return Object.keys(workspaceJson.projects).find((key) => {
261
- var _a, _b;
262
- return !!((_b = (_a = workspaceJson.projects[key]) === null || _a === void 0 ? void 0 : _a.architect) === null || _b === void 0 ? void 0 : _b.e2e);
263
- });
259
+ function getE2eKey(host) {
260
+ const projects = devkit_1.getProjects(host);
261
+ for (const [projectName, project] of projects) {
262
+ if (project.targets.e2e) {
263
+ return projectName;
264
+ }
265
+ }
264
266
  }
265
- function getE2eProject(workspaceJson) {
266
- const key = getE2eKey(workspaceJson);
267
+ function getE2eProject(host) {
268
+ const key = getE2eKey(host);
267
269
  if (key) {
268
- return workspaceJson.projects[key];
270
+ return devkit_1.readProjectConfiguration(host, key);
269
271
  }
270
272
  else {
271
273
  return null;
272
274
  }
273
275
  }
274
276
  function moveExistingFiles(host, options) {
275
- const workspaceJson = devkit_1.readJson(host, devkit_1.getWorkspacePath(host));
276
- const app = workspaceJson.projects[options.name];
277
- const e2eApp = getE2eProject(workspaceJson);
277
+ const app = devkit_1.readProjectConfiguration(host, options.name);
278
+ const e2eApp = getE2eProject(host);
278
279
  // it is not required to have a browserslist
279
280
  moveOutOfSrc(host, options.name, 'browserslist', false);
280
281
  moveOutOfSrc(host, options.name, '.browserslistrc', false);
281
- moveOutOfSrc(host, options.name, app.architect.build.options.tsConfig);
282
- if (app.architect.test) {
283
- moveOutOfSrc(host, options.name, app.architect.test.options.karmaConfig);
284
- moveOutOfSrc(host, options.name, app.architect.test.options.tsConfig);
282
+ moveOutOfSrc(host, options.name, app.targets.build.options.tsConfig);
283
+ if (app.targets.test) {
284
+ moveOutOfSrc(host, options.name, app.targets.test.options.karmaConfig);
285
+ moveOutOfSrc(host, options.name, app.targets.test.options.tsConfig);
285
286
  }
286
287
  else {
287
288
  // there could still be a karma.conf.js file in the root
@@ -291,15 +292,15 @@ function moveExistingFiles(host, options) {
291
292
  moveOutOfSrc(host, options.name, 'karma.conf.js');
292
293
  }
293
294
  }
294
- if (app.architect.server) {
295
- moveOutOfSrc(host, options.name, app.architect.server.options.tsConfig);
295
+ if (app.targets.server) {
296
+ moveOutOfSrc(host, options.name, app.targets.server.options.tsConfig);
296
297
  }
297
298
  const oldAppSourceRoot = app.sourceRoot;
298
299
  const newAppSourceRoot = devkit_1.joinPathFragments('apps', options.name, 'src');
299
300
  renameDirSyncInTree(host, oldAppSourceRoot, newAppSourceRoot);
300
301
  if (e2eApp) {
301
302
  const oldE2eRoot = devkit_1.joinPathFragments(app.root || '', 'e2e');
302
- const newE2eRoot = devkit_1.joinPathFragments('apps', `${getE2eKey(workspaceJson)}-e2e`);
303
+ const newE2eRoot = devkit_1.joinPathFragments('apps', `${getE2eKey(host)}-e2e`);
303
304
  renameDirSyncInTree(host, oldE2eRoot, newE2eRoot);
304
305
  }
305
306
  else {
@@ -309,7 +310,6 @@ function moveExistingFiles(host, options) {
309
310
  }
310
311
  function createAdditionalFiles(host, options) {
311
312
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
312
- const workspaceJson = devkit_1.readJson(host, 'angular.json');
313
313
  host.write('nx.json', fileutils_1.serializeJson({
314
314
  npmScope: options.npmScope,
315
315
  affected: {
@@ -326,7 +326,7 @@ function createAdditionalFiles(host, options) {
326
326
  [options.name]: {
327
327
  tags: [],
328
328
  },
329
- [`${getE2eKey(workspaceJson)}-e2e`]: {
329
+ [`${getE2eKey(host)}-e2e`]: {
330
330
  tags: [],
331
331
  },
332
332
  },
@@ -377,11 +377,11 @@ function checkCanConvertToWorkspace(host) {
377
377
  if (Object.keys(workspaceJson.projects).length > 2 || hasLibraries) {
378
378
  throw new Error('Can only convert projects with one app');
379
379
  }
380
- const e2eKey = getE2eKey(workspaceJson);
381
- const e2eApp = getE2eProject(workspaceJson);
382
- if (e2eApp && !host.exists(e2eApp.architect.e2e.options.protractorConfig)) {
380
+ const e2eKey = getE2eKey(host);
381
+ const e2eApp = getE2eProject(host);
382
+ if (e2eApp && !host.exists(e2eApp.targets.e2e.options.protractorConfig)) {
383
383
  console.info(`Make sure the ${e2eKey}.architect.e2e.options.protractorConfig is valid or the ${e2eKey} project is removed from angular.json.`);
384
- throw new Error(`An e2e project was specified but ${e2eApp.architect.e2e.options.protractorConfig} could not be found.`);
384
+ throw new Error(`An e2e project was specified but ${e2eApp.targets.e2e.options.protractorConfig} could not be found.`);
385
385
  }
386
386
  return host;
387
387
  }
package/src/generators/init/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/init/init.ts"],"names":[],"mappings":"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"}
package/src/utilities/run-webpack.d.ts CHANGED
@@ -1,5 +1,6 @@
1
+ import * as webpack from 'webpack';
1
2
  import { Observable } from 'rxjs/internal/Observable';
2
- export declare function runWebpack(config: any, webpack: any): Observable<any>;
3
+ export declare function runWebpack(config: webpack.Configuration): Observable<any>;
3
4
  export declare function runWebpackDevServer(config: any, webpack: typeof import('webpack'), WebpackDevServer: typeof import('webpack-dev-server')): Observable<{
4
5
  stats: any;
5
6
  baseUrl: string;
@@ -12,4 +13,4 @@ export interface EmittedFile {
12
13
  initial: boolean;
13
14
  asset?: boolean;
14
15
  }
15
- export declare function getEmittedFiles(stats: any): EmittedFile[];
16
+ export declare function getEmittedFiles(stats: webpack.Stats): EmittedFile[];
package/src/utilities/run-webpack.js CHANGED
@@ -1,37 +1,35 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getEmittedFiles = exports.runWebpackDevServer = exports.runWebpack = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const webpack = require("webpack");
4
6
  const Observable_1 = require("rxjs/internal/Observable");
5
7
  const path_1 = require("path");
6
- const url = require("url");
7
- function runWebpack(config, webpack) {
8
+ function runWebpack(config) {
8
9
  return new Observable_1.Observable((subscriber) => {
9
- const webpackCompiler = webpack(config);
10
- function callback(err, stats) {
10
+ // Passing `watch` option here will result in a warning due to missing callback.
11
+ // We manually call `.watch` or `.run` later so this option isn't needed here.
12
+ const { watch } = config, normalizedConfig = tslib_1.__rest(config, ["watch"]);
13
+ const webpackCompiler = webpack(normalizedConfig);
14
+ const callback = (err, stats) => {
11
15
  if (err) {
12
16
  subscriber.error(err);
13
17
  }
14
18
  subscriber.next(stats);
15
- }
19
+ };
16
20
  if (config.watch) {
17
21
  const watchOptions = config.watchOptions || {};
18
22
  const watching = webpackCompiler.watch(watchOptions, callback);
19
- return () => {
20
- watching.close(() => { });
21
- };
23
+ return () => watching.close(() => subscriber.complete());
22
24
  }
23
25
  else {
24
26
  webpackCompiler.run((err, stats) => {
25
27
  callback(err, stats);
26
- // TODO: Delete for Nx 13 and leave only the call to close method
27
- if (typeof webpackCompiler.close === 'function') {
28
- webpackCompiler.close(() => {
29
- subscriber.complete();
30
- });
31
- }
32
- else {
28
+ webpackCompiler.close((closeErr) => {
29
+ if (closeErr)
30
+ subscriber.error(closeErr);
33
31
  subscriber.complete();
34
- }
32
+ });
35
33
  });
36
34
  }
37
35
  });
@@ -39,7 +37,6 @@ function runWebpack(config, webpack) {
39
37
  exports.runWebpack = runWebpack;
40
38
  function runWebpackDevServer(config, webpack, WebpackDevServer) {
41
39
  return new Observable_1.Observable((subscriber) => {
42
- var _a, _b;
43
40
  const webpackCompiler = webpack(config);
44
41
  let baseUrl;
45
42
  webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
@@ -50,25 +47,12 @@ function runWebpackDevServer(config, webpack, WebpackDevServer) {
50
47
  devServerConfig.onListening = function (server) {
51
48
  originalOnListen(server);
52
49
  const devServerOptions = server.options;
53
- baseUrl = url.format({
54
- protocol: devServerOptions.https ? 'https' : 'http',
55
- hostname: server.hostname,
56
- port: server.listeningApp.address().port,
57
- pathname: devServerOptions.publicPath,
58
- });
50
+ baseUrl = `${server.options.https ? 'https' : 'http'}://${server.options.host}:${server.options.port}${devServerOptions.devMiddleware.publicPath}`;
59
51
  };
60
- const webpackServer = new WebpackDevServer(
61
- // Some type mismatches between webpack's built-in type defs and what webpack-dev-server expects.
62
- webpackCompiler, devServerConfig);
52
+ const webpackServer = new WebpackDevServer(devServerConfig, webpackCompiler);
63
53
  try {
64
- const server = webpackServer.listen((_a = devServerConfig.port) !== null && _a !== void 0 ? _a : 8080, (_b = devServerConfig.host) !== null && _b !== void 0 ? _b : 'localhost', function (err) {
65
- if (err) {
66
- subscriber.error(err);
67
- }
68
- });
69
- return () => {
70
- server.close();
71
- };
54
+ webpackServer.start().catch((err) => subscriber.error(err));
55
+ return () => webpackServer.stop();
72
56
  }
73
57
  catch (e) {
74
58
  throw new Error('Could not start start dev server');
package/src/utilities/run-webpack.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"run-webpack.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/run-webpack.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"run-webpack.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/run-webpack.ts"],"names":[],"mappings":"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"}
package/src/utils/versions.js CHANGED
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.eslintConfigPrettierVersion = exports.eslintVersion = exports.tslintVersion = exports.typescriptESLintVersion = exports.prettierVersion = exports.typescriptVersion = exports.angularCliVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '13.0.0-beta.2';
4
+ exports.nxVersion = '13.0.0-beta.6';
5
5
  exports.angularCliVersion = '~12.2.0';
6
6
  exports.typescriptVersion = '~4.3.5';
7
7
  exports.prettierVersion = '^2.3.1';