Skip to content

Commit 015b1bd

Browse files
committed
feat(commandpost): update dependencies, use TypeScript 2.0.3
1 parent 1ecd1e2 commit 015b1bd

24 files changed

+1856
-3444
lines changed

.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

.idea/commandpost.iml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.idea/scopes/TypeScript_main.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/scopes/TypeScript_test.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

.idea/watcherTasks.xml

Lines changed: 0 additions & 57 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Place your settings in this file to overwrite default and user settings.
2+
{
3+
"typescript.tsdk": "./node_modules/typescript/lib/"
4+
}

Gruntfile.js

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
module.exports = function (grunt) {
2-
require("time-grunt")(grunt);
3-
42
grunt.initConfig({
53
pkg: grunt.file.readJSON('package.json'),
64
opt: {
@@ -13,14 +11,10 @@ module.exports = function (grunt) {
1311
}
1412
},
1513

16-
ts: {
17-
default: {
18-
tsconfig: {
19-
tsconfig: "./tsconfig.json",
20-
updateFiles:false
21-
}
22-
}
23-
},
14+
exec: {
15+
tsc: "tsc -p ./",
16+
tsfmt: "tsfmt -r"
17+
},
2418
tsconfig: {
2519
main: {
2620
}
@@ -60,14 +54,6 @@ module.exports = function (grunt) {
6054
]
6155
}
6256
},
63-
dtsm: {
64-
client: {
65-
options: {
66-
// optional: specify config file
67-
confog: './dtsm.json'
68-
}
69-
}
70-
},
7157
clean: {
7258
clientScript: {
7359
src: [
@@ -80,12 +66,6 @@ module.exports = function (grunt) {
8066
'<%= opt.client.jsTestOut %>/*.js.map',
8167
'<%= opt.client.jsTestOut %>/*.d.ts'
8268
]
83-
},
84-
dtsm: {
85-
src: [
86-
// dtsm installed
87-
"typings/"
88-
]
8969
}
9070
},
9171
mochaTest: {
@@ -99,30 +79,46 @@ module.exports = function (grunt) {
9979
cwd: process.cwd() + '/' + grunt.config.get("opt.client.jsTestOut"),
10080
pattern: '**/*.js'
10181
});
102-
},
103-
function () {
104-
assert = require('power-assert');
10582
}
10683
]
10784
},
10885
src: [
10986
'<%= opt.client.jsTestOut %>/**/*Spec.js'
11087
]
11188
}
112-
}
89+
},
90+
conventionalChangelog: {
91+
options: {
92+
changelogOpts: {
93+
// conventional-changelog options go here
94+
preset: "angular"
95+
},
96+
context: {
97+
// context goes here
98+
},
99+
gitRawCommitsOpts: {
100+
// git-raw-commits options go here
101+
},
102+
parserOpts: {
103+
// conventional-commits-parser options go here
104+
},
105+
writerOpts: {
106+
// conventional-changelog-writer options go here
107+
}
108+
},
109+
release: {
110+
src: "CHANGELOG.md"
111+
}
112+
}
113113
});
114114

115-
grunt.registerTask(
116-
'setup',
117-
['clean', 'dtsm']);
118-
119-
grunt.registerTask(
120-
'default',
121-
['tsconfig', 'ts', 'tslint']);
115+
grunt.registerTask(
116+
'default',
117+
['clean:clientScript', 'exec:tsfmt', 'exec:tsc', 'tslint']);
122118

123-
grunt.registerTask(
124-
'test',
125-
['default', 'mochaTest']);
119+
grunt.registerTask(
120+
'test',
121+
['default', 'mochaTest']);
126122

127123
require('load-grunt-tasks')(grunt);
128124
};

circle.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
11
machine:
22
node:
3-
version: "0.10"
4-
5-
dependencies:
6-
pre:
7-
- npm install -g grunt-cli
8-
post:
9-
- grunt setup
3+
version: "4"

dtsm.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)