@nrwl/js 15.9.0-beta.3 → 15.9.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": "@nrwl/js",
3
- "version": "15.9.0-beta.3",
3
+ "version": "15.9.0-beta.5",
4
4
  "private": false,
5
5
  "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
6
6
  "repository": {
@@ -39,8 +39,8 @@
39
39
  "@babel/preset-env": "^7.15.0",
40
40
  "@babel/preset-typescript": "^7.15.0",
41
41
  "@babel/runtime": "^7.14.8",
42
- "@nrwl/devkit": "15.9.0-beta.3",
43
- "@nrwl/workspace": "15.9.0-beta.3",
42
+ "@nrwl/devkit": "15.9.0-beta.5",
43
+ "@nrwl/workspace": "15.9.0-beta.5",
44
44
  "@phenomnomnominal/tsquery": "4.1.1",
45
45
  "babel-plugin-const-enum": "^1.0.1",
46
46
  "babel-plugin-macros": "^2.8.0",
@@ -59,5 +59,5 @@
59
59
  "access": "public"
60
60
  },
61
61
  "types": "./src/index.d.ts",
62
- "gitHead": "4b41eb7028bac3d95e5e75087288d944824ed500"
62
+ "gitHead": "02cd5f9445f8a2c78eb4d3b0b2f7d8fab63435ba"
63
63
  }
@@ -9,6 +9,7 @@ let formatTaskAdded = false;
9
9
  function initGenerator(tree, schema) {
10
10
  var _a;
11
11
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
12
+ const tasks = [];
12
13
  // add tsconfig.base.json
13
14
  if (!(0, ts_config_1.getRootTsConfigFileName)(tree)) {
14
15
  (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, './files'), '.', {
@@ -48,20 +49,31 @@ function initGenerator(tree, schema) {
48
49
  const installTask = !schema.skipPackageJson
49
50
  ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies)
50
51
  : () => { };
51
- return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
52
- yield installTask();
53
- // Run Prettier once on all non-ignored files because some files may not be changed in the tree. e.g. nx.json
54
- // TODO(jack): Once we create @nrwl/prettier:init we can move this logic there with --formatExistingFiles option.
55
- if (!formatTaskAdded) {
56
- formatTaskAdded = true;
57
- try {
58
- const prettierCli = yield Promise.resolve().then(() => require('prettier/cli'));
59
- yield prettierCli.run(['.', '--write']);
60
- }
61
- catch (_b) {
62
- // If --skipPackageJson is passed then prettier is not installed.
52
+ tasks.push(installTask);
53
+ if (!schema.skipFormat) {
54
+ try {
55
+ (0, devkit_1.ensurePackage)('prettier', versions_1.prettierVersion);
56
+ yield (0, devkit_1.formatFiles)(tree);
57
+ }
58
+ catch (e) {
59
+ if (!formatTaskAdded) {
60
+ formatTaskAdded = true;
61
+ tasks.push(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
62
+ try {
63
+ const prettierCli = yield Promise.resolve().then(() => require('prettier/cli'));
64
+ yield prettierCli.run(['.', '--write']);
65
+ }
66
+ catch (_b) {
67
+ // If --skipPackageJson is passed then prettier is not installed.
68
+ }
69
+ }));
63
70
  }
64
71
  }
72
+ }
73
+ return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
74
+ for (const task of tasks) {
75
+ yield task();
76
+ }
65
77
  });
66
78
  });
67
79
  }
@@ -1 +1 @@
1
- {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,gEAA2E;AAC3E,mDAI8B;AAG9B,IAAI,eAAe,GAAG,KAAK,CAAC;AAE5B,SAAsB,aAAa,CACjC,IAAU,EACV,MAAkB;;;QAElB,yBAAyB;QACzB,IAAI,CAAC,IAAA,mCAAuB,EAAC,IAAI,CAAC,EAAE;YAClC,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,EAAE;gBAChE,QAAQ,EAAE,MAAA,MAAM,CAAC,YAAY,mCAAI,oBAAoB;aACtD,CAAC,CAAC;SACJ;QACD,MAAM,eAAe,GAAG;YACtB,UAAU,EAAE,oBAAS;YACrB,QAAQ,EAAE,0BAAe;SAC1B,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;YACd,eAAe,CAAC,YAAY,CAAC,GAAG,4BAAiB,CAAC;SACnD;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE;YAC/B,IAAA,kBAAS,EAAC,IAAI,EAAE,aAAa,EAAE;gBAC7B,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;SACJ;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE;YACnC,IAAI,CAAC,KAAK,CACR,iBAAiB,EACjB,IAAA,qBAAY,EAAA;;;;OAIX,CACF,CAAC;SACH;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;YAC1C,IAAA,mBAAU,EAAC,IAAI,EAAE,yBAAyB,EAAE,CAAC,IAAI,EAAE,EAAE;;gBACnD,MAAA,IAAI,CAAC,eAAe,oCAApB,IAAI,CAAC,eAAe,GAAK,EAAE,EAAC;gBAC5B,MAAM,SAAS,GAAG,wBAAwB,CAAC;gBAC3C,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAC7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBACtC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;QAED,MAAM,WAAW,GAAG,CAAC,MAAM,CAAC,eAAe;YACzC,CAAC,CAAC,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,eAAe,CAAC;YACzD,CAAC,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;QAEb,OAAO,GAAS,EAAE;YAChB,MAAM,WAAW,EAAE,CAAC;YAEpB,6GAA6G;YAC7G,iHAAiH;YACjH,IAAI,CAAC,eAAe,EAAE;gBACpB,eAAe,GAAG,IAAI,CAAC;gBACvB,IAAI;oBACF,MAAM,WAAW,GAAG,2CAAa,cAAc,EAAC,CAAC;oBACjD,MAAM,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;iBACzC;gBAAC,WAAM;oBACN,iEAAiE;iBAClE;aACF;QACH,CAAC,CAAA,CAAC;;CACH;AAjED,sCAiEC;AAED,kBAAe,aAAa,CAAC;AAEhB,QAAA,aAAa,GAAG,IAAA,2BAAkB,EAAC,aAAa,CAAC,CAAC"}
1
+ {"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../../packages/js/src/generators/init/init.ts"],"names":[],"mappings":"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"}