Skip to content

Commit aad1a8e

Browse files
author
Jed Mao
committed
Update TypeScript@^2.1.0-dev.20160829
1 parent d0bef4a commit aad1a8e

File tree

19 files changed

+48
-1003
lines changed

19 files changed

+48
-1003
lines changed

‎.tasks/gulp-clean.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference path="../typings/gulp.d.ts" />
21
import * as gulp from 'gulp';
32
var rimraf = require('gulp-rimraf');
43

‎.tasks/gulp-copy.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference path="../typings/gulp.d.ts" />
21
import * as gulp from 'gulp';
32

43
export default () => {

‎.tasks/gulp-tslint.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference path="../typings/gulp.d.ts" />
21
import * as gulp from 'gulp';
32
var plumber = require('gulp-plumber');
43
var tslint = require('gulp-tslint');

‎.travis.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
language: node_js
2-
3-
node_js:
4-
- '5.5'
5-
- '4.2' #LTS
6-
7-
notifications:
8-
email:
9-
on_success: change
10-
on_failure: always
1+
language: node_js
2+
3+
node_js:
4+
- "node"
5+
- "4"
6+
7+
notifications:
8+
email:
9+
on_success: change
10+
on_failure: always

‎build/.eslintrc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{
2-
"rules": {
3-
"indent": [2, 4, {
4-
"SwitchCase": 1
5-
}]
6-
}
7-
}
1+
{
2+
"rules": {
3+
"indent": [2, 4, {
4+
"SwitchCase": 1
5+
}]
6+
}
7+
}

‎build/test/.eslintrc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
{
2-
"env": {
3-
"mocha": true
4-
}
5-
}
1+
{
2+
"env": {
3+
"mocha": true
4+
}
5+
}

‎gulpfile.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference path="typings/gulp.d.ts" />
21
import * as gulp from 'gulp';
32

43
function loadTask(taskName: string) {

‎lib/plugin.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ const PostCssNestedProps = postcss.plugin('postcss-nested-props', () => {
1313
const HAS_COLON = /:/;
1414
const ALL_PSEUDO = pseudoClasses().concat(pseudoElements());
1515
const VENDOR_PSEUDO_ELEMENTS = '-(\\w|-)+';
16-
const HAS_PSEUDO_CLASSES_ELEMENTS = new RegExp(`:(${ALL_PSEUDO.join('|')}|${VENDOR_PSEUDO_ELEMENTS})`);
16+
const HAS_PSEUDO_CLASSES_ELEMENTS = new RegExp(
17+
`:(${ALL_PSEUDO.join('|')}|${VENDOR_PSEUDO_ELEMENTS})`
18+
);
1719

1820
function unwrapRule(namespace: string[], rule: postcss.Rule) {
1921
if (!HAS_COLON.test(rule.selector)) {

‎package.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,20 @@
3737
},
3838
"devDependencies": {
3939
"@types/chai": "^3.4.34",
40+
"@types/glob": "^5.0.29",
41+
"@types/glob-stream": "^3.1.29",
42+
"@types/gulp": "^3.8.31",
4043
"@types/mocha": "^2.2.36",
4144
"@types/node": "^6.0.58",
4245
"@types/sinon": "^1.16.34",
46+
"@types/minimatch": "^2.0.28",
47+
"@types/orchestrator": "0.0.29",
48+
49+
"@types/q": "0.0.30",
50+
"@types/sinon": "^1.16.29",
4351
"@types/sinon-chai": "^2.7.27",
4452
"@types/vinyl": "^2.0.0",
4553
"@types/vinyl-fs": "0.0.28",
46-
"babel": "^6.5.2",
47-
"babel-cli": "^6.18.0",
48-
"babel-core": "^6.21.0",
49-
"babel-eslint": "^7.1.1",
50-
"babel-preset-es2015": "^6.18.0",
5154
"chai": "^3.5.0",
5255
"eslint": "^3.12.2",
5356
"gulp": "^3.9.1",
@@ -61,9 +64,11 @@
6164
"gulp-typescript": "^3.1.3",
6265
"isparta": "^4.0.0",
6366
"istanbul": "^0.4.5",
67+
"istanbul": "^0.4.5",
6468
"merge2": "^1.0.3",
6569
"mocha": "^3.2.0",
6670
"through2": "^2.0.3",
71+
"ts-node": "^1.3.0",
6772
"tslint": "^4.3.1",
6873
"typescript": "^2.1.4"
6974
}

‎test/mocha.opts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1+
<<<<<<< HEAD
12
--colors
23
--inline-diffs
34
--reporter spec
45
--compilers ts:ts-node/register
6+
=======
7+
--colors
8+
--inline-diffs
9+
--reporter spec
10+
--compilers ts:ts-node/register
11+
>>>>>>> Update TypeScript@^2.1.0-dev.20160829
512
build/test/plugin.js

‎test/plugin.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('postcss-nested-props plugin', () => {
4242
});
4343

4444
describe('pseudo classes', () => {
45-
pseudoClasses().forEach(pseudoClass => {
45+
pseudoClasses().forEach((pseudoClass: string) => {
4646
it(`preserves the :${pseudoClass}() pseudo-class`, () => {
4747
check(
4848
`a{b:${pseudoClass}(c){d:e}}`,
@@ -53,7 +53,7 @@ describe('postcss-nested-props plugin', () => {
5353
});
5454

5555
describe('pseudo elements', () => {
56-
pseudoElements().forEach(pseudoElement => {
56+
pseudoElements().forEach((pseudoElement: string) => {
5757
it(`preserves the ::${pseudoElement} pseudo-element`, () => {
5858
check(
5959
`a{b::${pseudoElement}{c:d}}`,

‎tsconfig.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22
"compilerOptions": {
33
"module": "commonjs",
44
"moduleResolution": "node",
5+
"noImplicitAny": true,
56
"target": "es5",
67
"declaration": true,
78
"newLine": "LF",
89
"outDir": "build",
910
"rootDir": "."
1011
},
12+
"exclude": [
13+
"node_modules"
14+
],
1115
"files": [
1216
"node_modules/postcss/lib/postcss.d.ts",
1317
"lib/plugin.ts",

‎typings/glob-stream/glob-stream.d.ts

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

‎typings/glob/glob.d.ts

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

‎typings/gulp.d.ts

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

0 commit comments

Comments
 (0)