@nrwl/angular 13.2.0-beta.2 → 13.2.0-beta.3

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 (18) hide show
  1. package/fesm2015/nrwl-angular-testing.mjs +1 -0
  2. package/fesm2015/nrwl-angular.mjs +1 -0
  3. package/fesm2020/nrwl-angular-testing.mjs +1 -0
  4. package/fesm2020/nrwl-angular.mjs +1 -0
  5. package/migrations.json +5 -5
  6. package/package.json +6 -6
  7. package/src/generators/application/lib/add-e2e.js +3 -2
  8. package/src/generators/application/lib/add-e2e.js.map +1 -1
  9. package/src/generators/application/lib/add-protractor.js +1 -9
  10. package/src/generators/application/lib/add-protractor.js.map +1 -1
  11. package/src/generators/init/init.js +3 -0
  12. package/src/generators/init/init.js.map +1 -1
  13. package/src/generators/stories/lib/component-info.js +2 -1
  14. package/src/generators/stories/lib/component-info.js.map +1 -1
  15. package/src/migrations/update-13-2-0/update-angular-jest-config.js +39 -7
  16. package/src/migrations/update-13-2-0/update-angular-jest-config.js.map +1 -1
  17. package/src/utils/versions.d.ts +1 -1
  18. package/src/utils/versions.js +2 -2
package/fesm2015/nrwl-angular-testing.mjs CHANGED
@@ -54,3 +54,4 @@ const time = time$1;
54
54
  */
55
55
 
56
56
  export { cold, getTestScheduler, hot, readAll, readFirst, time };
57
+ //# sourceMappingURL=nrwl-angular-testing.mjs.map
package/fesm2015/nrwl-angular.mjs CHANGED
@@ -349,3 +349,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
349
349
  */
350
350
 
351
351
  export { DataPersistence, NxModule, fetch, navigation, optimisticUpdate, pessimisticUpdate };
352
+ //# sourceMappingURL=nrwl-angular.mjs.map
package/fesm2020/nrwl-angular-testing.mjs CHANGED
@@ -54,3 +54,4 @@ const time = time$1;
54
54
  */
55
55
 
56
56
  export { cold, getTestScheduler, hot, readAll, readFirst, time };
57
+ //# sourceMappingURL=nrwl-angular-testing.mjs.map
package/fesm2020/nrwl-angular.mjs CHANGED
@@ -349,3 +349,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
349
349
  */
350
350
 
351
351
  export { DataPersistence, NxModule, fetch, navigation, optimisticUpdate, pessimisticUpdate };
352
+ //# sourceMappingURL=nrwl-angular.mjs.map
package/migrations.json CHANGED
@@ -99,25 +99,25 @@
99
99
  },
100
100
  "update-angular-config": {
101
101
  "cli": "nx",
102
- "version": "13.2.0-bata.1",
102
+ "version": "13.2.0-beta.1",
103
103
  "description": "Remove deprecated options from webpack-server and webpack-browser.",
104
104
  "factory": "./src/migrations/update-13-2-0/update-angular-config"
105
105
  },
106
106
  "update-libraries": {
107
107
  "cli": "nx",
108
- "version": "13.2.0-bata.1",
108
+ "version": "13.2.0-beta.1",
109
109
  "description": "Remove enableIvy and add compilationMode to library tsconfig and remove deprecated ng-packagr options.",
110
110
  "factory": "./src/migrations/update-13-2-0/update-libraries"
111
111
  },
112
112
  "update-angular-jest-config": {
113
113
  "cli": "nx",
114
- "version": "13.2.0-bata.1",
114
+ "version": "13.2.0-beta.1",
115
115
  "description": "Update jest config to support jest-preset-angular",
116
116
  "factory": "./src/migrations/update-13-2-0/update-angular-jest-config"
117
117
  },
118
118
  "update-testing-imports": {
119
119
  "cli": "nx",
120
- "version": "13.2.0-bata.1",
120
+ "version": "13.2.0-beta.1",
121
121
  "description": "Move some imports from @nrwl/angular/testing to jasmine-marbles",
122
122
  "factory": "./src/migrations/update-13-2-0/update-testing-imports"
123
123
  }
@@ -1080,7 +1080,7 @@
1080
1080
  "alwaysAddToPackageJson": false
1081
1081
  },
1082
1082
  "jest-preset-angular": {
1083
- "version": "11.0.0-rc.2",
1083
+ "version": "11.0.0-rc.3",
1084
1084
  "alwaysAddToPackageJson": false
1085
1085
  }
1086
1086
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nrwl/angular",
3
- "version": "13.2.0-beta.2",
3
+ "version": "13.2.0-beta.3",
4
4
  "description": "Angular Plugin for Nx",
5
5
  "repository": {
6
6
  "type": "git",
@@ -58,11 +58,11 @@
58
58
  },
59
59
  "dependencies": {
60
60
  "@angular-devkit/schematics": "~13.0.0",
61
- "@nrwl/cypress": "13.2.0-beta.2",
62
- "@nrwl/devkit": "13.2.0-beta.2",
63
- "@nrwl/jest": "13.2.0-beta.2",
64
- "@nrwl/linter": "13.2.0-beta.2",
65
- "@nrwl/storybook": "13.2.0-beta.2",
61
+ "@nrwl/cypress": "13.2.0-beta.3",
62
+ "@nrwl/devkit": "13.2.0-beta.3",
63
+ "@nrwl/jest": "13.2.0-beta.3",
64
+ "@nrwl/linter": "13.2.0-beta.3",
65
+ "@nrwl/storybook": "13.2.0-beta.3",
66
66
  "@schematics/angular": "~13.0.0",
67
67
  "@phenomnomnominal/tsquery": "4.1.1",
68
68
  "ignore": "^5.0.4",
package/src/generators/application/lib/add-e2e.js CHANGED
@@ -19,6 +19,7 @@ const devkit_1 = require("@nrwl/devkit");
19
19
  * @returns Function to run to add Cypres config after intial app files have been moved to correct location
20
20
  */
21
21
  function addE2e(tree, options, e2eProjectRoot) {
22
+ var _a;
22
23
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
23
24
  if (options.e2eTestRunner === "protractor" /* Protractor */) {
24
25
  yield (0, add_protractor_1.addProtractor)(tree, options);
@@ -38,8 +39,8 @@ function addE2e(tree, options, e2eProjectRoot) {
38
39
  }
39
40
  if (options.e2eTestRunner === "protractor" /* Protractor */) {
40
41
  (0, update_e2e_project_1.updateE2eProject)(tree, options);
41
- if (options.standaloneConfig) {
42
- (0, workspace_1.convertToNxProjectGenerator)(tree, {
42
+ if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(tree).standaloneAsDefault) {
43
+ yield (0, workspace_1.convertToNxProjectGenerator)(tree, {
43
44
  project: `${options.e2eProjectName}`,
44
45
  });
45
46
  }
package/src/generators/application/lib/add-e2e.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAiD;AAEjD;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IAAI,OAAO,CAAC,gBAAgB,EAAE;gBAC5B,IAAA,uCAA2B,EAAC,IAAI,EAAE;oBAChC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;IACH,CAAC;CAAA;AAzCD,wBAyCC"}
1
+ {"version":3,"file":"add-e2e.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-e2e.ts"],"names":[],"mappings":";;;;AAGA,2CAAwD;AAIxD,qDAAiD;AACjD,mEAA8D;AAC9D,6DAAwD;AACxD,+CAA8D;AAC9D,yCAA4D;AAC5D,yCAAqE;AAErE;;;;;;;;GAQG;AACH,SAAsB,MAAM,CAC1B,IAAU,EACV,OAAyB,EACzB,cAAsB;;;QAEtB,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,MAAM,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAA,2CAAmB,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;SACpD;QAED,IAAI,OAAO,CAAC,aAAa,KAAK,SAAS,EAAE;YACvC,MAAM,IAAA,iCAAuB,EAAC,IAAI,EAAE;gBAClC,IAAI,EAAE,OAAO,CAAC,cAAc;gBAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI;gBACrB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;aAC3C,CAAC,CAAC;SACJ;QAED,IAAI,OAAO,CAAC,aAAa,kCAA6B,EAAE;YACtD,IAAA,qCAAgB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAChC,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;gBACA,MAAM,IAAA,uCAA2B,EAAC,IAAI,EAAE;oBACtC,OAAO,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE;iBACrC,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,eAAM,CAAC,MAAM,EAAE;gBACpC,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE;oBAC/B,OAAO,EAAE,OAAO,CAAC,cAAc;oBAC/B,MAAM,EAAE,OAAO,CAAC,MAAM;oBACtB,kBAAkB,EAAE;wBAClB,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,SAAS,CAAC;qBACrD;oBACD,UAAU,EAAE,IAAI;oBAChB,uBAAuB,EAAE,OAAO,CAAC,uBAAuB;iBACzD,CAAC,CAAC;aACJ;SACF;;CACF;AA5CD,wBA4CC"}
package/src/generators/application/lib/add-protractor.js CHANGED
@@ -3,23 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.addProtractor = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const devkit_1 = require("@nrwl/devkit");
6
- const devkit_2 = require("@nrwl/devkit");
7
6
  const ngcli_adapter_1 = require("@nrwl/devkit/ngcli-adapter");
8
- const workspace_1 = require("@nrwl/workspace");
9
7
  function addProtractor(host, options) {
10
- var _a;
11
8
  return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
12
9
  const protractorSchematic = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'e2e');
13
10
  yield protractorSchematic(host, {
14
11
  relatedAppName: options.name,
15
12
  rootSelector: `${options.prefix}-root`,
16
13
  });
17
- if ((_a = options.standaloneConfig) !== null && _a !== void 0 ? _a : (0, devkit_1.getWorkspaceLayout)(host).standaloneAsDefault) {
18
- yield (0, workspace_1.convertToNxProjectGenerator)(host, {
19
- project: options.e2eProjectName,
20
- });
21
- }
22
- (0, devkit_2.moveFilesToNewDirectory)(host, (0, devkit_2.joinPathFragments)(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
14
+ (0, devkit_1.moveFilesToNewDirectory)(host, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'e2e'), options.e2eProjectRoot);
23
15
  });
24
16
  }
25
17
  exports.addProtractor = addProtractor;
package/src/generators/application/lib/add-protractor.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAAwD;AAGxD,yCAA0E;AAC1E,8DAAwE;AACxE,+CAA8D;AAE9D,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;;QACvE,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IACE,MAAA,OAAO,CAAC,gBAAgB,mCACxB,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,mBAAmB,EAC5C;YACA,MAAM,IAAA,uCAA2B,EAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,OAAO,CAAC,cAAc;aAChC,CAAC,CAAC;SACJ;QAED,IAAA,gCAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;;CACH;AAzBD,sCAyBC"}
1
+ {"version":3,"file":"add-protractor.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/application/lib/add-protractor.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AACtB,8DAAwE;AAGxE,SAAsB,aAAa,CAAC,IAAU,EAAE,OAAyB;;QACvE,MAAM,mBAAmB,GAAG,IAAA,0CAA0B,EACpD,qBAAqB,EACrB,KAAK,CACN,CAAC;QAEF,MAAM,mBAAmB,CAAC,IAAI,EAAE;YAC9B,cAAc,EAAE,OAAO,CAAC,IAAI;YAC5B,YAAY,EAAE,GAAG,OAAO,CAAC,MAAM,OAAO;SACvC,CAAC,CAAC;QAEH,IAAA,gCAAuB,EACrB,IAAI,EACJ,IAAA,0BAAiB,EAAC,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,EAChD,OAAO,CAAC,cAAc,CACvB,CAAC;IACJ,CAAC;CAAA;AAhBD,sCAgBC"}
package/src/generators/init/init.js CHANGED
@@ -100,6 +100,9 @@ function addE2ETestRunner(host, options) {
100
100
  function addGitIgnoreEntry(host, entry) {
101
101
  if (host.exists('.gitignore')) {
102
102
  let content = host.read('.gitignore', 'utf-8');
103
+ if (/^\.angular$/gm.test(content)) {
104
+ return;
105
+ }
103
106
  content = `${content}\n${entry}\n`;
104
107
  host.write('.gitignore', content);
105
108
  }
package/src/generators/init/init.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,2CAAqD;AACrD,yCAA+D;AAC/D,yCAMsB;AACtB,qCAA+C;AAC/C,2FAAqF;AACrF,iGAA4F;AAE5F,mDAK8B;AAC9B,0CAAgD;AAGhD,SAAsB,oBAAoB,CACxC,IAAU,EACV,OAAe;;QAEf,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3B,cAAc,CAAC,IAAI,CAAC,CAAC;QAErB,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,YAAY,GAAG,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChD,iBAAiB,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAEpC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE;YACvB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QAED,OAAO,IAAA,sCAAgB,EAAC,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;CAAA;AAjBD,oDAiBC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,OAAe;IAC9C,MAAM,SAAS,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAEnD,SAAS,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAClD,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,mBAC/C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,EACtC,aAAa,EAAE,OAAO,CAAC,aAAa,IACjC,CAAC,SAAS,CAAC,UAAU,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC,CAC7D,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,mBAC3C,KAAK,EAAE,OAAO,CAAC,KAAK,EACpB,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,cAAc,EAAE,OAAO,CAAC,cAAc,IACnC,CAAC,SAAS,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAC,CACzD,CAAC;IACF,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,mBAC7C,KAAK,EAAE,OAAO,CAAC,KAAK,IACjB,CAAC,SAAS,CAAC,UAAU,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAC3D,CAAC;IAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC9C,IAAA,6CAAoB,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,cAAc,CAAC,IAAU;IAChC,IAAA,mBAAU,EAAC,IAAI,EAAE,cAAc,EAAE,CAAC,OAAO,EAAE,EAAE;;QAC3C,OAAO,CAAC,OAAO,GAAG,MAAA,OAAO,CAAC,OAAO,mCAAI,EAAE,CAAC;QACxC,MAAM,OAAO,GAAG,8CAA8C,CAAC;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE;YAChC,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,OAAO,CAAC;SACvC;aAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACxD,OAAO,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,OAAO,OAAO,EAAE,CAAC;SAC9E;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAU;IACpC,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ;QACE,qBAAqB,EAAE,yBAAc;QACrC,iBAAiB,EAAE,yBAAc;QACjC,mBAAmB,EAAE,yBAAc;QACnC,eAAe,EAAE,yBAAc;QAC/B,gBAAgB,EAAE,yBAAc;QAChC,2BAA2B,EAAE,yBAAc;QAC3C,mCAAmC,EAAE,yBAAc;QACnD,iBAAiB,EAAE,yBAAc;QACjC,IAAI,EAAE,sBAAW;QACjB,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,SAAS;KACrB,EACD;QACE,uBAAuB,EAAE,yBAAc;QACvC,2BAA2B,EAAE,yBAAc;QAC3C,+BAA+B,EAAE,+BAAoB;KACtD,CACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CACxB,IAAU,EACV,OAAuC;IAEvC,QAAQ,OAAO,CAAC,cAAc,EAAE;QAC9B;YACE,OAAO,IAAA,sBAAc,EAAC,IAAI,CAAC,CAAC;QAC9B;YACE,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF;gBACE,qBAAqB,EAAE,mCAAwB;aAChD,CACF,CAAC;YACF,OAAO,IAAA,wBAAiB,EAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,IAAU,EACV,OAAsC;IAEtC,QAAQ,OAAO,CAAC,aAAa,EAAE;QAC7B;YACE,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF;gBACE,UAAU,EAAE,QAAQ;gBACpB,cAAc,EAAE,QAAQ;gBACxB,uBAAuB,EAAE,QAAQ;gBACjC,SAAS,EAAE,QAAQ;gBACnB,gBAAgB,EAAE,QAAQ;gBAC1B,mBAAmB,EAAE,QAAQ;aAC9B,CACF,CAAC;QACJ;YACE,OAAO,IAAA,8BAAoB,EAAC,IAAI,CAAC,CAAC;QACpC;YACE,OAAO,GAAG,EAAE,GAAE,CAAC,CAAC;KACnB;AACH,CAAC;AACD,SAAS,iBAAiB,CAAC,IAAU,EAAE,KAAa;IAClD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,GAAG,GAAG,OAAO,KAAK,KAAK,IAAI,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;KACnC;SAAM;QACL,eAAM,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;KACxD;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/init/init.ts"],"names":[],"mappings":"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"}
package/src/generators/stories/lib/component-info.js CHANGED
@@ -68,7 +68,8 @@ function getComponentInfoFromDir(tree, dir, componentName, moduleFolderPath) {
68
68
  for (const candidateFile of componentImportPathChildren) {
69
69
  if (candidateFile.endsWith('.ts')) {
70
70
  const content = tree.read(candidateFile, 'utf-8');
71
- if (content.indexOf(`class ${componentName}`) > -1) {
71
+ const classAndComponentRegex = new RegExp(`@Component[\\s\\S\n]*?\\bclass ${componentName}\\b`, 'g');
72
+ if (content.match(classAndComponentRegex)) {
72
73
  path = candidateFile
73
74
  .slice(0, candidateFile.lastIndexOf('/'))
74
75
  .replace(moduleFolderPath, '.');
package/src/generators/stories/lib/component-info.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"component-info.js","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/stories/lib/component-info.ts"],"names":[],"mappings":"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"}
package/src/migrations/update-13-2-0/update-angular-jest-config.js CHANGED
@@ -29,6 +29,16 @@ function default_1(tree) {
29
29
  }
30
30
  exports.default = default_1;
31
31
  function replaceTransformAndAddIgnorePattern(fileContents) {
32
+ let updatedFileContents = updateTransformProperty(fileContents);
33
+ updatedFileContents = updateTransformIgnorePattern(updatedFileContents);
34
+ if (fileContents === updatedFileContents) {
35
+ return updatedFileContents;
36
+ }
37
+ updatedFileContents = updateModuleFileExtenstions(updatedFileContents);
38
+ return updatedFileContents;
39
+ }
40
+ exports.replaceTransformAndAddIgnorePattern = replaceTransformAndAddIgnorePattern;
41
+ function updateTransformProperty(fileContents) {
32
42
  const JEST_PRESET_ANGULAR_AST_QUERY = 'Identifier[name=transform] ~ ObjectLiteralExpression > PropertyAssignment:has(StringLiteral[value=jest-preset-angular])';
33
43
  const TRANSFORMER_STRING = "'^.+\\.(ts|mjs|js|html)$': 'jest-preset-angular'";
34
44
  let ast = tsquery_1.tsquery.ast(fileContents);
@@ -40,26 +50,48 @@ function replaceTransformAndAddIgnorePattern(fileContents) {
40
50
  }
41
51
  const transformerIndex = transformerExpressionNode.pos;
42
52
  const transformerEndIndex = transformerExpressionNode.end;
43
- let updatedFileContents = `${fileContents.slice(0, transformerIndex)}\n${TRANSFORMER_STRING}${fileContents.slice(transformerEndIndex)}`;
53
+ return `${fileContents.slice(0, transformerIndex)}\n${TRANSFORMER_STRING}${fileContents.slice(transformerEndIndex)}`;
54
+ }
55
+ function updateTransformIgnorePattern(fileContents) {
44
56
  const TRANSFORM_OBJECT_AST_QUERY = 'PropertyAssignment:has(Identifier[name=transform])';
45
57
  let TRANSFORM_IGNORE_PATTERN_STRING = "transformIgnorePatterns: ['node_modules/(?!.*\\.mjs$)'],";
46
- ast = tsquery_1.tsquery.ast(updatedFileContents);
58
+ const ast = tsquery_1.tsquery.ast(fileContents);
47
59
  const transformObjectNode = (0, tsquery_1.tsquery)(ast, TRANSFORM_OBJECT_AST_QUERY, {
48
60
  visitAllChildren: true,
49
61
  })[0];
50
62
  if (!transformObjectNode) {
51
- return updatedFileContents;
63
+ return fileContents;
52
64
  }
53
65
  let transformEndIndex = transformObjectNode.getEnd();
54
- if (updatedFileContents.charAt(transformEndIndex) == ',') {
66
+ if (fileContents.charAt(transformEndIndex) == ',') {
55
67
  transformEndIndex = transformObjectNode.getEnd() + 1;
56
68
  TRANSFORM_IGNORE_PATTERN_STRING = `\n${TRANSFORM_IGNORE_PATTERN_STRING}`;
57
69
  }
58
70
  else {
59
71
  TRANSFORM_IGNORE_PATTERN_STRING = `,\n${TRANSFORM_IGNORE_PATTERN_STRING}`;
60
72
  }
61
- updatedFileContents = `${updatedFileContents.slice(0, transformEndIndex)}${TRANSFORM_IGNORE_PATTERN_STRING}${updatedFileContents.slice(transformEndIndex)}`;
62
- return updatedFileContents;
73
+ return `${fileContents.slice(0, transformEndIndex)}${TRANSFORM_IGNORE_PATTERN_STRING}${fileContents.slice(transformEndIndex)}`;
74
+ }
75
+ function updateModuleFileExtenstions(fileContents) {
76
+ const MODULE_FILE_EXTENSIONS_AST_QUERY = 'Identifier[name=moduleFileExtensions] ~ ArrayLiteralExpression > StringLiteral';
77
+ const MODULE_FILE_EXTENSIONS_STRING = 'mjs';
78
+ const MODULE_FILE_EXTENSIONS_FULL_STRING = `moduleFileExtensions: ['mjs', 'ts', 'js', 'html'],`;
79
+ const ast = tsquery_1.tsquery.ast(fileContents);
80
+ const moduleFileExtensionsNodes = (0, tsquery_1.tsquery)(ast, MODULE_FILE_EXTENSIONS_AST_QUERY, {
81
+ visitAllChildren: true,
82
+ });
83
+ if (!moduleFileExtensionsNodes || moduleFileExtensionsNodes.length === 0) {
84
+ // add the full property
85
+ const insertPosition = fileContents.lastIndexOf('}') - 1;
86
+ return `${fileContents.slice(0, insertPosition)}\n${MODULE_FILE_EXTENSIONS_FULL_STRING}${fileContents.slice(insertPosition)}`;
87
+ }
88
+ // check if the extension already exists
89
+ const hasExtensionAlready = Boolean(moduleFileExtensionsNodes.find((node) => node.getText().includes(MODULE_FILE_EXTENSIONS_STRING)));
90
+ if (hasExtensionAlready) {
91
+ return fileContents;
92
+ }
93
+ // add the extension
94
+ const insertPosition = moduleFileExtensionsNodes[moduleFileExtensionsNodes.length - 1].getEnd();
95
+ return `${fileContents.slice(0, insertPosition)}, '${MODULE_FILE_EXTENSIONS_STRING}'${fileContents.slice(insertPosition)}`;
63
96
  }
64
- exports.replaceTransformAndAddIgnorePattern = replaceTransformAndAddIgnorePattern;
65
97
  //# sourceMappingURL=update-angular-jest-config.js.map
package/src/migrations/update-13-2-0/update-angular-jest-config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-angular-jest-config.js","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-13-2-0/update-angular-jest-config.ts"],"names":[],"mappings":"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"}
package/src/utils/versions.d.ts CHANGED
@@ -4,5 +4,5 @@ export declare const angularDevkitVersion = "~13.0.0";
4
4
  export declare const angularJsVersion = "1.7.9";
5
5
  export declare const ngrxVersion = "~13.0.0-beta.0";
6
6
  export declare const rxjsVersion = "~7.4.0";
7
- export declare const jestPresetAngularVersion = "11.0.0-rc.2";
7
+ export declare const jestPresetAngularVersion = "11.0.0-rc.3";
8
8
  export declare const angularEslintVersion = "~12.6.0";
package/src/utils/versions.js CHANGED
@@ -1,12 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.angularEslintVersion = exports.jestPresetAngularVersion = exports.rxjsVersion = exports.ngrxVersion = exports.angularJsVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
4
- exports.nxVersion = '13.2.0-beta.2';
4
+ exports.nxVersion = '13.2.0-beta.3';
5
5
  exports.angularVersion = '^13.0.0';
6
6
  exports.angularDevkitVersion = '~13.0.0';
7
7
  exports.angularJsVersion = '1.7.9';
8
8
  exports.ngrxVersion = '~13.0.0-beta.0';
9
9
  exports.rxjsVersion = '~7.4.0';
10
- exports.jestPresetAngularVersion = '11.0.0-rc.2';
10
+ exports.jestPresetAngularVersion = '11.0.0-rc.3';
11
11
  exports.angularEslintVersion = '~12.6.0';
12
12
  //# sourceMappingURL=versions.js.map