Skip to content

Commit 83d7517

Browse files
committed
fix: fixes js style to be node < 10 compatible
1 parent a04f69a commit 83d7517

24 files changed

Lines changed: 835 additions & 323 deletions

File tree

.eslintrc.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
module.exports = {
2+
env: {
3+
node: true,
4+
es6: true,
5+
},
6+
extends: 'eslint:recommended',
7+
parserOptions: {
8+
ecmaVersion: 6,
9+
sourceType: 'module',
10+
impliedStrict: true,
11+
},
12+
rules: {
13+
indent: ['error', 2],
14+
'linebreak-style': ['error', 'unix'],
15+
quotes: ['error', 'single'],
16+
semi: ['error', 'never'],
17+
'comma-dangle': [
18+
'error',
19+
{
20+
arrays: 'always-multiline',
21+
objects: 'always-multiline',
22+
imports: 'always-multiline',
23+
exports: 'always-multiline',
24+
functions: 'never',
25+
},
26+
],
27+
},
28+
}

.prettierrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ singleQuote: true
44
tabWidth: 2
55
useTabs: false
66
trailingComma: all
7+
overrides:
8+
- files: "**/*.js"
9+
options:
10+
trailingComma: es5

e2e/__helpers__/test-case.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tslint:disable-file:no-shadowed-variable
22
import { sync as spawnSync } from 'cross-spawn'
33
import { join, relative, sep } from 'path'
4-
import * as Paths from '../../scripts/paths'
4+
import * as Paths from '../../scripts/lib/paths'
55
import * as fs from 'fs-extra'
66
import { RawSourceMap } from 'source-map'
77
import { relativiseSourceRoot, extractSourceMaps } from './source-maps'

e2e/__templates__/default/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
44
globals: { 'ts-jest': { tsConfig: {} } },
5-
};
5+
}

e2e/__templates__/with-babel-6/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
44
globals: { 'ts-jest': { tsConfig: {}, babelConfig: true } },
5-
};
5+
}

e2e/__templates__/with-babel-7/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
44
globals: { 'ts-jest': { tsConfig: {}, babelConfig: true } },
5-
};
5+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
const { jestPreset } = require('ts-jest');
1+
const { jestPreset } = require('ts-jest')
22

33
module.exports = Object.assign({}, jestPreset, {
44
testEnvironment: 'node',
55
globals: { 'ts-jest': { tsConfig: {} } },
6-
});
6+
})

e2e/__templates__/with-typescript-2-7/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
44
globals: { 'ts-jest': { tsConfig: {}, diagnostics: { ignoreCodes: [5023] } } }
5-
};
5+
}

e2e/__templates__/with-unsupported-version/jest.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module.exports = {
22
preset: 'ts-jest',
33
testEnvironment: 'node',
44
globals: { 'ts-jest': { tsConfig: {}, diagnostics: { ignoreCodes: [5023, 5024] } } }
5-
};
5+
}

0 commit comments

Comments
 (0)