瀏覽代碼

upgraded babel from ES2015 to "latest"; updated tests; personalized for personal use

Brandon Wong 7 年之前
父節點
當前提交
247869a94b

+ 2 - 1
react/.babelrc

@@ -1,5 +1,6 @@
 {
-  "presets": ["es2015", "react"],
+  "presets": ["latest", "react"],
+  "plugins": ["transform-runtime"],
   "env": {
     "production": {
       "plugins": ["transform-remove-console"]

+ 7 - 4
react/package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@kolab/$foldername",
+  "name": "@brwong/$foldername",
+  "author": "Brandon Wong",
   "version": "0.1.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,7 +18,8 @@
     "babel-core": "^6.14.0",
     "babel-loader": "^6.2.5",
     "babel-plugin-transform-remove-console": "^6.8.0",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-latest": "^6.16.0",
     "babel-preset-react": "^6.11.1",
     "cross-env": "^1.0.8",
     "react": "^15.3.2",
@@ -25,8 +27,9 @@
     "webpack": "^1.13.2"
   },
   "devDependencies": {
-    "blue-tape": "^0.2.0",
-    "nodemon": "^1.9.1"
+    "nodemon": "^1.9.1",
+    "tape-promise": "^2.0.0",
+    "tape": "^4.5.1"
   },
   "private": true
 }

+ 2 - 1
regular/.babelrc

@@ -1,5 +1,6 @@
 {
-  "presets": ["es2015"],
+  "presets": ["latest"],
+  "plugins": ["transform-runtime"],
   "env": {
     "production": {
       "plugins": ["transform-remove-console"]

+ 10 - 5
regular/package.json

@@ -1,9 +1,10 @@
 {
-  "name": "@kolab/$foldername",
+  "name": "@brwong/$foldername",
+  "author": "Brandon Wong",
   "version": "0.1.0",
+  "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "npm run compile",
+    "test": "node test-build/main.js",
     "compile": "cross-env NODE_ENV=production npm run compile-dev",
     "compile-dev": "npm run compile-src && npm run compile-test",
     "compile-test": "babel test --out-dir test-build",
@@ -15,13 +16,17 @@
   "dependencies": {
     "babel-cli": "^6.14.0",
     "babel-plugin-transform-remove-console": "^6.8.0",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-latest": "^6.16.0",
     "cross-env": "^1.0.8"
   },
   "devDependencies": {
-    "blue-tape": "^0.2.0",
     "nodemon": "^1.9.1",
+    "tape-promise": "^2.0.0",
     "tape": "^4.5.1"
   },
+  "directories": {
+    "test": "test"
+  },
   "private": true
 }

+ 4 - 0
regular/src/main.js

@@ -0,0 +1,4 @@
+
+console.log('hello');
+
+

+ 13 - 0
regular/test/main.js

@@ -0,0 +1,13 @@
+
+import tape from 'tape';
+import _test from 'tape-promise';
+
+const tapetest = _test(tape);
+
+
+tapetest('test', async function testProgram(t) {
+    t.pass('empty test file');
+    t.end();
+});
+
+

+ 2 - 1
service/.babelrc

@@ -1,5 +1,6 @@
 {
-  "presets": ["es2015"],
+  "presets": ["latest"],
+  "plugins": ["transform-runtime"],
   "env": {
     "production": {
       "plugins": ["transform-remove-console"]

+ 8 - 5
service/package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@kolab/$foldername",
+  "name": "@brwong/$foldername",
+  "author": "Brandon Wong",
   "main": "build/service.js",
   "version": "0.1.0",
   "scripts": {
@@ -10,19 +11,21 @@
     "compile-test": "babel test --out-dir test-build",
     "compile-src": "babel src --out-dir build",
     "watch": "nodemon --watch src --watch test --exec \"npm run compile-dev --silent\"",
-    "serverwatch": "nodemon --watch src --watch test --exec \"npm run compile --silent && node build/service.js\"",
+    "serverwatch": "nodemon --watch src --watch test --exec \"npm run compile-dev --silent && node build/service.js\"",
     "testwatch": "nodemon --watch src --watch test --exec \"npm run compile-dev --silent && npm test\""
   },
   "dependencies": {
     "babel-cli": "^6.14.0",
     "babel-plugin-transform-remove-console": "^6.8.0",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-latest": "^6.16.0",
     "cross-env": "^1.0.8",
     "express": "^4.14.0"
   },
   "devDependencies": {
-    "blue-tape": "^0.2.0",
-    "nodemon": "^1.9.1"
+    "nodemon": "^1.9.1",
+    "tape-promise": "^2.0.0",
+    "tape": "^4.5.1"
   },
   "directories": {
     "test": "test"

+ 2 - 2
service/src/service.js

@@ -3,7 +3,7 @@ import express from 'express';
 import http from 'http';
 
 
-const port = process.env.kport ? parseInt(process.env.kport) : 8080,
+const port = process.env.port ? parseInt(process.env.port) : 8080,
     app = express(),
     httpserver = http.createServer(app);
 
@@ -12,7 +12,7 @@ httpserver.listen(port, function listening() {
 });
 
 app.get('/', function serve(req, res) {
-    res.send('kolab $foldername service');
+    res.send('$foldername service');
 });
 
 

+ 14 - 16
service/test/service.js

@@ -1,29 +1,27 @@
 
 import {fork} from 'child_process';
-import tape from 'blue-tape';
+import tape from 'tape';
+import _test from 'tape-promise';
 import http from 'http';
 
+const tapetest = _test(tape);
 
-tape.test('service', function testService(t) {
+tapetest('service', async function testService(t) {
     const server = fork('build/service.js'),
         connstring = 'http://localhost:8080';
-    waitPro()
-    .then(function done(a) {
-        return requestPro(connstring + '/')
-            .then(function done(data) {
-                console.log('data', data);
-                return JSON.parse(data);
-            })
-    })
 
-    .catch(function (e) {
+    try {
+        await waitPro();
+        const data = await requestPro(connstring + '/');
+        console.log('data', data);
+    }
+    catch(e) {
         console.log('error somewhere', e);
         t.fail('error somewhere');
-    })
-    .then(function done(a) {
-        server.kill();
-        t.end();
-    });
+    }
+
+    server.kill();
+    t.end();
 });
 
 

+ 2 - 1
socket/.babelrc

@@ -1,5 +1,6 @@
 {
-  "presets": ["es2015"],
+  "presets": ["latest"],
+  "plugins": ["transform-runtime"],
   "env": {
     "production": {
       "plugins": ["transform-remove-console"]

+ 10 - 5
socket/package.json

@@ -1,10 +1,10 @@
 {
-  "name": "@kolab/$foldername",
+  "name": "@brwong/$foldername",
+  "author": "Brandon Wong",
   "version": "0.1.0",
   "main": "build/server.js",
   "scripts": {
     "test": "node test-build/server.js",
-    "postinstall": "npm run compile-src",
     "compile": "cross-env NODE_ENV=production npm run compile-dev",
     "compile-dev": "npm run compile-src && npm run compile-test",
     "compile-test": "babel test --out-dir test-build",
@@ -17,15 +17,20 @@
   "dependencies": {
     "babel-cli": "^6.14.0",
     "babel-plugin-transform-remove-console": "^6.8.0",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-latest": "^6.16.0",
     "cross-env": "^1.0.8",
     "express": "^4.14.0",
     "socket.io": "^1.4.8"
   },
   "devDependencies": {
-    "blue-tape": "^0.2.0",
     "nodemon": "^1.9.1",
-    "socket.io-client": "^1.4.5"
+    "socket.io-client": "^1.4.5",
+    "tape-promise": "^2.0.0",
+    "tape": "^4.5.1"
+  },
+  "directories": {
+    "test": "test"
   },
   "private": true
 }

+ 1 - 1
socket/src/server.js

@@ -3,7 +3,7 @@ import express from 'express';
 import socketio from 'socket.io';
 import http from 'http';
 
-const port = process.env.kport || 2424,
+const port = process.env.port || 2424,
     app = express(),
     server = http.createServer(app),
     ioserv = socketio.listen(server);

+ 14 - 16
socket/test/server.js

@@ -1,33 +1,31 @@
 
 import child_process from 'child_process';
-import tape from 'blue-tape';
+import tape from 'tape';
+import _test from 'tape-promise';
 import http from 'http';
 import socketclient from 'socket.io-client';
 
+const tapetest = _test(tape);
 
 const serverhost = 'localhost',
     serverport = 2424,
     server = child_process.fork('build/server.js');
 
-tape.test('test server', function testServer(t) {
+tapetest('test server', async function testServer(t) {
     let client;
 
-    waitPro()
-    .then(function done(a) {
-        return requestPro(`http://${serverhost}:${serverport}`)
-        .then(function done(a) {
-            t.equal(a, 'yes', 'received message from server');
-        })
-    })
-
-    .catch(function catchall(e) {
+    try {
+        await waitPro();
+        const data = await requestPro(`http://${serverhost}:${serverport}`);
+        t.equal(data, 'working', 'received message from server');
+    }
+    catch(e) {
         console.log('error somewhere', e);
         t.fail('error somewhere');
-    })
-    .then(function done(a) {
-        t.end();
-        server.kill();
-    })
+    }
+
+    t.end();
+    server.kill();
 });
 
 

+ 2 - 1
webpack/.babelrc

@@ -1,5 +1,6 @@
 {
-  "presets": ["es2015"],
+  "presets": ["latest"],
+  "plugins": ["transform-runtime"],
   "env": {
     "production": {
       "plugins": ["transform-remove-console"]

+ 7 - 2
webpack/package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@kolab/$foldername",
+  "name": "@brwong/$foldername",
+  "author": "Brandon Wong",
   "version": "0.1.0",
   "main": "build/main.js",
   "scripts": {
@@ -10,12 +11,16 @@
   "dependencies": {
     "babel-cli": "^6.14.0",
     "babel-plugin-transform-remove-console": "^6.8.0",
-    "babel-preset-es2015": "^6.14.0",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-latest": "^6.16.0",
     "cross-env": "^1.0.8",
     "webpack": "^1.13.2"
   },
   "devDependencies": {
     "nodemon": "^1.9.1"
   },
+  "directories": {
+    "test": "test"
+  },
   "private": true
 }