1
0
mirror of https://github.com/stolksdorf/homebrewery.git synced 2025-12-11 07:45:56 +00:00

Updating build scripts and libraries

This commit is contained in:
Scott Tolksdorf
2018-04-08 23:36:26 -04:00
parent ed1b5252be
commit 78ad4bea09
5 changed files with 3474 additions and 2820 deletions

View File

@@ -23,6 +23,8 @@ You can use issue labels to discover issues you could help out with:
If you're updating dependencies, please make sure you use npm@5.6.0 and commit the updated `package-lock.json` file.
You can also refer to the [Development Roadmap on Trello](https://trello.com/b/q6kE29F8/development-roadmap)
## Submitting an issue

6237
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -22,10 +22,10 @@
"eslintIgnore": [
"build/*"
],
"pico-check":{
"pico-check": {
"require": "./tests/test.init.js"
},
"babel":{
"babel": {
"presets": [
"env",
"react"
@@ -33,11 +33,13 @@
},
"dependencies": {
"babel-preset-env": "^1.1.8",
"babel-preset-react": "^6.24.1",
"basic-auth": "^1.0.3",
"body-parser": "^1.14.2",
"classnames": "^2.2.0",
"codemirror": "^5.22.0",
"cookie-parser": "^1.4.3",
"create-react-class": "^15.6.3",
"express": "^4.13.3",
"jwt-simple": "^0.5.1",
"lodash": "^4.11.2",
@@ -47,12 +49,12 @@
"nconf": "^0.8.4",
"pico-flux": "^1.1.0",
"pico-router": "^1.1.0",
"react": "^15.0.2",
"react-dom": "^15.0.2",
"react": "^16.3.1",
"react-dom": "^16.3.1",
"shortid": "^2.2.4",
"striptags": "^2.1.1",
"superagent": "^1.6.1",
"vitreum": "^4.0.12"
"vitreum": "^4.10.1"
},
"devDependencies": {
"eslint": "^4.19.1",

View File

@@ -2,19 +2,19 @@ const label = 'build';
console.time(label);
const clean = require('vitreum/steps/clean.js');
const jsx = require('vitreum/steps/jsx.js').partial;
const lib = require('vitreum/steps/libs.js').partial;
const less = require('vitreum/steps/less.js').partial;
const asset = require('vitreum/steps/assets.js').partial;
const jsx = require('vitreum/steps/jsx.js');
const lib = require('vitreum/steps/libs.js');
const less = require('vitreum/steps/less.js');
const asset = require('vitreum/steps/assets.js');
const Proj = require('./project.json');
clean()
.then(lib(Proj.libs))
.then(jsx('homebrew', './client/homebrew/homebrew.jsx', Proj.libs, ['./shared']))
.then(less('homebrew', ['./shared']))
.then(jsx('admin', './client/admin/admin.jsx', Proj.libs, ['./shared']))
.then(less('admin', ['./shared']))
.then(asset(Proj.assets, ['./shared', './client']))
.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', {libs: Proj.libs, shared : ['./shared']}))
.then((deps)=>less('homebrew', {shared: ['./shared']}, deps))
.then(()=>jsx('admin', './client/admin/admin.jsx', {libs: Proj.libs, shared: ['./shared']}))
.then((deps)=>less('admin', {shared: ['./shared']}, deps))
.then(()=>asset(Proj.assets, ['./shared', './client']))
.then(console.timeEnd.bind(console, label))
.catch(console.error);

View File

@@ -1,23 +1,22 @@
const label = 'dev';
console.time(label);
const jsx = require('vitreum/steps/jsx.watch.js').partial;
const less = require('vitreum/steps/less.watch.js').partial;
const assets = require('vitreum/steps/assets.watch.js').partial;
const server = require('vitreum/steps/server.watch.js').partial;
const livereload = require('vitreum/steps/livereload.js').partial;
const jsx = require('vitreum/steps/jsx.watch.js');
const less = require('vitreum/steps/less.watch.js');
const assets = require('vitreum/steps/assets.watch.js');
const server = require('vitreum/steps/server.watch.js');
const livereload = require('vitreum/steps/livereload.js');
const Proj = require('./project.json');
Promise.resolve()
.then(jsx('homebrew', './client/homebrew/homebrew.jsx', Proj.libs, './shared'))
.then(less('homebrew', './shared'))
.then(()=>jsx('homebrew', './client/homebrew/homebrew.jsx', {libs: Proj.libs, shared : ['./shared']}))
.then((deps)=>less('homebrew', {shared: ['./shared']}, deps))
.then(()=>jsx('admin', './client/admin/admin.jsx', {libs: Proj.libs, shared: ['./shared']}))
.then((deps)=>less('admin', {shared: ['./shared']}, deps))
.then(jsx('admin', './client/admin/admin.jsx', Proj.libs, './shared'))
.then(less('admin', './shared'))
.then(assets(Proj.assets, ['./shared', './client']))
.then(livereload())
.then(server('./server.js', ['server']))
.then(()=>assets(Proj.assets, ['./shared', './client']))
.then(()=>livereload())
.then(()=>server('./server.js', ['server']))
.then(console.timeEnd.bind(console, label))
.catch(console.error);