fix: Remove gqm code from dist (#57)

* fix: Remove gqm code from dist * fix linting
smartive · Sep 6, 2023 · e4d28db · e4d28db
1 parent 9046c0e
commit e4d28db
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 7 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -14,7 +14,7 @@
  {
  "files": ["*.ts", "*.tsx"],
  "parserOptions": {
- "project": ["./tsconfig.json"]
+ "project": ["./tsconfig.eslint.json"]
  }
  }
  ]

diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
  "build": "npm run build:esm && npm run build:cjs && npm run build:bin",
  "build:esm": "tsc",
  "build:cjs": "esbuild src/index.ts --bundle --platform=node --outdir=dist/cjs --out-extension:.js=.cjs --format=cjs --packages=external",
- "build:bin": "esbuild src/bin/gqm.ts --bundle --platform=node --outdir=dist/bin --out-extension:.js=.cjs --format=cjs --packages=external"
+ "build:bin": "esbuild src/bin/gqm/index.ts --bundle --platform=node --outdir=dist/bin --out-extension:.js=.cjs --format=cjs --packages=external"
  },
  "bin": {
  "gqm": "dist/bin/gqm.cjs"

diff --git a/src/gqm/codegen.ts → src/bin/gqm/codegen.ts b/src/gqm/codegen.ts → src/bin/gqm/codegen.ts
diff --git a/src/bin/gqm.ts → src/bin/gqm/index.ts b/src/bin/gqm.ts → src/bin/gqm/index.ts
@@ -11,7 +11,7 @@ import {
  generateMutations,
  getMigrationDate,
  printSchemaFromModels,
-} from '..';
+} from '../..';
 import { generateGraphqlApiTypes, generateGraphqlClientTypes } from '../gqm/codegen';
 import { KNEXFILE_PATH, parseKnexfile } from '../gqm/parse-knexfile';
 import { parseModels } from '../gqm/parse-models';
@@ -115,7 +115,7 @@ program
  .action(async () => {
  const git = simpleGit();
 
- let name = process.argv[2] || (await git.branch()).current.split('/').pop();
+ let name = process.argv[process.argv.indexOf('gqm') + 1] || (await git.branch()).current.split('/').pop();
 
  if (name && ['staging', 'production'].includes(name)) {
  name = await readLine('Migration name:');

diff --git a/src/gqm/parse-knexfile.ts → src/bin/gqm/parse-knexfile.ts b/src/gqm/parse-knexfile.ts → src/bin/gqm/parse-knexfile.ts
diff --git a/src/gqm/parse-models.ts → src/bin/gqm/parse-models.ts b/src/gqm/parse-models.ts → src/bin/gqm/parse-models.ts
@@ -1,5 +1,5 @@
 import { IndentationText, Project } from 'ts-morph';
-import { RawModels } from '..';
+import { RawModels } from '../..';
 import { getSetting, writeToFile } from './settings';
 import { staticEval } from './static-eval';
 import { findDeclarationInFile } from './utils';

diff --git a/src/gqm/readline.ts → src/bin/gqm/readline.ts b/src/gqm/readline.ts → src/bin/gqm/readline.ts
diff --git a/src/gqm/settings.ts → src/bin/gqm/settings.ts b/src/gqm/settings.ts → src/bin/gqm/settings.ts
diff --git a/src/gqm/static-eval.ts → src/bin/gqm/static-eval.ts b/src/gqm/static-eval.ts → src/bin/gqm/static-eval.ts
diff --git a/src/gqm/templates.ts → src/bin/gqm/templates.ts b/src/gqm/templates.ts → src/bin/gqm/templates.ts
diff --git a/src/gqm/utils.ts → src/bin/gqm/utils.ts b/src/gqm/utils.ts → src/bin/gqm/utils.ts
diff --git a/src/gqm/visitor.ts → src/bin/gqm/visitor.ts b/src/gqm/visitor.ts → src/bin/gqm/visitor.ts
@@ -1,5 +1,5 @@
 import { KindToNodeMappings, Node, SyntaxKind } from 'ts-morph';
-import { get } from '..';
+import { get } from '../..';
 
 export type Visitor<T, C> = {
  undefined?: () => T;

diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
@@ -0,0 +1,4 @@
+{
+ "extends": "./tsconfig.json",
+ "exclude": ["node_modules", "dist"],
+}
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
  "include": ["./src/**/*.ts", "./src/**/*.tsx"],
- "exclude": ["node_modules", "dist"],
+ "exclude": ["node_modules", "dist", "src/bin"],
  "compilerOptions": {
  "outDir": "./dist/esm",
  "rootDir": "./src",