feat(core): #6 support for SVP

nx-dotnet · Apr 29, 2021 · 4bbe390 · 4bbe390
1 parent b28ee64
commit 4bbe390
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 18 deletions.
diff --git a/packages/core/src/generators/init/generator.ts b/packages/core/src/generators/init/generator.ts
@@ -5,21 +5,20 @@ import {
   Tree,
   writeJson,
 } from '@nrwl/devkit';
+import { CONFIG_FILE_PATH, NxDotnetConfig } from '@nx-dotnet/utils';
 
 export default async function (host: Tree) {
-  const initialized = host.isFile('nx-dotnet.config.js');
-  if (initialized) {
-    return;
-  }
+  const initialized = host.isFile(CONFIG_FILE_PATH);
 
-  host.write(
-    'nx-dotnet.config.js',
-    `
-module.exports = {
+  let configObject: NxDotnetConfig = initialized
+    ? readJson(host, CONFIG_FILE_PATH)
+    : {
+        nugetPackages: {},
+      };
 
-}
-  `
-  );
+  configObject.nugetPackages = configObject.nugetPackages || {};
+
+  host.write(CONFIG_FILE_PATH, JSON.stringify(configObject, null, 2));
 
   updateNxJson(host);
   updateGitIgnore(host);

diff --git a/packages/utils/src/lib/constants/index.ts b/packages/utils/src/lib/constants/index.ts
@@ -0,0 +1 @@
+export * from './paths';
diff --git a/packages/utils/src/lib/constants/paths.ts b/packages/utils/src/lib/constants/paths.ts
@@ -0,0 +1 @@
+export const CONFIG_FILE_PATH = '.nx-dotnet.rc.json';
diff --git a/packages/utils/src/lib/index.ts b/packages/utils/src/lib/index.ts
@@ -1,7 +1,3 @@
-export * from './args';
-export * from './executors';
-export * from './glob';
-export * from './parameters';
-export * from './rimraf';
-export * from './workspace';
+export * from './constants';
 export * from './models';
+export * from './utility-functions';
diff --git a/packages/utils/src/lib/models/index.ts b/packages/utils/src/lib/models/index.ts
@@ -1 +1,2 @@
 export * from './cmd-line-parameter';
+export * from './nx-dotnet-config.interface';
diff --git a/packages/utils/src/lib/models/nx-dotnet-config.interface.ts b/packages/utils/src/lib/models/nx-dotnet-config.interface.ts
@@ -0,0 +1,8 @@
+export interface NxDotnetConfig {
+  /**
+   * Map of package -> version, used for Single Version Principle.
+   */
+  nugetPackages: {
+    [key: string]: string;
+  };
+}
diff --git a/packages/utils/src/lib/args.ts → ...s/utils/src/lib/utility-functions/args.ts b/packages/utils/src/lib/args.ts → ...s/utils/src/lib/utility-functions/args.ts
diff --git a/packages/utils/src/lib/executors.ts → ...ls/src/lib/utility-functions/executors.ts b/packages/utils/src/lib/executors.ts → ...ls/src/lib/utility-functions/executors.ts
diff --git a/packages/utils/src/lib/glob.ts → ...s/utils/src/lib/utility-functions/glob.ts b/packages/utils/src/lib/glob.ts → ...s/utils/src/lib/utility-functions/glob.ts
diff --git a/packages/utils/src/lib/utility-functions/index.ts b/packages/utils/src/lib/utility-functions/index.ts
@@ -0,0 +1,6 @@
+export * from './args';
+export * from './executors';
+export * from './glob';
+export * from './parameters';
+export * from './rimraf';
+export * from './workspace';
diff --git a/packages/utils/src/lib/parameters.ts → ...s/src/lib/utility-functions/parameters.ts b/packages/utils/src/lib/parameters.ts → ...s/src/lib/utility-functions/parameters.ts
@@ -1,4 +1,4 @@
-import { cmdLineParameter } from './models';
+import { cmdLineParameter } from '../models';
 
 /**
  * Transforms an array of cmdLineParameter into a string.

diff --git a/packages/utils/src/lib/rimraf.ts → ...utils/src/lib/utility-functions/rimraf.ts b/packages/utils/src/lib/rimraf.ts → ...utils/src/lib/utility-functions/rimraf.ts
diff --git a/packages/utils/src/lib/utils.spec.ts → ...s/src/lib/utility-functions/utils.spec.ts b/packages/utils/src/lib/utils.spec.ts → ...s/src/lib/utility-functions/utils.spec.ts
diff --git a/packages/utils/src/lib/workspace.ts → ...ls/src/lib/utility-functions/workspace.ts b/packages/utils/src/lib/workspace.ts → ...ls/src/lib/utility-functions/workspace.ts
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const CONFIG_FILE_PATH = '.nx-dotnet.rc.json';
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export * from './cmd-line-parameter';
		export * from './nx-dotnet-config.interface';