From 6cc3285eab0813c79e9d47da48a9099722a44305 Mon Sep 17 00:00:00 2001 From: Sander Bruens Date: Fri, 19 Apr 2024 23:36:14 -0400 Subject: [PATCH] More pruning. --- infrastructure/index.ts | 27 -------- infrastructure/package.json | 9 +-- infrastructure/tsconfig.prod.json | 4 -- package-lock.json | 100 ++++++++++++++---------------- package.json | 1 - 5 files changed, 48 insertions(+), 93 deletions(-) delete mode 100644 infrastructure/index.ts delete mode 100644 infrastructure/tsconfig.prod.json diff --git a/infrastructure/index.ts b/infrastructure/index.ts deleted file mode 100644 index 3feb53515b..0000000000 --- a/infrastructure/index.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Copyright 2024 The Outline Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -export * from "./crypto"; -export * from "./custom_error"; -export * from "./hex_encoding"; -export * from "./i18n"; -export * from "./index"; -export * from "./memory_storage"; -export * from "./path_api"; -export * from "./sentry"; -export * from "./sleep"; -export * from "./timeout_promise"; -export * from "./value_stream"; diff --git a/infrastructure/package.json b/infrastructure/package.json index 564f760b6c..9af1354f7e 100644 --- a/infrastructure/package.json +++ b/infrastructure/package.json @@ -3,16 +3,11 @@ "version": "0.0.0", "private": true, "description": "Shared infrastructure code.", - "main": "./dist/index.js", - "types": "./dist/index.d.ts", - "files": [ - "dist" - ], "scripts": { - "build": "tsc --build ./tsconfig.prod.json", - "clean": "rm -rf node_modules dist" + "clean": "rm -rf node_modules" }, "devDependencies": { + "@types/jasmine": "^5.1.4", "@types/node-forge": "^1.3.11", "https-browserify": "^1.0.0", "intl-messageformat": "^10.5.11", diff --git a/infrastructure/tsconfig.prod.json b/infrastructure/tsconfig.prod.json deleted file mode 100644 index 8c0f74bb02..0000000000 --- a/infrastructure/tsconfig.prod.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "extends": "./tsconfig.json", - "exclude": ["**/*.spec.ts"] -} diff --git a/package-lock.json b/package-lock.json index 2d794da365..aec6bb3af3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,6 @@ "@typescript-eslint/eslint-plugin": "^7.7.0", "@typescript-eslint/parser": "^7.7.0", "electron-builder": "^24.13.3", - "jasmine": "^5.1.0", "node-fetch": "^2.6.7" }, "engines": { @@ -149,6 +148,12 @@ "ios-deploy": "^1.11.4" } }, + "client/node_modules/@types/jasmine": { + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.6.4.tgz", + "integrity": "sha512-qCw5sVW+ylTnrEhe5kfX4l6MgU9REXIVDa/lWEcvTOUmd+LqDYwyjovDq+Zk9blElaEHOj1URDQ/djEBVRf+pw==", + "dev": true + }, "client/node_modules/electron-builder": { "version": "23.6.0", "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.6.0.tgz", @@ -224,6 +229,19 @@ "url": "https://opencollective.com/node-fetch" } }, + "client/node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "client/src/cordova/plugin": { "name": "cordova-plugin-outline", "version": "0.0.0", @@ -236,6 +254,7 @@ "node-forge": "^1.3.1" }, "devDependencies": { + "@types/jasmine": "^5.1.4", "@types/node-forge": "^1.3.11", "https-browserify": "^1.0.0", "intl-messageformat": "^10.5.11", @@ -244,19 +263,6 @@ "typescript": "^5.4.5" } }, - "infrastructure/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", @@ -6178,9 +6184,9 @@ } }, "node_modules/@types/jasmine": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz", - "integrity": "sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz", + "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==", "dev": true }, "node_modules/@types/json-schema": { @@ -10882,19 +10888,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/config-file-ts/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/connect": { "version": "3.7.0", "dev": true, @@ -30751,16 +30744,16 @@ } }, "node_modules/typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=4.2.0" + "node": ">=14.17" } }, "node_modules/typical": { @@ -38537,9 +38530,9 @@ } }, "@types/jasmine": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.3.6.tgz", - "integrity": "sha512-3N0FpQTeiWjm+Oo1WUYWguUS7E6JLceiGTriFrG8k5PU7zRLJCzLcWURU3wjMbZGS//a2/LgjsnO3QxIlwxt9g==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-5.1.4.tgz", + "integrity": "sha512-px7OMFO/ncXxixDe1zR13V1iycqWae0MxTaw62RpFlksUi5QuNWgQJFkTQjIOvrmutJbI7Fp2Y2N1F6D2R4G6w==", "dev": true }, "@types/json-schema": { @@ -42069,12 +42062,6 @@ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz", "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==", "dev": true - }, - "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true } } }, @@ -52125,6 +52112,12 @@ "xmlbuilder2": "^3.1.1" }, "dependencies": { + "@types/jasmine": { + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-4.6.4.tgz", + "integrity": "sha512-qCw5sVW+ylTnrEhe5kfX4l6MgU9REXIVDa/lWEcvTOUmd+LqDYwyjovDq+Zk9blElaEHOj1URDQ/djEBVRf+pw==", + "dev": true + }, "electron-builder": { "version": "23.6.0", "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.6.0.tgz", @@ -52178,12 +52171,19 @@ "fetch-blob": "^3.1.4", "formdata-polyfill": "^4.0.10" } + }, + "typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "dev": true } } }, "outline-infrastructure": { "version": "file:infrastructure", "requires": { + "@types/jasmine": "^5.1.4", "@types/node-forge": "^1.3.11", "https-browserify": "^1.0.0", "intl-messageformat": "^10.5.11", @@ -52191,14 +52191,6 @@ "node-forge": "^1.3.1", "stream-http": "^3.2.0", "typescript": "^5.4.5" - }, - "dependencies": { - "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "dev": true - } } }, "outline-manager": { @@ -57570,9 +57562,9 @@ } }, "typescript": { - "version": "4.9.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", - "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true }, "typical": { diff --git a/package.json b/package.json index 5d9e2234a2..d4bb2caa14 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "@typescript-eslint/eslint-plugin": "^7.7.0", "@typescript-eslint/parser": "^7.7.0", "electron-builder": "^24.13.3", - "jasmine": "^5.1.0", "node-fetch": "^2.6.7" }, "main": "build/electron/electron/index.js"