Skip to content

Commit 055c5a2

Browse files
committed
Remove Traceur, modify to run in node directly
This makes debugging easier Clean up tests, remove pure-cjs
1 parent 0464668 commit 055c5a2

33 files changed

+219
-2666
lines changed

.jshintrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"undef": true,
77
"typed": true,
88
"node": true,
9-
"esnext": true
10-
}
9+
"esnext": true,
10+
"jasmine": true
11+
}

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: node_js
22
node_js:
3-
- "0.10"
3+
- "4.2"
44
before_install:
55
- "npm install -g grunt-cli"
66
- "npm install -g bower"
77
- "export DISPLAY=:99.0"
88
- "sh -e /etc/init.d/xvfb start"
9-
- "bower install"
9+
- "bower install"

Gruntfile.js

Lines changed: 4 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@
33
module.exports = function(grunt) {
44
grunt.loadNpmTasks("grunt-mocha-test"); // For server-side testing
55
grunt.loadNpmTasks("grunt-karma"); // For client-side testing
6-
grunt.loadNpmTasks("grunt-pure-cjs");
76
grunt.loadNpmTasks("grunt-contrib-jshint");
87
grunt.loadNpmTasks("grunt-blanket");
98
grunt.loadNpmTasks("grunt-contrib-clean");
109
grunt.loadNpmTasks("grunt-contrib-copy");
11-
grunt.loadNpmTasks("grunt-traceur");
1210
grunt.loadNpmTasks("grunt-contrib-concat");
1311
grunt.loadNpmTasks("grunt-jscs");
1412

@@ -22,7 +20,7 @@ module.exports = function(grunt) {
2220
all: {
2321
src: ["Gruntfile.js", "index.js", "src/**/*.js", "test/**/*.js"],
2422
options: {
25-
jshintrc: true
23+
jshintrc: ".jshintrc"
2624
}
2725
}
2826
},
@@ -46,9 +44,6 @@ module.exports = function(grunt) {
4644
mochaTest: {
4745
unitTests: {
4846
src: ["test/unit/**/*.js"],
49-
options: {
50-
require: ["mocha-traceur"]
51-
}
5247
},
5348
integrationTests: {
5449
src: ["test/integration/node/**/*.js"],
@@ -73,51 +68,6 @@ module.exports = function(grunt) {
7368
}
7469
}
7570
},
76-
pure_cjs: {
77-
dist: {
78-
files: {
79-
"build/axolotl.js": ["build/index.js"]
80-
},
81-
options: {
82-
exports: "axolotl",
83-
external: {
84-
protobufjs: {
85-
global: "dcodeIO.ProtoBuf",
86-
id: "__external_1"
87-
},
88-
"traceur/bin/traceur-runtime": {
89-
amd: "traceur-runtime",
90-
global: "1",
91-
id: "__external_2"
92-
},
93-
"axolotl-crypto": {
94-
global: "axolotlCrypto"
95-
}
96-
}
97-
}
98-
}
99-
},
100-
traceur: {
101-
dist: {
102-
options: {
103-
modules: "commonjs"
104-
},
105-
files: [{
106-
expand: true,
107-
cwd: "src/",
108-
src: ["**/*.js"],
109-
dest: "build/src"
110-
}, {
111-
src: ["index.js"],
112-
dest: "build/index.js"
113-
}, {
114-
expand: true,
115-
cwd: "test/",
116-
src: ["**/*.js"],
117-
dest: "build/test"
118-
}]
119-
}
120-
},
12171
concat: {
12272
dist: {
12373
src: ["banner.js", "build/axolotl.js"],
@@ -126,11 +76,11 @@ module.exports = function(grunt) {
12676
}
12777
});
12878

129-
grunt.registerTask("coverage", ["traceur", "copy:coverage", "blanket", "mochaTest:coverage"]);
79+
grunt.registerTask("coverage", ["copy:coverage", "blanket", "mochaTest:coverage"]);
13080

13181
grunt.registerTask("check", ["jshint", "jscs"]);
13282
grunt.registerTask("test", ["clean", "check", "mochaTest:unitTests"]);
13383
grunt.registerTask("default", ["test"]);
134-
grunt.registerTask("dist", ["default", "traceur", "pure_cjs", "concat"]);
84+
grunt.registerTask("dist", ["default", "concat"]);
13585
grunt.registerTask("integration-test", ["dist", "mochaTest:integrationTests", "karma:integrationTests"]);
136-
};
86+
};

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "axolotl",
3-
"main": "dist/axolotl.js",
3+
"main": "index.js",
44
"version": "1.3.0",
55
"authors": [
66
"Joe Bandenburg <joe@bandenburg.com>"

0 commit comments

Comments
 (0)