fix: resolve conflicts

fbi-js · Sep 20, 2020 · 5f6c899 · 5f6c899
2 parents 35b6d76 + 0643c67
commit 5f6c899
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/.fbi.config.js b/.fbi.config.js
@@ -1,7 +1,7 @@
 module.exports = {
   factory: {
-    id: 'factory-node',
-    version: '',
+    id: 'factory-factory',
+    version: '0.1',
     template: 'factory',
     features: { typescript: true }
   }

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -8,9 +8,9 @@ import TemplateAdmin from './templates/admin';
 import TemplateApi from './templates/api/index';
 import TemplateDalBasic from './templates/dal-basic';
 export default class FactoryNode extends Factory {
-    id: string;
-    description: string;
-    commands: (CommandBuild | CommandServe | CommandDb | CommandGenerate)[];
-    templates: (TemplateGraphql | TemplateAdmin | TemplateApi | TemplateDalBasic)[];
-    execOpts: any;
+  id: string;
+  description: string;
+  commands: (CommandBuild | CommandServe | CommandDb | CommandGenerate)[];
+  templates: (TemplateGraphql | TemplateAdmin | TemplateApi | TemplateDalBasic)[];
+  execOpts: any;
 }
diff --git a/package.json b/package.json
@@ -14,16 +14,15 @@
   "dependencies": {
     "create-nexus-type": "^1.1.7",
     "dotenv": "^8.2.0",
-    "ejs": "^3.0.1",
-    "fbi": "^4.0.2",
-    "prisma2": "2.0.0-preview023",
-    "ts-node": "9.0.0",
+    "ejs": "^3.1.5",
+    "fbi": "4.0.2",
+    "ts-node": "^9.0.0",
     "ts-node-dev": "1.0.0-pre.62",
     "tslib": "^2.0.1",
-    "typescript": "^3.9.7"
+    "typescript": "^4.0.3"
   },
   "devDependencies": {
-    "@types/node": "^13.7.6",
-    "@types/ejs": "^3.0.1"
+    "@types/node": "^14.11.1",
+    "@types/ejs": "^3.0.4"
   }
 }