mirror/insomnia
1
0 Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-10-25 08:09:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Flatten insomnia-libcurl package (#2081)

Browse Source 
* Remove unnecessary insomnia-libcurl package to flatter installation dirs

* Remove empty test folder

* Fix inlc mock
This commit is contained in:
Gregory Schier authored and GitHub committed 2020-04-29 12:59:46 -07:00
1 parent 869f042de5
commit 58fed78d06
16 files changed
+9089 -9585
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/insomnia-app/app/__mocks__/insomnia-libcurl.js → packages/insomnia-app/app/__mocks__/inlc.js
View File
File renamed without changes.
packages/insomnia-app/app/main/window-utils.js
+1 -1
View File
@@ -1,6 +1,6 @@
import electron from 'electron';
import path from 'path';
import { Curl } from 'insomnia-libcurl';
import { Curl } from '../node-libcurl/curl';
import fs from 'fs';
import LocalStorage from './local-storage';
import {
packages/insomnia-app/app/network/network.js
+1 -1
View File
@@ -13,7 +13,7 @@ import mkdirp from 'mkdirp';
import crypto from 'crypto';
import clone from 'clone';
import { parse as urlParse, resolve as urlResolve } from 'url';
import { Curl } from 'insomnia-libcurl';
import { Curl } from '../node-libcurl/curl';
import { join as pathJoin } from 'path';
import uuid from 'uuid';
import * as models from '../models';
packages/insomnia-libcurl/src/curl.js → packages/insomnia-app/app/node-libcurl/curl.js
+2 -4
View File
@@ -1,6 +1,6 @@
const nodeLibcurl = require('inlc');
import nodeLibcurl from 'inlc';
class Curl {
export class Curl {
constructor() {
this._handle = null;
this._options = [];
@@ -85,5 +85,3 @@ Curl.auth = nodeLibcurl.Curl.auth;
Curl.code = nodeLibcurl.Curl.code;
Curl.netrc = nodeLibcurl.Curl.netrc;
Curl.info = nodeLibcurl.Curl.info;
module.exports = Curl;
packages/insomnia-app/app/ui/components/modals/settings-modal.js
+1 -1
View File
@@ -12,7 +12,7 @@ import ImportExport from '../settings/import-export';
import Plugins from '../settings/plugins';
import Theme from '../settings/theme';
import * as models from '../../../models/index';
import { Curl } from 'insomnia-libcurl';
import { Curl } from '../../../node-libcurl/curl';
import { getAppName, getAppVersion, isInsomnia } from '../../../common/constants';
import Tooltip from '../tooltip';
import { setTheme } from '../../../plugins/misc';
packages/insomnia-app/flow-typed/insomnia-libcurl.js
Vendored
-101
View File
@@ -1,101 +0,0 @@
// @flow
declare class Curl {
static getVersion: () => string;
static feature: {
NO_HEADER_PARSING: number,
NO_DATA_PARSING: number,
};
static option: {
ACCEPT_ENCODING: number,
CAINFO: number,
COOKIE: number,
COOKIEFILE: number,
COOKIELIST: number,
CUSTOMREQUEST: number,
DEBUGFUNCTION: number,
FOLLOWLOCATION: number,
HTTPAUTH: number,
HTTPGET: number,
HTTPHEADER: number,
HTTPPOST: number,
INFILESIZE_LARGE: number,
KEYPASSWD: number,
MAXREDIRS: number,
NETRC: number,
NOBODY: number,
NOPROGRESS: number,
NOPROXY: number,
PASSWORD: number,
PATH_AS_IS: number,
POST: number,
POSTFIELDS: number,
PROXY: number,
PROXYAUTH: number,
READDATA: number,
READFUNCTION: number,
SSLCERT: number,
SSLCERTTYPE: number,
SSLKEY: number,
SSL_VERIFYHOST: number,
SSL_VERIFYPEER: number,
TIMEOUT_MS: number,
UNIX_SOCKET_PATH: number,
UPLOAD: number,
URL: number,
USERAGENT: number,
USERNAME: number,
VERBOSE: number,
WRITEFUNCTION: number,
XFERINFOFUNCTION: number,
};
static auth: {
NTLM: string,
DIGEST: string,
BASIC: string,
ANY: string,
};
static code: {
CURLE_ABORTED_BY_CALLBACK: string,
};
static netrc: {
IGNORED: number,
OPTIONAL: number,
REQUIRED: number,
};
static info: {
EFFECTIVE_URL: string,
SIZE_DOWNLOAD: string,
TOTAL_TIME: string,
debug: {
SSL_DATA_IN: string,
SSL_DATA_OUT: string,
DATA_OUT: string,
DATA_IN: string,
TEXT: string,
},
};
setOpt: (option: number, ...args: Array<any>) => void;
enable: (option: number, ...args: Array<any>) => void;
getInfo: (option: string, ...args: Array<any>) => any;
perform: () => void;
close: () => void;
on: (event: string, callback: Function) => void;
// ~~~~~~~~~~~ //
// New Methods //
// ~~~~~~~~~~~ //
setUrl: (url: string) => void;
}
declare module 'insomnia-libcurl' {
declare module.exports: {
Curl: typeof Curl,
};
}
packages/insomnia-app/package-lock.json
Generated
+9048 -8142
View File
File diff suppressed because it is too large. Load diff
packages/insomnia-app/package.json
+2 -2
View File
@@ -18,7 +18,7 @@
"build": "node ./scripts/build.js",
"package": "node ./scripts/package.js",
"release": "node ./scripts/release.js",
"bootstrap": "rimraf ./**/node_modules/fsevents && rimraf node_modules/graphql-language-service-interface/dist/*.flow && electron-rebuild -f -w insomnia-libcurl"
"bootstrap": "rimraf ./**/node_modules/fsevents && rimraf node_modules/graphql-language-service-interface/dist/*.flow && electron-rebuild -f -w inlc"
},
"dev": {
"dev-server-port": 3334
@@ -114,10 +114,10 @@
"html-entities": "^1.2.0",
"httpsnippet": "^1.19.1",
"iconv-lite": "^0.4.15",
"inlc": "^2.0.0-alpha.0-2",
"insomnia-components": "^2.2.3",
"insomnia-cookies": "^2.1.4",
"insomnia-importers": "^2.2.3",
"insomnia-libcurl": "^2.2.3",
"insomnia-plugin-base64": "^2.2.2",
"insomnia-plugin-cookie-jar": "^2.2.2",
"insomnia-plugin-core-themes": "^2.2.2",
packages/insomnia-components/package-lock.json
Generated
+11 -30
View File
@@ -6710,8 +6710,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@@ -6732,14 +6731,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -6754,20 +6751,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -6884,8 +6878,7 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@@ -6897,7 +6890,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -6912,7 +6904,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -6920,14 +6911,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -6946,7 +6935,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -7036,8 +7024,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -7049,7 +7036,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -7135,8 +7121,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -7172,7 +7157,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -7192,7 +7176,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -7236,14 +7219,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
packages/insomnia-libcurl/README.md
-5
View File
@@ -1,5 +0,0 @@
# Insomnia Libcurl
[![Npm Version](https://img.shields.io/npm/v/insomnia-libcurl.svg)](https://www.npmjs.com/package/insomnia-libcurl)
Libcurl helper for Insomnia.
packages/insomnia-libcurl/index.js
-3
View File
@@ -1,3 +0,0 @@
module.exports = {
Curl: require('./src/curl'),
};
packages/insomnia-libcurl/package-lock.json
Generated
-1207
View File
File diff suppressed because it is too large. Load diff
packages/insomnia-libcurl/package.json
-17
View File
@@ -1,17 +0,0 @@
{
"name": "insomnia-libcurl",
"version": "2.2.3",
"author": "Gregory Schier <greg.schier@konghq.com>",
"description": "Insomnia libcurl wrapper",
"license": "MIT",
"main": "index.js",
"scripts": {
"test": "node --version"
},
"dependencies": {
"fstream": "^1.0.12",
"inlc": "^2.0.0-alpha.0-2",
"tar": "^4.4.10"
},
"gitHead": "e46bf021cf4b4379e31d2b2d9025d476d6839fa1"
}
packages/insomnia-libcurl/src/__tests__/index.test.js
-9
View File
@@ -1,9 +0,0 @@
// TODO: Figure out good way to get tests working AND run in Electron
// const {Curl} = require('../curl');
//
// describe('Curl', () => {
// it('hello', () => {
// const curl = new Curl();
// expect(curl).toBeDefined();
// });
// });
packages/openapi-2-kong/package-lock.json
Generated
+11 -30
View File
@@ -1869,8 +1869,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@@ -1891,14 +1890,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -1913,20 +1910,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2043,8 +2037,7 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@@ -2056,7 +2049,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -2071,7 +2063,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -2079,14 +2070,12 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.3.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -2105,7 +2094,6 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -2186,8 +2174,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -2199,7 +2186,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -2285,8 +2271,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -2322,7 +2307,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -2342,7 +2326,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -2386,14 +2369,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.0.3",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},
plugins/insomnia-plugin-kong-portal/package-lock.json
Generated
+12 -32
View File
@@ -2588,8 +2588,7 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"aproba": {
"version": "1.2.0",
@@ -2610,14 +2609,12 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2632,20 +2629,17 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"core-util-is": {
"version": "1.0.2",
@@ -2762,8 +2756,7 @@
"inherits": {
"version": "2.0.4",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"ini": {
"version": "1.3.5",
@@ -2775,7 +2768,6 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -2790,7 +2782,6 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -2798,14 +2789,12 @@
"minimist": {
"version": "1.2.5",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
@@ -2824,7 +2813,6 @@
"version": "0.5.3",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "^1.2.5"
}
@@ -2886,8 +2874,7 @@
"npm-normalize-package-bin": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"npm-packlist": {
"version": "1.4.8",
@@ -2915,8 +2902,7 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"object-assign": {
"version": "4.1.1",
@@ -2928,7 +2914,6 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
@@ -3006,8 +2991,7 @@
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -3043,7 +3027,6 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -3063,7 +3046,6 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -3107,14 +3089,12 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
"dev": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"dev": true,
"optional": true
"dev": true
}
}
},