update deps checking configs

electrovir · Oct 11, 2023 · 2e44d97 · 2e44d97
1 parent 25a8d3a
commit 2e44d97
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/configs/configs/dep-cruiser.config.ts b/configs/configs/dep-cruiser.config.ts
@@ -1,7 +1,7 @@
 import type {IConfiguration} from 'dependency-cruiser';
 import {generateDepCruiserConfig} from 'virmator/dist/compiled-base-configs/base-dep-cruiser.config';
 
-const depCruiserConfig: IConfiguration = generateDepCruiserConfig({
+const baseConfig = generateDepCruiserConfig({
     fileExceptions: {
         // enter file exceptions by rule name here
         'no-orphans': {
@@ -15,4 +15,8 @@ const depCruiserConfig: IConfiguration = generateDepCruiserConfig({
     ],
 });
 
+const depCruiserConfig: IConfiguration = {
+    ...baseConfig,
+};
+
 module.exports = depCruiserConfig;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "virmator",
-    "version": "9.1.0",
+    "version": "9.1.1",
     "description": "Handle common package configs, commands, and dependencies.",
     "keywords": [
         "automation",

diff --git a/src/commands/deps.command.ts b/src/commands/deps.command.ts
@@ -111,6 +111,10 @@ export const depsCommandDefinition = defineCommand(
 
             const npmWorkspaces = await getNpmPackages(repoDir);
 
+            const otherFlags = filteredInputArgs.filter(
+                (arg) => arg.startsWith('-') && arg !== '--serial',
+            );
+
             const nonFlagInputs = filteredInputArgs.filter((arg) => !arg.startsWith('-'));
 
             const serial = filteredInputArgs.some((arg) => arg === '--serial');
@@ -132,6 +136,7 @@ export const depsCommandDefinition = defineCommand(
                     '--config',
                     compiledConfigPath,
                     ...pathsToCheck,
+                    ...otherFlags,
                 ].filter(isTruthy),
                 async postExecute() {
                     await unlink(compiledConfigPath);

diff --git a/src/compiled-base-configs/base-dep-cruiser.config.ts b/src/compiled-base-configs/base-dep-cruiser.config.ts
@@ -101,6 +101,9 @@ export function generateDepCruiserConfig({
                     'npm-no-pkg',
                     'npm-unknown',
                 ],
+                pathNot: [
+                    '^src/',
+                ],
             },
         },
         {
@@ -127,10 +130,14 @@ export function generateDepCruiserConfig({
                 // as it's pretty common to have a type import be a type only import
                 // _and_ (e.g.) a devDependency - don't consider type-only dependency
                 // types for this rule
-                // dependencyTypesNot: ['type-only'],
+                dependencyTypesNot: [
+                    'type-only',
+                ],
+                pathNot: [
+                    '^src/',
+                ],
             },
         },
-
         /* rules you might want to tweak for your specific situation: */
         {
             name: 'not-to-spec',