Skip to content

Commit 6f1af5e

Browse files
committed
Merge branch 'dev' into FL-JA/RL-39/Flow-to-TS
2 parents 5efe4ae + fafafb2 commit 6f1af5e

File tree

7 files changed

+513
-9
lines changed

7 files changed

+513
-9
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
node_modules
2-
/build
32
/package-lock.json
4-
/.vscode-test/
3+
/.vscode-test/
4+
/build/

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"--extensionDevelopmentPath=${workspaceFolder}",
2323
"--extensionTestsPath=${workspaceFolder}/test/suite/index"
2424
],
25-
"outFiles": ["${workspaceFolder}/build/*.js"],
25+
"outFiles": ["${workspaceFolder}/build/**.js"],
2626
"preLaunchTask": "npm: test-compile"
2727
}
2828
]

build/bundle.js

Lines changed: 378 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/extension.js

Lines changed: 128 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"@types/node": "18.x",
8282
"@types/react": "^18.2.45",
8383
"@types/react-dom": "^18.2.18",
84-
"@types/vscode": "^1.85.1",
84+
"@types/vscode": "^1.84.0",
8585
"@vscode/test-cli": "^0.0.4",
8686
"@vscode/test-electron": "^2.3.8",
8787
"eslint": "^8.54.0",

tsconfig.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
"compilerOptions": {
33
"target": "es6",
44
"module": "commonjs",
5-
"outDir": "./build",
5+
"outDir": "./build/src",
66
"esModuleInterop": true,
77
"lib": ["es6", "dom"],
88
"jsx": "react",
99
"sourceMap": true,
1010
"rootDir": "./src",
1111
"allowJs": true,
1212
"strict": false,
13-
},
14-
"tsnode": {
15-
"esm": true
13+
"inlineSources": true,
1614
},
1715
"include": ["src/**/*.ts", "src/**/*.tsx", "src/**/**/*.tsx", "src/**/**/*.ts"],
1816
"exclude": [

0 commit comments

Comments
 (0)