Skip to content

Commit

Permalink
Merge pull request #23 from fabrix-app/v1.5
Browse files Browse the repository at this point in the history
[feat] archetype
  • Loading branch information
scott-wyatt authored Sep 23, 2018
2 parents ca2537b + 1c729ce commit 986e276
Show file tree
Hide file tree
Showing 8 changed files with 416 additions and 18 deletions.
8 changes: 4 additions & 4 deletions lib/archetype/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
"dist"
],
"dependencies": {
"@fabrix/fabrix": "^1",
"@fabrix/spool-router": "^1"
"@fabrix/fabrix": "^1.5",
"@fabrix/spool-router": "^1.5"
},
"devDependencies": {
"@fabrix/spool-repl": "^1",
"@fabrix/spool-repl": "^1.5",
"@fabrix/lint": "^1.0.0-alpha.3",
"@types/node": "~10.3.4",
"mocha": "^5",
"nyc": "^12.0.2",
"nyc": "^13.0.1",
"supertest": "^3",
"tslib": "~1.9.0",
"tslint": "~5.10.0",
Expand Down
8 changes: 4 additions & 4 deletions lib/archetype/src/index.ts
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as pkg from '../package.json'
import * as config from './config'
import * as api from './api'
import * as config from './config/index'
import * as pkg from '../package.json'
import * as api from './api/index'

export {
pkg,
config,
pkg,
api
}
12 changes: 9 additions & 3 deletions lib/archetype/src/server.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
/**
* @module server
*
* Fabrix framework.
*/

import { FabrixApp } from '@fabrix/fabrix'
import * as App from '.'

import * as app from '.'
const server = new FabrixApp(app)
const app = new FabrixApp(App)

export default server.start()
app.start().catch(app.stop)
File renamed without changes.
8 changes: 4 additions & 4 deletions lib/archetype/test/mocha.opts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
--reporter spec
--recursive
--full-trace
--no-exit
--check-leaks
--globals app
--timeout 5000
--timeout 1200000
--globals app,shopID,shopProducts,__core-js_shared__,__coverage__,$$bole

test/setup.js
test/**/*.test.js
test/index.js test/**/*.test.js
Loading

0 comments on commit 986e276

Please sign in to comment.