diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-05-07 15:16:25 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-05-07 15:16:25 +0200 |
| commit | 8443607d58e7e3e7be533b92ae76fd4cc54e4c57 (patch) | |
| tree | 0e0b9966f321c30b9d6ee1b52e251068d47ba9fb | |
| parent | 41507032ef77463a846f1e7bc0fb1efb955256ff (diff) | |
| parent | a942da1863924be9822ce6d710de5daba0f9a8a5 (diff) | |
| download | mullvadvpn-8443607d58e7e3e7be533b92ae76fd4cc54e4c57.tar.xz mullvadvpn-8443607d58e7e3e7be533b92ae76fd4cc54e4c57.zip | |
Merge branch 'add-typescript-incremental-builds'
| -rwxr-xr-x | gui/electron-builder.yml | 1 | ||||
| -rw-r--r-- | gui/package-lock.json | 8 | ||||
| -rw-r--r-- | gui/package.json | 2 | ||||
| -rw-r--r-- | gui/tsconfig.json | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/gui/electron-builder.yml b/gui/electron-builder.yml index c3010e6764..adfc248cb0 100755 --- a/gui/electron-builder.yml +++ b/gui/electron-builder.yml @@ -29,6 +29,7 @@ files: - init.js - build/ - node_modules/ + - "!**/*.tsbuildinfo" mac: target: pkg diff --git a/gui/package-lock.json b/gui/package-lock.json index fba0a8f610..21da62c1fb 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -1,6 +1,6 @@ { "name": "mullvad-vpn", - "version": "2019.3.0", + "version": "2019.4.0-beta1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -7936,9 +7936,9 @@ "dev": true }, "typescript": { - "version": "3.3.3333", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.3333.tgz", - "integrity": "sha512-JjSKsAfuHBE/fB2oZ8NxtRTk5iGcg6hkYXMnZ3Wc+b2RSqejEqTaem11mHASMnFilHrax3sLK0GDzcJrekZYLw==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", + "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==", "dev": true }, "ua-parser-js": { diff --git a/gui/package.json b/gui/package.json index b54e8f9a31..2b60937818 100644 --- a/gui/package.json +++ b/gui/package.json @@ -80,7 +80,7 @@ "tslint": "^5.15.0", "tslint-config-prettier": "^1.18.0", "tslint-react": "^4.0.0", - "typescript": "^3.3.3" + "typescript": "^3.4.5" }, "scripts": { "postinstall": "cross-env ELECTRON_BUILDER_ALLOW_UNRESOLVED_DEPENDENCIES=true electron-builder install-app-deps", diff --git a/gui/tsconfig.json b/gui/tsconfig.json index c862eb57e4..03feea0e23 100644 --- a/gui/tsconfig.json +++ b/gui/tsconfig.json @@ -16,6 +16,7 @@ "skipLibCheck": true, "strict": true, "target": "es2017", + "incremental": true, "lib": ["es2017", "dom"], "typeRoots": [ "./types", |