Skip to content
This repository was archived by the owner on Sep 4, 2020. It is now read-only.

Commit 240bc53

Browse files
authored
Deep merge (#12)
* set `printWidth` to 100 * deep merge both project and plugin's config * remove examples * release v1.2.5 * fix lint
1 parent 4f281e2 commit 240bc53

File tree

14 files changed

+156
-145
lines changed

14 files changed

+156
-145
lines changed

.prettierrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"trailingComma": "all",
3+
"printWidth": 100,
4+
"overrides": [
5+
{
6+
"files": ".prettierrc",
7+
"options": { "parser": "json" }
8+
}
9+
]
10+
}

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.2.5 - 2019-06-05
4+
5+
- deep merge `compilerOptions` [#34](https://github.com/justjavac/vscode-deno/issues/34)
6+
37
## 1.2.2 - 1.2.3 - 2019-04-19
48

59
- fix typescript not found bug

examples/.vscode/settings.json

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

examples/package.json

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

examples/src/deno.ts

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

examples/src/hello.ts

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

examples/src/world.ts

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

examples/tsconfig.json

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

examples/yarn.lock

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

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "typescript-deno-plugin",
3-
"version": "1.2.4",
3+
"version": "1.2.5",
44
"description": "Deno language service plugin for TypeScript",
55
"main": "out/index.js",
66
"scripts": {
@@ -19,6 +19,7 @@
1919
"url": "https://github.com/justjavac/typescript-deno-plugin.git"
2020
},
2121
"dependencies": {
22+
"merge-deep": "^3.0.2",
2223
"mock-require": "^3.0.3"
2324
},
2425
"devDependencies": {

0 commit comments

Comments
 (0)