Merge pull request #25 from fabrix-app/v1.5

[feat] archetype
fabrix-app · Sep 29, 2018 · 5d94525 · 5d94525
2 parents c3d2893 + b3eeb2e
commit 5d94525
Show file tree

Hide file tree

Showing 37 changed files with 12 additions and 39 deletions.
diff --git a/.npmignore b/.npmignore
@@ -7,3 +7,5 @@ test-performance/
 .istanbul.yml
 .travis.yml
 appveyor.yml
+.circleci
+.idea
diff --git a/lib/archetype/.gitignore → archetype/.gitignore b/lib/archetype/.gitignore → archetype/.gitignore
diff --git a/lib/archetype/package.json → archetype/package.json b/lib/archetype/package.json → archetype/package.json
@@ -14,9 +14,6 @@
   },
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
   "dependencies": {
     "@fabrix/fabrix": "^1.5",
     "@fabrix/spool-router": "^1.5"

diff --git a/lib/archetype/src/api/controllers/index.ts → archetype/src/api/controllers/index.ts b/lib/archetype/src/api/controllers/index.ts → archetype/src/api/controllers/index.ts
diff --git a/lib/archetype/src/api/index.ts → archetype/src/api/index.ts b/lib/archetype/src/api/index.ts → archetype/src/api/index.ts
diff --git a/lib/archetype/src/api/models/index.ts → archetype/src/api/models/index.ts b/lib/archetype/src/api/models/index.ts → archetype/src/api/models/index.ts
diff --git a/lib/archetype/src/api/policies/index.ts → archetype/src/api/policies/index.ts b/lib/archetype/src/api/policies/index.ts → archetype/src/api/policies/index.ts
diff --git a/lib/archetype/src/api/resolvers/index.ts → archetype/src/api/resolvers/index.ts b/lib/archetype/src/api/resolvers/index.ts → archetype/src/api/resolvers/index.ts
diff --git a/lib/archetype/src/api/services/index.ts → archetype/src/api/services/index.ts b/lib/archetype/src/api/services/index.ts → archetype/src/api/services/index.ts
diff --git a/...etype/src/config/env/development/index.ts → ...etype/src/config/env/development/index.ts b/...etype/src/config/env/development/index.ts → ...etype/src/config/env/development/index.ts
diff --git a/lib/archetype/src/config/env/index.ts → archetype/src/config/env/index.ts b/lib/archetype/src/config/env/index.ts → archetype/src/config/env/index.ts
diff --git a/...archetype/src/config/env/staging/index.ts → archetype/src/config/env/production/index.ts b/...archetype/src/config/env/staging/index.ts → archetype/src/config/env/production/index.ts
diff --git a/...archetype/src/config/env/testing/index.ts → archetype/src/config/env/staging/index.ts b/...archetype/src/config/env/testing/index.ts → archetype/src/config/env/staging/index.ts
diff --git a/archetype/src/config/env/testing/index.ts b/archetype/src/config/env/testing/index.ts
@@ -0,0 +1 @@
+export {}
diff --git a/lib/archetype/src/config/i18n.ts → archetype/src/config/i18n.ts b/lib/archetype/src/config/i18n.ts → archetype/src/config/i18n.ts
diff --git a/lib/archetype/src/config/index.ts → archetype/src/config/index.ts b/lib/archetype/src/config/index.ts → archetype/src/config/index.ts
diff --git a/lib/archetype/src/config/locales/en.json → archetype/src/config/locales/en.json b/lib/archetype/src/config/locales/en.json → archetype/src/config/locales/en.json
diff --git a/lib/archetype/src/config/log.ts → archetype/src/config/log.ts b/lib/archetype/src/config/log.ts → archetype/src/config/log.ts
diff --git a/lib/archetype/src/config/main.ts → archetype/src/config/main.ts b/lib/archetype/src/config/main.ts → archetype/src/config/main.ts
diff --git a/lib/archetype/src/config/models.ts → archetype/src/config/models.ts b/lib/archetype/src/config/models.ts → archetype/src/config/models.ts
diff --git a/lib/archetype/src/config/routes.ts → archetype/src/config/routes.ts b/lib/archetype/src/config/routes.ts → archetype/src/config/routes.ts
diff --git a/lib/archetype/src/config/stores.ts → archetype/src/config/stores.ts b/lib/archetype/src/config/stores.ts → archetype/src/config/stores.ts
diff --git a/lib/archetype/src/config/web.ts → archetype/src/config/web.ts b/lib/archetype/src/config/web.ts → archetype/src/config/web.ts
diff --git a/lib/archetype/src/index.ts → archetype/src/index.ts b/lib/archetype/src/index.ts → archetype/src/index.ts
diff --git a/lib/archetype/src/server.ts → archetype/src/server.ts b/lib/archetype/src/server.ts → archetype/src/server.ts
@@ -5,7 +5,7 @@
  */
 
 import { FabrixApp } from '@fabrix/fabrix'
-import * as App from '.'
+import * as App from './'
 
 const app = new FabrixApp(App)
 

diff --git a/lib/archetype/src/tsconfig.json → archetype/src/tsconfig.json b/lib/archetype/src/tsconfig.json → archetype/src/tsconfig.json
diff --git a/lib/archetype/src/tsconfig.release.json → archetype/src/tsconfig.release.json b/lib/archetype/src/tsconfig.release.json → archetype/src/tsconfig.release.json
diff --git a/lib/archetype/src/tslint.json → archetype/src/tslint.json b/lib/archetype/src/tslint.json → archetype/src/tslint.json
diff --git a/lib/archetype/src/typings/index.d.ts → archetype/src/typings/index.d.ts b/lib/archetype/src/typings/index.d.ts → archetype/src/typings/index.d.ts
diff --git a/lib/archetype/test/index.js → archetype/test/index.js b/lib/archetype/test/index.js → archetype/test/index.js
diff --git a/...hetype/test/integration/FabrixApp.test.js → archetype/test/integration/FabrixApp.test.js b/...hetype/test/integration/FabrixApp.test.js → archetype/test/integration/FabrixApp.test.js
diff --git a/lib/archetype/test/mocha.opts → archetype/test/mocha.opts b/lib/archetype/test/mocha.opts → archetype/test/mocha.opts
diff --git a/lib/archetype/src/config/env/production/index.ts b/lib/archetype/src/config/env/production/index.ts
diff --git a/lib/archetype/src/config/env/production/log.ts b/lib/archetype/src/config/env/production/log.ts
diff --git a/lib/tsconfig.json b/lib/tsconfig.json
@@ -24,11 +24,8 @@
     "**/*.ts",
     "index.ts"
   ],
-  "exclude": [
-    "archetype/**/*.ts"
-  ],
   "paths": {
     "@fabrix/*": ["./*"],
-    "@fabrix/fabrix": ["./Farbix"]
+    "@fabrix/fabrix": ["./index"]
   }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fabrix/fabrix",
-  "version": "1.5.5",
+  "version": "1.5.7",
   "description": "Strongly Typed Modern Web Application Framework for Node.js",
   "keywords": [
     "framework",
@@ -20,6 +20,8 @@
     "fabrix.ts",
     "typescript",
     "server",
+    "cqrs",
+    "event-sourcing",
     "graphql"
   ],
   "scripts": {
@@ -29,15 +31,15 @@
     "test": "npm run clean && npm run lint && npm run build && nyc mocha",
     "test-performance": "mocha test-performance",
     "prepublishOnly": "npm run compile",
-    "compile": "npm run clean && npm run archetype && npm run build",
+    "compile": "npm run clean && npm run build",
     "clean": "rm -rf dist",
-    "archetype": "copyfiles -u 1 -a ./lib/archetype/* -a ./lib/archetype/**/* -a ./lib/archetype/**/**/* -a ./lib/archetype/**/**/**/* ./dist/",
     "ci": "cd .. && ci"
   },
   "main": "dist/index",
   "typings": "dist/index",
   "files": [
-    "dist"
+    "dist",
+    "archetype"
   ],
   "pre-commit": [
     "test"