Skip to content

Commit 56b8bd8

Browse files
iliakaniliakan
committed
WIP
1 parent fcba3b9 commit 56b8bd8

File tree

123 files changed

+636
-727
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+636
-727
lines changed

‎bin/server.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
#!/usr/bin/env node
22

33
const config = require('config');
4-
const co = require('co');
54
const app = require('app');
65
const log = require('log')();
76

8-
co(function*() {
9-
10-
yield* app.waitBootAndListen(config.server.host, config.server.port);
11-
7+
app.waitBootAndListen(config.server.host, config.server.port).then(() => {
128
log.info("App is listening");
13-
149
}).catch(function(err) {
1510
log.error(err);
1611
process.exit(1); // fatal error, could not boot!
1712
});
1813

1914
// отслеживаем unhandled ошибки
2015
// https://iojs.org/api/process.html#process_event_rejectionhandled
21-
var unhandledRejections = [];
16+
let unhandledRejections = [];
2217
process.on('unhandledRejection', function(reason, p) {
2318
p.trackRejectionId = Math.random();
2419

2520
setTimeout(function() { // 100 ms to catch up and handle rejection
2621
if (p.trackRejectionId) { // if not rejectionHandled yet, report
2722
unhandledRejections.push(p);
28-
var report = {
23+
let report = {
2924
err: reason,
3025
trackRejectionId: p.trackRejectionId,
3126
length: unhandledRejections.length

manifest/.gitkeep renamed to cache/.gitkeep

File renamed without changes.

‎cache/pack.versions.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"footer":"/pack/footer.js?edb029e47f90da7ef027","head":"/pack/head.js?edb029e47f90da7ef027","styles":["/pack/styles.js?edb029e47f90da7ef027","/pack/styles.css?2e4f8132ebec0fb8c5aca3229f00f5ef"],"tutorial":"/pack/tutorial.js?edb029e47f90da7ef027"}

‎dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export NODE_ENV=development
99
export ASSET_VERSIONING=query
1010
export WATCH=1
1111
export SITE_HOST=http://javascript.local
12-
export PORT=80
12+
export PORT=3000
1313

1414
npm --silent run gulp dev | bunyan -o short -l debug
1515

‎edit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BRANCH="${1:-$NODE_LANG}"
77
export NODE_LANG=$BRANCH
88
export NODE_ENV=production
99
export TUTORIAL_EDIT=1
10-
export PORT=80
10+
export PORT=3000
1111

1212
npm --silent run -- gulp edit --root /js/javascript-tutorial-$BRANCH
1313

‎gulpfile.js‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ const path = require('path');
99
const fs = require('fs');
1010
const assert = require('assert');
1111
const runSequence = require('run-sequence');
12-
const ll = require('gulp-ll');
1312

1413
const config = require('config');
1514

@@ -25,9 +24,9 @@ const jsSources = [
2524

2625

2726
function lazyRequireTask(path) {
28-
var args = [].slice.call(arguments, 1);
27+
let args = [].slice.call(arguments, 1);
2928
return function(callback) {
30-
var task = require(path).apply(this, args);
29+
let task = require(path).apply(this, args);
3130

3231
return task(callback);
3332
};
@@ -61,16 +60,14 @@ function requireModuleTasks(moduleName) {
6160

6261
}
6362

64-
ll.tasks('nodemon', 'client:webpack', 'server');
65-
6663
// usage: gulp db:load --from fixture/init --harmony
6764
gulp.task('db:load', lazyRequireTask('./tasks/dbLoad'));
6865
gulp.task('db:clear', lazyRequireTask('./tasks/dbClear'));
6966

7067
gulp.task("nodemon", lazyRequireTask('./tasks/nodemon', {
7168
// shared client/server code has require('template.jade) which precompiles template on run
7269
// so I have to restart server to pickup the template change
73-
ext: "js,jade",
70+
ext: "js,pug",
7471

7572
nodeArgs: process.env.NODE_DEBUG ? ['--debug'] : [],
7673
script: "./bin/server.js",
@@ -95,7 +92,7 @@ gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", {
9592

9693
requireModuleTasks('tutorial');
9794

98-
var testSrcs = ['{handlers,modules}/**/test/**/*.js'];
95+
let testSrcs = ['{handlers,modules}/**/test/**/*.js'];
9996
// on Travis, keys are required for E2E Selenium tests
10097
// for PRs there are no keys, so we disable E2E
10198
if (!process.env.TEST_E2E || process.env.CI && process.env.TRAVIS_SECURE_ENV_VARS=="false") {
@@ -129,17 +126,6 @@ gulp.task("client:sync-resources", lazyRequireTask('./tasks/syncResources', {
129126
assets: 'public'
130127
}));
131128

132-
// show errors if encountered
133-
gulp.task('client:compile-css',
134-
lazyRequireTask('./tasks/compileCss', {
135-
src: './styles/base.styl',
136-
dst: './public/styles',
137-
publicDst: process.env.STATIC_HOST + '/styles/', // from browser point of view
138-
manifest: path.join(config.manifestRoot, 'styles.versions.json'),
139-
assetVersioning: config.assetVersioning
140-
})
141-
);
142-
143129

144130
gulp.task('client:minify', lazyRequireTask('./tasks/minify'));
145131
gulp.task('client:resize-retina-images', lazyRequireTask('./tasks/resizeRetinaImages'));
@@ -158,7 +144,7 @@ gulp.task('edit', ['tutorial:importWatch', "client:sync-resources", 'client:live
158144

159145

160146
gulp.task('dev', function(callback) {
161-
runSequence("client:sync-resources", ['nodemon', 'client:livereload', 'client:webpack', 'watch'], callback);
147+
runSequence("tutorial:import", "client:sync-resources", ['nodemon', 'client:livereload', 'client:webpack', 'watch'], callback);
162148
});
163149

164150
gulp.on('err', function(gulpErr) {

‎handlers/404.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
exports.init = function(app) {
3-
// by default if the router didn't find anything => it yields to next middleware
3+
// by default if the router didn't find anything => it awaits to next middleware
44
// so I throw error here manually
55
app.use(function* (next) {
6-
yield* next;
6+
await next;
77

88
if (this.status == 404) {
99
// still nothing found? let default errorHandler show 404

‎handlers/accessLogger.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ exports.init = function(app) {
1919
}, "--> %s %s", req.method, req.originalUrl || req.url);
2020

2121
try {
22-
yield next;
22+
await next;
2323
} catch (err) {
2424
// log uncaught downstream errors
2525
log(this, start, err);

‎handlers/bodyParser.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ BodyParser.prototype.middleware = function() {
2323
if (!self.ignore.check(this.path)) {
2424
this.log.debug("bodyParser will parse");
2525

26-
yield* self.parser.call(this, next);
26+
await self.parser.call(this, next);
2727

2828
this.log.debug("bodyParser done parse");
2929
} else {
3030
this.log.debug("bodyParser skip");
3131
}
3232

33-
yield* next;
33+
await next;
3434
};
3535
};
3636

‎handlers/conditional.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ exports.init = function(app) {
1313

1414
// set expires to this.expires
1515
app.use(function* (next) {
16-
yield *next;
16+
await *next;
1717

1818
if (!this.expires) return;
1919

0 commit comments

Comments
 (0)