@nx/plugin 21.4.0-beta.5 → 21.4.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/plugin",
-  "version": "21.4.0-beta.5",
+  "version": "21.4.0-beta.7",
   "private": false,
   "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
   "repository": {
@@ -28,13 +28,13 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "21.4.0-beta.5",
-    "@nx/jest": "21.4.0-beta.5",
-    "@nx/js": "21.4.0-beta.5",
-    "@nx/eslint": "21.4.0-beta.5"
+    "@nx/devkit": "21.4.0-beta.7",
+    "@nx/jest": "21.4.0-beta.7",
+    "@nx/js": "21.4.0-beta.7",
+    "@nx/eslint": "21.4.0-beta.7"
   },
   "devDependencies": {
-    "nx": "21.4.0-beta.5"
+    "nx": "21.4.0-beta.7"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/create-package/utils/normalize-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/create-package/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAM7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CA4C3B"}
+{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/create-package/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAS7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAEhD,MAAM,WAAW,gBAAiB,SAAQ,mBAAmB;IAC3D,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,gBAAgB,CAAC,CAkD3B"}

package/src/generators/create-package/utils/normalize-schema.js

@@ -16,7 +16,12 @@ async function normalizeSchema(host, schema) {
         projectType: 'library',
         directory: schema.directory,
     });
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    // this helper is called before the other generators that end up calling the
+    // jsLibraryGenerator, so, if the TS solution setup is not configured, we
+    // additionally check if the TS solution setup will be configured by the
+    // jsLibraryGenerator
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) ||
+        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, schema.addPlugin);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = schema.addPlugin ??
         (isTsSolutionSetup &&

package/src/generators/plugin/utils/normalize-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAM7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAkD3B"}
+{"version":3,"file":"normalize-schema.d.ts","sourceRoot":"","sources":["../../../../../../../packages/plugin/src/generators/plugin/utils/normalize-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAKnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAS7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,KAAK,GAAG,KAAK,CAAC;IACvB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC3C,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,EAAE,OAAO,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,gBAAgB,CAAC,CAuD3B"}

package/src/generators/plugin/utils/normalize-schema.js

@@ -8,7 +8,11 @@ const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-set
 async function normalizeOptions(host, options) {
     const linter = await (0, generator_prompts_1.normalizeLinterOption)(host, options.linter);
     const unitTestRunner = await (0, generator_prompts_1.normalizeUnitTestRunnerOption)(host, options.unitTestRunner, ['jest', 'vitest']);
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    // this helper is called before the jsLibraryGenerator is called, so, if the
+    // TS solution setup is not configured, we additionally check if the TS
+    // solution setup will be configured by the jsLibraryGenerator
+    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host) ||
+        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(host, options.addPlugin);
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = options.addPlugin ??
         (isTsSolutionSetup &&

package/src/generators/preset/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/preset/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAKpB,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAElB,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,qBAAqB,8BAOlC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,qBAAqB,8BA8ClC;AA0CD,eAAe,eAAe,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/preset/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAIpB,OAAO,KAAK,EAEV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAElB,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,qBAAqB,8BAOlC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,qBAAqB,8BA8ClC;AA8BD,eAAe,eAAe,CAAC"}

package/src/generators/preset/generator.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.presetGenerator = presetGenerator;
 exports.presetGeneratorInternal = presetGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const create_package_1 = require("../create-package/create-package");
 const plugin_1 = require("../plugin/plugin");
 async function presetGenerator(tree, rawOptions) {
@@ -15,7 +14,7 @@ async function presetGenerator(tree, rawOptions) {
 }
 async function presetGeneratorInternal(tree, rawOptions) {
     const tasks = [];
-    const options = normalizeOptions(tree, rawOptions);
+    const options = normalizeOptions(rawOptions);
     const pluginTask = await (0, plugin_1.pluginGenerator)(tree, {
         compiler: 'tsc',
         linter: 'eslint',
@@ -63,13 +62,7 @@ function moveNxPluginToDevDeps(tree) {
         return json;
     });
 }
-function normalizeOptions(tree, options) {
-    const isTsSolutionSetup = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const addPlugin = options.addPlugin ??
-        (isTsSolutionSetup &&
-            process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false);
+function normalizeOptions(options) {
     return {
         ...options,
         pluginName: (0, devkit_1.names)(options.pluginName.includes('/')
@@ -78,8 +71,6 @@ function normalizeOptions(tree, options) {
         createPackageName: options.createPackageName === 'false' // for command line in e2e, it is passed as a string
             ? undefined
             : options.createPackageName,
-        addPlugin,
-        useProjectJson: options.useProjectJson ?? !isTsSolutionSetup,
     };
 }
 exports.default = presetGenerator;

package/src/generators/preset/schema.d.ts

@@ -8,6 +8,4 @@ export interface PresetGeneratorSchema {
 export interface NormalizedPresetGeneratorOptions
   extends PresetGeneratorSchema {
   createPackageName: string;
-  useProjectJson: boolean;
-  addPlugin: boolean;
 }