fix(preact): repair missing directory prop and align the code to nx20

packages/preact/src/generators/library/lib/add-linting.ts

@@ -5,15 +5,20 @@ import {
   ensurePackage,
   runTasksInSerial,
   NX_VERSION,
+  updateJson,
 } from '@nx/devkit';
 import { NormalizedSchema } from '../schema';
 import { extraEslintDependencies } from '../../utils/lint';
+import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';
+import { findEslintFile } from '@nx/eslint/src/generators/utils/eslint-file';
 
 export async function addLinting(host: Tree, options: NormalizedSchema) {
   if (options.linter !== 'eslint') {
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    return () => {};
+    return () => {
+      /* empty */
+    };
   }
+
   const { lintProjectGenerator } = ensurePackage<typeof import('@nx/eslint')>(
     '@nx/eslint',
     NX_VERSION
@@ -29,13 +34,48 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
     skipFormat: true,
   });
 
-  host.rename(
-    joinPathFragments(options.projectRoot, 'eslintrc.js'),
-    joinPathFragments(options.projectRoot, '.eslintrc.js')
-  );
-  host.delete(joinPathFragments(options.projectRoot, '.eslintrc.json'));
+  const eslintFile = findEslintFile(host, options.projectRoot);
+  const eslintFilePath = joinPathFragments(options.projectRoot, eslintFile);
+  if (useFlatConfig(host)) {
+    /**
+     * TODO: augment flat config once the plugins are ready with the flat
+     */
+  } else {
+    updateJson(host, eslintFilePath, (json) => {
+      const overrides = [
+        {
+          files: ['*.ts', '*.js', '*.tsx'],
+          parserOptions: {
+            project: [
+              `${joinPathFragments(options.projectRoot, 'tsconfig.*?.json')}`,
+            ],
+          },
+          rules: {},
+        },
+        ...(json.overrides ?? []),
+      ];
+      const ignorePatterns = [
+        ...(json.ignorePatterns ?? ['!**/*']),
+        'vite.config.ts',
+      ];
+      const plugins = [...(json.plugins ?? []), 'preact', '@typescript-eslint'];
+      const extendsVal = [...(json.extends ?? [])];
+      delete json.plugins;
+      delete json.ignorePatterns;
+      delete json.overrides;
+      delete json.extends;
+      return {
+        extends: extendsVal,
+        parser: '@typescript-eslint/parser',
+        plugins,
+        ignorePatterns,
+        overrides,
+        ...json,
+      };
+    });
+  }
 
-  const installTask = await addDependenciesToPackageJson(
+  const installTask = addDependenciesToPackageJson(
     host,
     extraEslintDependencies.dependencies,
     extraEslintDependencies.devDependencies

packages/preact/src/generators/library/lib/add-project.ts

@@ -2,26 +2,10 @@ import { NormalizedSchema } from '../schema';
 import { addProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
 
 export function addProject(tree: Tree, options: NormalizedSchema) {
-  const targets: { [key: string]: TargetConfiguration } = {
-    lint: createLintTarget(options),
-  };
-
   addProjectConfiguration(tree, options.name, {
     root: options.projectRoot,
     sourceRoot: `${options.projectRoot}/src`,
     projectType: 'library',
     tags: options.parsedTags,
-    targets,
   });
 }
-
-function createLintTarget(options: NormalizedSchema): TargetConfiguration {
-  return {
-    executor: '@nx/eslint:lint',
-    options: {
-      linter: 'eslint',
-      tsConfig: `${options.projectRoot}/tsconfig.lib.json`,
-      exclude: ['**/node_modules/**', `!${options.projectRoot}/**/*`],
-    },
-  };
-}

packages/preact/src/generators/library/lib/add-vite.ts

@@ -3,13 +3,29 @@ import { NormalizedSchema } from '../schema';
 
 export async function addVite(host: Tree, options: NormalizedSchema) {
   await ensurePackage('@nx/vite', NX_VERSION);
-  const { viteConfigurationGenerator } = await import('@nx/vite');
+  const { viteConfigurationGenerator, createOrEditViteConfig } = await import(
+    '@nx/vite'
+  );
 
-  return await viteConfigurationGenerator(host, {
+  const addViteTask = await viteConfigurationGenerator(host, {
     uiFramework: 'none',
     project: options.name,
     newProject: true,
     includeVitest: options.unitTestRunner === 'vitest',
     inSourceTests: false,
   });
+  createOrEditViteConfig(
+    host,
+    {
+      project: options.name,
+      includeLib: false,
+      includeVitest: options.unitTestRunner === 'vitest',
+      inSourceTests: false,
+      rollupOptionsExternal: [],
+      imports: [`import preact from '@preact/preset-vite'`],
+      plugins: [`preact()`],
+    },
+    false
+  );
+  return addViteTask;
 }

packages/preact/src/generators/library/lib/create-files.ts

@@ -0,0 +1,26 @@
+import {
+  generateFiles,
+  joinPathFragments,
+  names,
+  offsetFromRoot,
+  Tree,
+} from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+import { useFlatConfig } from '@nx/eslint/src/utils/flat-config';
+
+export function createFiles(host: Tree, options: NormalizedSchema) {
+  generateFiles(
+    host,
+    joinPathFragments(__dirname, '..', './files'),
+    options.projectRoot,
+    {
+      ...options,
+      ...names(options.name),
+      offsetFromRoot: offsetFromRoot(options.projectRoot),
+    }
+  );
+
+  if (!options.publishable && !options.buildable) {
+    host.delete(`${options.projectRoot}/package.json`);
+  }
+}

packages/preact/src/generators/library/lib/normalize-options.ts

@@ -0,0 +1,43 @@
+import { Tree } from '@nx/devkit';
+import { NormalizedSchema, PreactLibrarySchema } from '../schema';
+import {
+  determineProjectNameAndRootOptions,
+  ensureProjectName
+} from '@nx/devkit/src/generators/project-name-and-root-utils';
+
+export async function normalizeOptions(
+  tree: Tree,
+  options: PreactLibrarySchema
+): Promise<NormalizedSchema> {
+  await ensureProjectName(tree, options, 'library');
+  const {
+    projectName,
+    names: projectNames,
+    projectRoot,
+    importPath,
+  } = await determineProjectNameAndRootOptions(tree, {
+    name: options.name,
+    projectType: 'library',
+    directory: options.directory,
+    importPath: options.importPath,
+    rootProject: false,
+  });
+  const fileName =
+    /* options.simpleName
+    ? projectNames.projectSimpleName
+    :  */ projectNames.projectFileName;
+
+  const parsedTags = options.tags
+    ? options.tags.split(',').map((s) => s.trim())
+    : [];
+
+  return {
+    ...options,
+    projectName,
+    projectRoot,
+    parsedTags,
+    fileName,
+    projectDirectory: projectRoot,
+    importPath,
+  };
+}

packages/preact/src/generators/library/lib/update-npm-scope.ts

@@ -0,0 +1,18 @@
+import { Tree, updateJson } from '@nx/devkit';
+import { NormalizedSchema } from '../schema';
+
+export function updateNpmScopeIfBuildableOrPublishable(
+  host: Tree,
+  options: NormalizedSchema
+) {
+  if (options.buildable || options.publishable) {
+    updateLibPackageNpmScope(host, options);
+  }
+}
+
+function updateLibPackageNpmScope(host: Tree, options: NormalizedSchema) {
+  return updateJson(host, `${options.projectRoot}/package.json`, (json) => {
+    json.name = options.importPath;
+    return json;
+  });
+}