Inline plugin version checks, remove versions.ts

simondotm · Apr 1, 2024 · 5003a12 · 5003a12
1 parent 172bdb5
commit 5003a12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/nx-firebase/src/utils/index.ts b/packages/nx-firebase/src/utils/index.ts
@@ -1,4 +1,3 @@
-export * from './versions'
 export * from './workspace'
 export * from './update-tsconfig'
 export * from './project-name'

diff --git a/packages/nx-firebase/src/utils/versions.ts b/packages/nx-firebase/src/utils/versions.ts
diff --git a/packages/nx-firebase/src/utils/workspace.ts b/packages/nx-firebase/src/utils/workspace.ts
@@ -1,5 +1,8 @@
 import { logger, readJsonFile, workspaceRoot } from '@nx/devkit'
-import { pluginNxVersion, pluginNxVersionMajor } from './versions'
+import { packageVersions } from '../__generated__/nx-firebase-versions'
+
+// Declare target version of Nx that the plugin is currently compatible with
+export const pluginNxVersion = `^${packageVersions.nx}`
 
 type PackageJson = {
   dependencies: {
@@ -49,10 +52,11 @@ function readNxWorkspaceVersion(): WorkspaceVersion {
 export const workspaceNxVersion = readNxWorkspaceVersion()
 
 export function checkNxVersion() {
+  const pluginNxVersionMajor = parseInt(packageVersions.nx.split('.')[0])
   if (workspaceNxVersion) {
-    if (workspaceNxVersion.major > pluginNxVersionMajor) {
+    if (workspaceNxVersion.major !== pluginNxVersionMajor) {
       logger.warn(
-        `WARNING: @simondotm/nx-firebase plugin for Nx version (${pluginNxVersion}) may not be compatible with your version of Nx (${workspaceNxVersion.version})`,
+        `WARNING: @simondotm/nx-firebase plugin v${packageVersions.pluginVersion} was built for Nx major version ${pluginNxVersion}, and may not be compatible with your version of Nx (${workspaceNxVersion.version})`,
       )
     }
   } else {