feat: enforce and normalize package dependencies

change/@fluentui-contrib-azure-theme-fbc70169-fe55-4268-9318-43cf8b9bac0e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/azure-theme",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-houdini-utils-5d21256e-0883-4348-98ca-781ad00cb31c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/houdini-utils",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-pierce-dom-7aa51c12-d109-4d9a-843d-fc27672d0b98.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/pierce-dom",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-chat-599eff36-ad2c-484e-891f-6e443f7d795c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-chat",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-data-grid-react-window-d86043b0-c49d-4132-b499-fe3b2d8dbc1d.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-data-grid-react-window",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-data-grid-react-window-grid-3bfeef1a-452a-4fb1-a424-6bdb57fb7d8c.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-data-grid-react-window-grid",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-draggable-dialog-59c6b320-b3ca-4be4-bb2a-a72d872c5a6d.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-draggable-dialog",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-gamepad-navigation-6beeb604-67a3-4432-b55a-564e2c4d8f83.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-gamepad-navigation",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-interactive-tab-ace7932a-adfc-4f23-8bf4-e401844d3955.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-interactive-tab",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-keytips-55d49519-8b48-4d1d-99ea-1d8bceaccef2.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-keytips",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-resize-handle-d98cb8e5-088e-4f21-bc99-45976abfe791.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-resize-handle",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-themeless-provider-67126431-1943-4ab5-9536-cf9b2c627a76.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-themeless-provider",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-react-tree-grid-d501cc79-17d5-460b-b2ae-6c136995b8ca.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/react-tree-grid",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-stylelint-plugin-d571b89b-5828-4598-bd89-08d522c9f44e.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/stylelint-plugin",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-teams-components-c4004edf-c605-4a49-90b1-9f08c9b0edd8.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/teams-components",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

change/@fluentui-contrib-variant-theme-1347c744-6f0d-42c4-ae1b-6d9b610d5d06.json

@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix: normalize package dependencies",
+  "packageName": "@fluentui-contrib/variant-theme",
+  "email": "hochelmartin@gmail.com",
+  "dependentChangeType": "patch"
+}

eslint.config.js

@@ -1,6 +1,5 @@
 const prettierConfig = require('eslint-config-prettier');
 const nxEslintPlugin = require('@nx/eslint-plugin');
-const eslintPluginImport = require('eslint-plugin-import');
 const rnxKitEslintPlugin = require('@rnx-kit/eslint-plugin');
 const stylisticPlugin = require('@stylistic/eslint-plugin');
 const jsonParser = require('jsonc-eslint-parser');
@@ -26,7 +25,6 @@ module.exports = [
   {
     plugins: {
       '@nx': nxEslintPlugin,
-      import: eslintPluginImport,
       '@rnx-kit': rnxKitEslintPlugin,
       '@stylistic': stylisticPlugin,
     },
@@ -67,20 +65,6 @@ module.exports = [
       '@rnx-kit/no-export-all': 'error',
     },
   },
-  {
-    files: ['**/*.ts?(x)', '**/*.js?(x)'],
-    rules: { 'import/no-extraneous-dependencies': ['error'] },
-    ignores: [
-      '**/*.test.[jt]s?(x)',
-      '**/*.spec.[jt]s?(x)',
-      '**/*.stories.[jt]s?(x)',
-      '**/*.component-browser-spec.tsx',
-      '**/generators/**/files/**',
-      '**/.storybook/**',
-      '**/playwright.config.ts',
-      '**/playwright/**',
-    ],
-  },
   {
     files: ['**/*.spec.[jt]s?(x)', '**/*.test.[jt]s?(x)'],
     languageOptions: {
@@ -136,6 +120,25 @@ module.exports = [
     languageOptions: {
       parser: jsonParser,
     },
-    rules: {},
+    rules: {
+      '@nx/dependency-checks': [
+        'error',
+        {
+          includeTransitiveDependencies: false,
+          ignoredDependencies: [
+            '@types/react',
+            '@types/react-dom',
+            '@swc/helpers',
+          ],
+          ignoredFiles: [
+            '{projectRoot}/playwright.config.ts',
+            '{projectRoot}/playwright/**',
+            '{projectRoot}/.storybook/**',
+            '{projectRoot}/stories/**',
+            '{projectRoot}/**/*.component-browser-spec.tsx',
+          ],
+        },
+      ],
+    },
   },
 ];

package.json

@@ -78,7 +78,6 @@
     "beachball": "^2.33.2",
     "eslint": "9.21.0",
     "eslint-config-prettier": "10.0.2",
-    "eslint-plugin-import": "2.31.0",
     "eslint-plugin-playwright": "2.2.0",
     "globals": "15.15.0",
     "jest": "29.7.0",

packages/azure-theme/package.json

@@ -2,7 +2,6 @@
   "name": "@fluentui-contrib/azure-theme",
   "version": "0.1.0",
   "dependencies": {
-    "@fluentui/react-icons": ">=2.0.204 <3.0.0",
     "@swc/helpers": "~0.5.2"
   },
   "main": "./src/index.js",
@@ -14,11 +13,6 @@
     ]
   },
   "peerDependencies": {
-    "@fluentui/react-components": ">=9.46.3 <10.0.0",
-    "@fluentui/react-icons": ">=2.0.204 <3.0.0",
-    "@types/react": ">=16.8.0 <19.0.0",
-    "@types/react-dom": ">=16.8.0 <19.0.0",
-    "react": ">=16.8.0 <19.0.0",
-    "react-dom": ">=16.8.0 <19.0.0"
+    "@fluentui/react-components": ">=9.46.3 <10.0.0"
   }
 }

packages/azure-theme/project.json

@@ -16,7 +16,8 @@
       "options": {
         "lintFilePatterns": [
           "packages/azure-theme/**/*.ts",
-          "packages/azure-theme/**/*.tsx"
+          "packages/azure-theme/**/*.tsx",
+          "packages/azure-theme/package.json"
         ]
       }
     },

packages/houdini-utils/package.json

@@ -5,12 +5,5 @@
     "@swc/helpers": "~0.5.2"
   },
   "main": "./src/index.js",
-  "typings": "./src/index.d.ts",
-  "peerDependencies": {
-    "@fluentui/react-components": ">=9.46.3 <10.0.0",
-    "@types/react": ">=16.8.0 <19.0.0",
-    "@types/react-dom": ">=16.8.0 <19.0.0",
-    "react": ">=16.8.0 <19.0.0",
-    "react-dom": ">=16.8.0 <19.0.0"
-  }
+  "typings": "./src/index.d.ts"
 }

packages/houdini-utils/project.json

@@ -16,7 +16,8 @@
       "options": {
         "lintFilePatterns": [
           "packages/houdini-utils/**/*.ts",
-          "packages/houdini-utils/**/*.tsx"
+          "packages/houdini-utils/**/*.tsx",
+          "packages/houdini-utils/package.json"
         ]
       }
     },

packages/nx-plugin/project.json

@@ -45,8 +45,7 @@
           "packages/nx-plugin/**/*.ts",
           "packages/nx-plugin/package.json",
           "packages/nx-plugin/generators.json",
-          "packages/nx-plugin/executors.json",
-          "packages/nx-plugin/package.json"
+          "packages/nx-plugin/executors.json"
         ]
       }
     },

packages/nx-plugin/src/generators/component/generator.spec.ts

@@ -1,5 +1,11 @@
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
-import { Tree, joinPathFragments, readProjectConfiguration } from '@nx/devkit';
+import {
+  Tree,
+  joinPathFragments,
+  readJson,
+  readProjectConfiguration,
+  workspaceRoot,
+} from '@nx/devkit';
 
 import libraryGenerator from '../library/generator';
 import {
@@ -9,6 +15,7 @@ import {
 
 import generator from './generator';
 import { ComponentGeneratorSchema } from './schema';
+import { getPackagePaths } from '../../utils';
 
 describe('component generator', () => {
   let tree: Tree;
@@ -68,4 +75,24 @@ describe('component generator', () => {
       "
     `);
   });
+
+  describe(`package.json`, () => {
+    it('should update peer dependencies', async () => {
+      const config = readProjectConfiguration(tree, options.name);
+      const paths = getPackagePaths(workspaceRoot, config.root);
+      let pkgJson = readJson(tree, paths.packageJson);
+
+      expect(pkgJson.peerDependencies).toEqual(undefined);
+
+      await generator(tree, options);
+
+      pkgJson = readJson(tree, paths.packageJson);
+
+      expect(pkgJson.peerDependencies).toEqual({
+        '@fluentui/react-components': '>=9.46.3 <10.0.0',
+        '@types/react': '>=16.8.0 <19.0.0',
+        react: '>=16.8.0 <19.0.0',
+      });
+    });
+  });
 });

packages/nx-plugin/src/generators/component/generator.ts

@@ -2,6 +2,7 @@ import { formatFiles, generateFiles, Tree, workspaceRoot } from '@nx/devkit';
 import * as path from 'path';
 import { ComponentGeneratorSchema } from './schema';
 import { getPackagePaths, getProject, npmScope } from '../../utils';
+import { updateDependencies } from './update-dependencies';
 
 export default async function (tree: Tree, options: ComponentGeneratorSchema) {
   const { name, componentName } = options;
@@ -25,5 +26,8 @@ export default async function (tree: Tree, options: ComponentGeneratorSchema) {
     '\n' +
     main;
   tree.write(paths.main, main);
+
+  updateDependencies(tree, { paths });
+
   await formatFiles(tree);
 }

packages/nx-plugin/src/generators/component/update-dependencies.ts

@@ -0,0 +1,41 @@
+import { readJson, updateJson, type Tree } from '@nx/devkit';
+import { getPackagePaths, type PackageJson } from '../../utils';
+
+function getReactComponentsVersion(tree: Tree): string {
+  const monorepoRootPkgJson: PackageJson = readJson(tree, '/package.json');
+  const { dependencies = {}, devDependencies = {} } = monorepoRootPkgJson;
+  const reactComponentsVersion =
+    dependencies['@fluentui/react-components'] ||
+    devDependencies['@fluentui/react-components'];
+
+  if (!reactComponentsVersion) {
+    throw new Error(
+      '🚨 Could not find @fluentui/react-components in package.json. please report this issue'
+    );
+  }
+
+  // strip version ranges non-numeric characters
+  return reactComponentsVersion.replace(/^[~^]/, '');
+}
+
+export function updateDependencies(
+  tree: Tree,
+  options: { paths: ReturnType<typeof getPackagePaths> }
+) {
+  const reactComponentsVersion = getReactComponentsVersion(tree);
+  const peerDeps = {
+    '@fluentui/react-components': `>=${reactComponentsVersion} <10.0.0`,
+    '@types/react': '>=16.8.0 <19.0.0',
+    react: '>=16.8.0 <19.0.0',
+  };
+
+  updateJson(tree, options.paths.packageJson, (packageJson) => {
+    packageJson.peerDependencies = packageJson.peerDependencies ?? {};
+
+    Object.assign(packageJson.peerDependencies, peerDeps);
+
+    return packageJson;
+  });
+
+  return tree;
+}