File tree Expand file tree Collapse file tree 3 files changed +10
-5
lines changed
graphql-language-service-server/src Expand file tree Collapse file tree 3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -203,15 +203,18 @@ export class MessageProcessor {
203
203
const vscodeSettings = await this . _connection . workspace . getConfiguration ( {
204
204
section : 'vscode-graphql' ,
205
205
} ) ;
206
- if ( settings ?. dotEnvPath ) {
207
- require ( 'dotenv' ) . config ( { path : settings . dotEnvPath } ) ;
208
- }
206
+
209
207
// TODO: eventually we will instantiate an instance of this per workspace,
210
208
// so rootDir should become that workspace's rootDir
211
209
this . _settings = { ...settings , ...vscodeSettings } ;
212
210
const rootDir = this . _settings ?. load ?. rootDir . length
213
211
? this . _settings ?. load ?. rootDir
214
212
: this . _rootPath ;
213
+ if ( settings ?. dotEnvPath ) {
214
+ require ( 'dotenv' ) . config ( {
215
+ path : path . resolve ( rootDir , settings . dotEnvPath ) ,
216
+ } ) ;
217
+ }
215
218
this . _rootPath = rootDir ;
216
219
this . _loadConfigOptions = {
217
220
...Object . keys ( this . _settings ?. load ?? { } ) . reduce ( ( agg , key ) => {
Original file line number Diff line number Diff line change @@ -18,6 +18,8 @@ import { parseDocument } from '../parseDocument';
18
18
19
19
jest . mock ( '../Logger' ) ;
20
20
21
+ jest . setTimeout ( 20000 ) ;
22
+
21
23
import { GraphQLCache } from '../GraphQLCache' ;
22
24
23
25
import {
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " vscode-graphql" ,
3
- "version" : " 0.9.3 " ,
3
+ "version" : " 0.10.1 " ,
4
4
"private" : true ,
5
5
"license" : " MIT" ,
6
6
"displayName" : " GraphQL: Language Feature Support" ,
161
161
"vsce:package" : " vsce package --yarn" ,
162
162
"env:source" : " export $(cat .envrc | xargs)" ,
163
163
"vsce:publish" : " vsce publish --yarn" ,
164
- "open-vsx:publish" : " ovsx publish --extensionFile $(ls -1 *.vsix | tail -n 1) --pat $OVSX_PAT" ,
164
+ "open-vsx:publish" : " ovsx publish $(ls -1 *.vsix | tail -n 1) --pat $OVSX_PAT" ,
165
165
"release" : " npm run vsce:publish && npm run open-vsx:publish"
166
166
},
167
167
"devDependencies" : {
You can’t perform that action at this time.
0 commit comments