Skip to content

Commit

Permalink
chore: convert user-config to ts
Browse files Browse the repository at this point in the history
  • Loading branch information
lili2311 committed Feb 10, 2020
1 parent b88496e commit 8490b07
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/lib/api-token.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { MissingApiTokenError } from '../lib/errors';

import * as config from './config';
import * as userConfig from './user-config';
import { config as userConfig } from './user-config';

export function api() {
// note: config.TOKEN will potentially come via the environment
Expand Down
2 changes: 1 addition & 1 deletion src/lib/config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as snykConfig from 'snyk-config';
import * as userConfig from './user-config';
import { config as userConfig } from './user-config';
import * as url from 'url';

const DEFAULT_TIMEOUT = 5 * 60; // in seconds
Expand Down
2 changes: 1 addition & 1 deletion src/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@ snyk.isolate = {
};

// this is the user config, and not the internal config
snyk.config = require('./user-config');
snyk.config = require('./user-config').config;
4 changes: 1 addition & 3 deletions src/lib/user-config.js → src/lib/user-config.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const Configstore = require('@snyk/configstore');
const pkg = require(__dirname + '/../../package.json');
const config = new Configstore(pkg.name);

module.exports = config;
export const config = new Configstore(pkg.name);
2 changes: 1 addition & 1 deletion test/acceptance/cli-monitor/cli-monitor.acceptance.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as cli from '../../../src/cli/commands';
import { fakeServer } from '../fake-server';
import * as subProcess from '../../../src/lib/sub-process';
import { getVersion } from '../../../src/lib/version';
import * as userConfig from '../../../src/lib/user-config';
import { config as userConfig } from '../../../src/lib/user-config';
import { chdirWorkspaces, getWorkspaceJSON } from '../workspace-helper';
import * as _ from 'lodash';

Expand Down
2 changes: 1 addition & 1 deletion test/acceptance/cli-protect.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test } from 'tap';
import { exec } from 'child_process';
import * as userConfig from '../../src/lib/user-config';
import { config as userConfig } from '../../src/lib/user-config';
import { sep } from 'path';
import * as tap from 'tap';
import * as path from 'path';
Expand Down

0 comments on commit 8490b07

Please sign in to comment.