Skip to content

Remove Traceur, V8-incompatible syntax sugar to run in node directly #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"undef": true,
"typed": true,
"node": true,
"esnext": true
}
"esnext": true,
"jasmine": true
}
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
language: node_js
node_js:
- "0.10"
before_install:
- "npm install -g grunt-cli"
- "npm install -g bower"
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"
- "bower install"
- "4.2"
107 changes: 5 additions & 102 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
"use strict";

module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-mocha-test"); // For server-side testing
grunt.loadNpmTasks("grunt-karma"); // For client-side testing
grunt.loadNpmTasks("grunt-pure-cjs");
grunt.loadNpmTasks("grunt-mocha-test");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-blanket");
grunt.loadNpmTasks("grunt-contrib-clean");
grunt.loadNpmTasks("grunt-contrib-copy");
grunt.loadNpmTasks("grunt-traceur");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-jscs");

grunt.initConfig({
clean: {
all: {
src: ["coverage/", "dist/", "build/"]
}
},
jshint: {
all: {
src: ["Gruntfile.js", "index.js", "src/**/*.js", "test/**/*.js"],
options: {
jshintrc: true
jshintrc: ".jshintrc"
}
}
},
Expand All @@ -31,106 +19,21 @@ module.exports = function(grunt) {
src: ["index.js", "src/**/*.js", "test/**/*.js"]
}
},
copy: {
coverage: {
src: ["build/test/**"],
dest: "coverage/"
}
},
blanket: {
all: {
src: "build/src/",
dest: "coverage/build/src/"
}
},
mochaTest: {
unitTests: {
src: ["test/unit/**/*.js"],
options: {
require: ["mocha-traceur"]
}
},
integrationTests: {
src: ["test/integration/node/**/*.js"],
options: {
clearRequireCache: true
}
},
coverage: {
src: ["coverage/build/test/unit/**/*.js"],
options: {
reporter: "html-cov",
quiet: true,
captureFile: "coverage/index.html",
clearRequireCache: true
}
}
},
karma: {
integrationTests: {
options: {
configFile: "karma.conf.js"
}
}
},
pure_cjs: {
dist: {
files: {
"build/axolotl.js": ["build/index.js"]
},
options: {
exports: "axolotl",
external: {
protobufjs: {
global: "dcodeIO.ProtoBuf",
id: "__external_1"
},
"traceur/bin/traceur-runtime": {
amd: "traceur-runtime",
global: "1",
id: "__external_2"
},
"axolotl-crypto": {
global: "axolotlCrypto"
}
}
}
}
},
traceur: {
dist: {
options: {
modules: "commonjs"
},
files: [{
expand: true,
cwd: "src/",
src: ["**/*.js"],
dest: "build/src"
}, {
src: ["index.js"],
dest: "build/index.js"
}, {
expand: true,
cwd: "test/",
src: ["**/*.js"],
dest: "build/test"
}]
}
},
concat: {
dist: {
src: ["banner.js", "build/axolotl.js"],
dest: "dist/axolotl.js"
}
}
});

grunt.registerTask("coverage", ["traceur", "copy:coverage", "blanket", "mochaTest:coverage"]);

grunt.registerTask("check", ["jshint", "jscs"]);
grunt.registerTask("test", ["clean", "check", "mochaTest:unitTests"]);
grunt.registerTask("test", ["check", "mochaTest:unitTests"]);
grunt.registerTask("default", ["test"]);
grunt.registerTask("dist", ["default", "traceur", "pure_cjs", "concat"]);
grunt.registerTask("integration-test", ["dist", "mochaTest:integrationTests", "karma:integrationTests"]);
};
grunt.registerTask("integration-test", ["mochaTest:integrationTests"]);
};
16 changes: 0 additions & 16 deletions banner.js

This file was deleted.

40 changes: 0 additions & 40 deletions bower.json

This file was deleted.

Loading