From de29b02089dae9c5f2b3949dc913c464757df8fe Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 18 Dec 2019 13:21:58 +1000 Subject: [PATCH] deckbrowser and overview --- Makefile | 2 +- web/deckbrowser.js => ts/deckbrowser.ts | 0 ts/lib/global.d.ts | 1 + web/overview.js => ts/overview.ts | 0 ts/package-lock.json | 9 +++++++++ ts/package.json | 1 + ts/tsconfig.json | 21 --------------------- web/.gitignore | 2 ++ 8 files changed, 14 insertions(+), 22 deletions(-) rename web/deckbrowser.js => ts/deckbrowser.ts (100%) create mode 100644 ts/lib/global.d.ts rename web/overview.js => ts/overview.ts (100%) delete mode 100644 ts/tsconfig.json diff --git a/Makefile b/Makefile index 914e09c24..f3cfb1d7a 100644 --- a/Makefile +++ b/Makefile @@ -93,4 +93,4 @@ JSDEPS := $(patsubst ts/%.ts, web/%.js, $(TSDEPS)) js: $(JSDEPS) web/%.js: ts/%.ts - (cd ts && ./node_modules/.bin/tsc $(notdir $<) --outFile ../web/$(notdir $@)) + (cd ts && ./node_modules/.bin/tsc lib/global.d.ts $(notdir $<) --outFile ../web/$(notdir $@)) diff --git a/web/deckbrowser.js b/ts/deckbrowser.ts similarity index 100% rename from web/deckbrowser.js rename to ts/deckbrowser.ts diff --git a/ts/lib/global.d.ts b/ts/lib/global.d.ts new file mode 100644 index 000000000..d5f0b2d82 --- /dev/null +++ b/ts/lib/global.d.ts @@ -0,0 +1 @@ +declare function pycmd(cmd: string): any; diff --git a/web/overview.js b/ts/overview.ts similarity index 100% rename from web/overview.js rename to ts/overview.ts diff --git a/ts/package-lock.json b/ts/package-lock.json index afd442f36..ab2f91216 100644 --- a/ts/package-lock.json +++ b/ts/package-lock.json @@ -13,6 +13,15 @@ "@types/sizzle": "*" } }, + "@types/jqueryui": { + "version": "1.12.9", + "resolved": "https://registry.npmjs.org/@types/jqueryui/-/jqueryui-1.12.9.tgz", + "integrity": "sha512-bHE7BiG+5Sviy/eA9Npz5HHF3hv40XjaEbpYtSJPaNwuyxhSJ0qWlE8C5DgNMfobVOZ2aSTrM1iGDCGmvlbxOg==", + "dev": true, + "requires": { + "@types/jquery": "*" + } + }, "@types/mathjax": { "version": "0.0.36", "resolved": "https://registry.npmjs.org/@types/mathjax/-/mathjax-0.0.36.tgz", diff --git a/ts/package.json b/ts/package.json index 4f0100257..1f8e27e7b 100644 --- a/ts/package.json +++ b/ts/package.json @@ -12,6 +12,7 @@ "license": "AGPL-3.0-or-later", "devDependencies": { "@types/jquery": "^3.3.31", + "@types/jqueryui": "^1.12.9", "@types/mathjax": "0.0.36", "typescript": "^3.7.3" } diff --git a/ts/tsconfig.json b/ts/tsconfig.json deleted file mode 100644 index d4a7c73f2..000000000 --- a/ts/tsconfig.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "esModuleInterop": true, - "allowSyntheticDefaultImports": true, - "target": "es6", - "noImplicitAny": true, - "moduleResolution": "node", - "sourceMap": false, - "baseUrl": ".", - "paths": { - "*": [ - "node_modules/*", - "src/types/*" - ] - } - }, - "include": [ - "src/**/*" - ] -} \ No newline at end of file diff --git a/web/.gitignore b/web/.gitignore index fc49dedb8..a1ac15cd6 100644 --- a/web/.gitignore +++ b/web/.gitignore @@ -1 +1,3 @@ webview.js +deckbrowser.js +overview.js