From 3822e9fb3c6313314f8d995a9664d265837ec6c2 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Sat, 20 Jun 2020 15:18:06 +0530 Subject: [PATCH] Refactored frontend Preparing for multi-module frontend package layout --- .gitignore | 1 + .../javascript/Gruntfile.js => Gruntfile.js | 46 +++++++------ .../javascript/package.json => package.json | 4 +- pom.xml | 4 +- .../ts/src => frontend/chat}/SprintfTest.d.ts | 0 .../chat}/controller/AbstractController.ts | 0 .../chat}/controller/ChatController.ts | 0 .../chat}/controller/UserController.ts | 0 .../chat}/dto/ChatMessageDTO.ts | 0 .../chat}/dto/MessageCipherDTO.ts | 0 .../ts/src => frontend/chat}/main.ts | 0 .../chat}/model/AbstractModel.ts | 0 .../src => frontend/chat}/model/ChatModel.ts | 0 .../chat}/model/ChatModelHelper.ts | 0 .../chat}/model/FetchErrorHandler.ts | 0 .../chat}/model/ModelFactory.ts | 4 +- .../src => frontend/chat}/model/UserModel.ts | 0 .../chat}/observe/Observable.ts | 0 .../src => frontend/chat}/observe/Observer.ts | 0 .../chat}/observe/ObserverData.ts | 0 .../service/AlertifyNotificationService.ts | 0 .../chat}/service/EncryptionService.ts | 0 .../chat}/service/EncryptionServiceFactory.ts | 0 .../chat}/service/FuseSearchService.ts | 0 .../service/MarkDownItMarkDownService.ts | 0 .../chat}/service/MarkDownService.ts | 0 .../chat}/service/NotificationService.ts | 0 .../chat}/service/SJCLEncryptionService.ts | 0 .../chat}/service/SearchService.ts | 0 .../chat}/singleton/JsonAPI.ts | 0 .../chat}/singleton/Sprintf.ts | 0 .../chat}/template/TemplateFactory.ts | 0 .../chat}/view/AbstractView.ts | 0 .../ts/src => frontend/chat}/view/ChatView.ts | 0 .../chat}/view/ChatViewDeps.ts | 0 .../chat}/view/FetchHandler.ts | 0 .../ts/src => frontend/chat}/view/UserView.ts | 0 .../chat}/view/UserViewDeps.ts | 0 .../chat}/viewmodel/ActiveUserViewModel.ts | 0 .../chat}/viewmodel/ChatMessageViewModel.ts | 0 .../workers/encryption-worker/main.ts | 0 .../workers/encryption-worker/tsconfig.json | 66 ------------------- .../ts/tsconfig.json => tsconfig.json | 18 +++-- src/main/javascript/yarn.lock => yarn.lock | 0 44 files changed, 40 insertions(+), 103 deletions(-) rename src/main/javascript/Gruntfile.js => Gruntfile.js (60%) rename src/main/javascript/package.json => package.json (91%) rename src/main/{javascript/ts/src => frontend/chat}/SprintfTest.d.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/controller/AbstractController.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/controller/ChatController.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/controller/UserController.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/dto/ChatMessageDTO.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/dto/MessageCipherDTO.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/main.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/model/AbstractModel.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/model/ChatModel.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/model/ChatModelHelper.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/model/FetchErrorHandler.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/model/ModelFactory.ts (78%) rename src/main/{javascript/ts/src => frontend/chat}/model/UserModel.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/observe/Observable.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/observe/Observer.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/observe/ObserverData.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/AlertifyNotificationService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/EncryptionService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/EncryptionServiceFactory.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/FuseSearchService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/MarkDownItMarkDownService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/MarkDownService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/NotificationService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/SJCLEncryptionService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/service/SearchService.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/singleton/JsonAPI.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/singleton/Sprintf.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/template/TemplateFactory.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/AbstractView.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/ChatView.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/ChatViewDeps.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/FetchHandler.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/UserView.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/view/UserViewDeps.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/viewmodel/ActiveUserViewModel.ts (100%) rename src/main/{javascript/ts/src => frontend/chat}/viewmodel/ChatMessageViewModel.ts (100%) rename src/main/{javascript => frontend}/workers/encryption-worker/main.ts (100%) delete mode 100644 src/main/javascript/workers/encryption-worker/tsconfig.json rename src/main/javascript/ts/tsconfig.json => tsconfig.json (87%) rename src/main/javascript/yarn.lock => yarn.lock (100%) diff --git a/.gitignore b/.gitignore index 8544e28..7de2bb5 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ node_modules bundle.js bundle.min.js worker.js +node src/main/javascript/node/ dist out diff --git a/src/main/javascript/Gruntfile.js b/Gruntfile.js similarity index 60% rename from src/main/javascript/Gruntfile.js rename to Gruntfile.js index 7265082..b4c176d 100644 --- a/src/main/javascript/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,4 @@ -module.exports = function(grunt) { +module.exports = function (grunt) { // Project configuration. grunt.initConfig({ @@ -9,12 +9,12 @@ module.exports = function(grunt) { }, build: { // Target-specific file lists and/or options go here. - src: '../resources/static/js/bundle.js', - dest: '../resources/static/js/bundle.min.js' + src: 'src/main/resources/static/js/bundle.js', + dest: 'src/main/resources/static/js/bundle.min.js' }, chat_worker: { - src: '../resources/static/js/worker.js', - dest: '../resources/static/js/worker.js' + src: 'src/main/resources/static/js/worker.js', + dest: 'src/main/resources/static/js/worker.js' }, }, banner: ` @@ -27,19 +27,19 @@ module.exports = function(grunt) { `, usebanner: { dist: { - options: { - position: 'top', - banner: '/*! <%= banner %> */ ' - }, - files: { - src: [ '../resources/static/js/bundle.min.js', '../resources/static/js/worker.js' ] - } + options: { + position: 'top', + banner: '/*! <%= banner %> */ ' + }, + files: { + src: ['src/main/resources/static/js/bundle.min.js', 'src/main/resources/static/js/worker.js'] + } } - }, + }, browserify: { chat_worker_dev: { - src: 'workers/encryption-worker/main.ts', - dest: '../resources/static/js/worker.js', + src: 'src/main/frontend/workers/encryption-worker/main.ts', + dest: 'src/main/resources/static/js/worker.js', options: { browserifyOptions: { debug: true @@ -47,8 +47,8 @@ module.exports = function(grunt) { } }, dev: { - src: 'ts/src/main.ts', - dest: '../resources/static/js/bundle.js', + src: 'src/main/frontend/chat/main.ts', + dest: 'src/main/resources/static/js/bundle.js', options: { browserifyOptions: { debug: true @@ -56,8 +56,8 @@ module.exports = function(grunt) { } }, prod: { - src: 'ts/src/main.ts', - dest: '../resources/static/js/bundle.js', + src: 'src/main/frontend/chat/main.ts', + dest: 'src/main/resources/static/js/bundle.js', banner: '/*! Chat.js <%= grunt.template.today("yyyy-mm-dd") %> */ ', options: { browserifyOptions: { @@ -65,6 +65,10 @@ module.exports = function(grunt) { }, } }, + chat_worker_prod: { + src: 'src/main/frontend/workers/encryption-worker/main.ts', + dest: 'src/main/resources/static/js/worker.min.js', + }, options: { plugin: [ ['tsify', { target: 'ES6', noImplicitAny: true, esModuleInterop: true, allowSyntheticDefaultImports: true }], // register plugin by name @@ -87,7 +91,7 @@ module.exports = function(grunt) { - grunt.registerTask('default', ['browserify:dev','browserify:chat_worker_dev']) - grunt.registerTask('prod', ["browserify:prod", 'browserify:chat_worker_dev', "terser",'usebanner']) + grunt.registerTask('default', ['browserify:dev', 'browserify:chat_worker_dev']) + grunt.registerTask('prod', ["browserify:prod", 'browserify:chat_worker_dev', "terser", 'usebanner']) }; \ No newline at end of file diff --git a/src/main/javascript/package.json b/package.json similarity index 91% rename from src/main/javascript/package.json rename to package.json index 33e844e..a123bb0 100644 --- a/src/main/javascript/package.json +++ b/package.json @@ -55,6 +55,6 @@ } }, "scripts": { - "watch": "watchify ts/src/main.ts -p [ tsify --target ES6 --noImplicitAny ] --debug -o ../resources/static/js/bundle.js" + "watch": "watchify src/main/frontend/chat/main.ts -p [ tsify --target ES6 --noImplicitAny ] --debug -o src/main/resources/static/js/bundle.js" } -} +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index ee37c5f..171fa7d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,4 @@ - + 4.0.0 @@ -152,7 +152,7 @@ frontend-maven-plugin 1.9.1 - src/main/javascript/ + . diff --git a/src/main/javascript/ts/src/SprintfTest.d.ts b/src/main/frontend/chat/SprintfTest.d.ts similarity index 100% rename from src/main/javascript/ts/src/SprintfTest.d.ts rename to src/main/frontend/chat/SprintfTest.d.ts diff --git a/src/main/javascript/ts/src/controller/AbstractController.ts b/src/main/frontend/chat/controller/AbstractController.ts similarity index 100% rename from src/main/javascript/ts/src/controller/AbstractController.ts rename to src/main/frontend/chat/controller/AbstractController.ts diff --git a/src/main/javascript/ts/src/controller/ChatController.ts b/src/main/frontend/chat/controller/ChatController.ts similarity index 100% rename from src/main/javascript/ts/src/controller/ChatController.ts rename to src/main/frontend/chat/controller/ChatController.ts diff --git a/src/main/javascript/ts/src/controller/UserController.ts b/src/main/frontend/chat/controller/UserController.ts similarity index 100% rename from src/main/javascript/ts/src/controller/UserController.ts rename to src/main/frontend/chat/controller/UserController.ts diff --git a/src/main/javascript/ts/src/dto/ChatMessageDTO.ts b/src/main/frontend/chat/dto/ChatMessageDTO.ts similarity index 100% rename from src/main/javascript/ts/src/dto/ChatMessageDTO.ts rename to src/main/frontend/chat/dto/ChatMessageDTO.ts diff --git a/src/main/javascript/ts/src/dto/MessageCipherDTO.ts b/src/main/frontend/chat/dto/MessageCipherDTO.ts similarity index 100% rename from src/main/javascript/ts/src/dto/MessageCipherDTO.ts rename to src/main/frontend/chat/dto/MessageCipherDTO.ts diff --git a/src/main/javascript/ts/src/main.ts b/src/main/frontend/chat/main.ts similarity index 100% rename from src/main/javascript/ts/src/main.ts rename to src/main/frontend/chat/main.ts diff --git a/src/main/javascript/ts/src/model/AbstractModel.ts b/src/main/frontend/chat/model/AbstractModel.ts similarity index 100% rename from src/main/javascript/ts/src/model/AbstractModel.ts rename to src/main/frontend/chat/model/AbstractModel.ts diff --git a/src/main/javascript/ts/src/model/ChatModel.ts b/src/main/frontend/chat/model/ChatModel.ts similarity index 100% rename from src/main/javascript/ts/src/model/ChatModel.ts rename to src/main/frontend/chat/model/ChatModel.ts diff --git a/src/main/javascript/ts/src/model/ChatModelHelper.ts b/src/main/frontend/chat/model/ChatModelHelper.ts similarity index 100% rename from src/main/javascript/ts/src/model/ChatModelHelper.ts rename to src/main/frontend/chat/model/ChatModelHelper.ts diff --git a/src/main/javascript/ts/src/model/FetchErrorHandler.ts b/src/main/frontend/chat/model/FetchErrorHandler.ts similarity index 100% rename from src/main/javascript/ts/src/model/FetchErrorHandler.ts rename to src/main/frontend/chat/model/FetchErrorHandler.ts diff --git a/src/main/javascript/ts/src/model/ModelFactory.ts b/src/main/frontend/chat/model/ModelFactory.ts similarity index 78% rename from src/main/javascript/ts/src/model/ModelFactory.ts rename to src/main/frontend/chat/model/ModelFactory.ts index fdd68f0..8f1cb90 100644 --- a/src/main/javascript/ts/src/model/ModelFactory.ts +++ b/src/main/frontend/chat/model/ModelFactory.ts @@ -4,8 +4,8 @@ import { UserModel } from "./UserModel"; export class ModelFactory { static createModel(modelName: string): Model { switch (modelName) { - case "USER": return new UserModel(); - break; + // case "USER": return new UserModel(); + // break; default: throw new Error("Invalid model name"); } } diff --git a/src/main/javascript/ts/src/model/UserModel.ts b/src/main/frontend/chat/model/UserModel.ts similarity index 100% rename from src/main/javascript/ts/src/model/UserModel.ts rename to src/main/frontend/chat/model/UserModel.ts diff --git a/src/main/javascript/ts/src/observe/Observable.ts b/src/main/frontend/chat/observe/Observable.ts similarity index 100% rename from src/main/javascript/ts/src/observe/Observable.ts rename to src/main/frontend/chat/observe/Observable.ts diff --git a/src/main/javascript/ts/src/observe/Observer.ts b/src/main/frontend/chat/observe/Observer.ts similarity index 100% rename from src/main/javascript/ts/src/observe/Observer.ts rename to src/main/frontend/chat/observe/Observer.ts diff --git a/src/main/javascript/ts/src/observe/ObserverData.ts b/src/main/frontend/chat/observe/ObserverData.ts similarity index 100% rename from src/main/javascript/ts/src/observe/ObserverData.ts rename to src/main/frontend/chat/observe/ObserverData.ts diff --git a/src/main/javascript/ts/src/service/AlertifyNotificationService.ts b/src/main/frontend/chat/service/AlertifyNotificationService.ts similarity index 100% rename from src/main/javascript/ts/src/service/AlertifyNotificationService.ts rename to src/main/frontend/chat/service/AlertifyNotificationService.ts diff --git a/src/main/javascript/ts/src/service/EncryptionService.ts b/src/main/frontend/chat/service/EncryptionService.ts similarity index 100% rename from src/main/javascript/ts/src/service/EncryptionService.ts rename to src/main/frontend/chat/service/EncryptionService.ts diff --git a/src/main/javascript/ts/src/service/EncryptionServiceFactory.ts b/src/main/frontend/chat/service/EncryptionServiceFactory.ts similarity index 100% rename from src/main/javascript/ts/src/service/EncryptionServiceFactory.ts rename to src/main/frontend/chat/service/EncryptionServiceFactory.ts diff --git a/src/main/javascript/ts/src/service/FuseSearchService.ts b/src/main/frontend/chat/service/FuseSearchService.ts similarity index 100% rename from src/main/javascript/ts/src/service/FuseSearchService.ts rename to src/main/frontend/chat/service/FuseSearchService.ts diff --git a/src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts b/src/main/frontend/chat/service/MarkDownItMarkDownService.ts similarity index 100% rename from src/main/javascript/ts/src/service/MarkDownItMarkDownService.ts rename to src/main/frontend/chat/service/MarkDownItMarkDownService.ts diff --git a/src/main/javascript/ts/src/service/MarkDownService.ts b/src/main/frontend/chat/service/MarkDownService.ts similarity index 100% rename from src/main/javascript/ts/src/service/MarkDownService.ts rename to src/main/frontend/chat/service/MarkDownService.ts diff --git a/src/main/javascript/ts/src/service/NotificationService.ts b/src/main/frontend/chat/service/NotificationService.ts similarity index 100% rename from src/main/javascript/ts/src/service/NotificationService.ts rename to src/main/frontend/chat/service/NotificationService.ts diff --git a/src/main/javascript/ts/src/service/SJCLEncryptionService.ts b/src/main/frontend/chat/service/SJCLEncryptionService.ts similarity index 100% rename from src/main/javascript/ts/src/service/SJCLEncryptionService.ts rename to src/main/frontend/chat/service/SJCLEncryptionService.ts diff --git a/src/main/javascript/ts/src/service/SearchService.ts b/src/main/frontend/chat/service/SearchService.ts similarity index 100% rename from src/main/javascript/ts/src/service/SearchService.ts rename to src/main/frontend/chat/service/SearchService.ts diff --git a/src/main/javascript/ts/src/singleton/JsonAPI.ts b/src/main/frontend/chat/singleton/JsonAPI.ts similarity index 100% rename from src/main/javascript/ts/src/singleton/JsonAPI.ts rename to src/main/frontend/chat/singleton/JsonAPI.ts diff --git a/src/main/javascript/ts/src/singleton/Sprintf.ts b/src/main/frontend/chat/singleton/Sprintf.ts similarity index 100% rename from src/main/javascript/ts/src/singleton/Sprintf.ts rename to src/main/frontend/chat/singleton/Sprintf.ts diff --git a/src/main/javascript/ts/src/template/TemplateFactory.ts b/src/main/frontend/chat/template/TemplateFactory.ts similarity index 100% rename from src/main/javascript/ts/src/template/TemplateFactory.ts rename to src/main/frontend/chat/template/TemplateFactory.ts diff --git a/src/main/javascript/ts/src/view/AbstractView.ts b/src/main/frontend/chat/view/AbstractView.ts similarity index 100% rename from src/main/javascript/ts/src/view/AbstractView.ts rename to src/main/frontend/chat/view/AbstractView.ts diff --git a/src/main/javascript/ts/src/view/ChatView.ts b/src/main/frontend/chat/view/ChatView.ts similarity index 100% rename from src/main/javascript/ts/src/view/ChatView.ts rename to src/main/frontend/chat/view/ChatView.ts diff --git a/src/main/javascript/ts/src/view/ChatViewDeps.ts b/src/main/frontend/chat/view/ChatViewDeps.ts similarity index 100% rename from src/main/javascript/ts/src/view/ChatViewDeps.ts rename to src/main/frontend/chat/view/ChatViewDeps.ts diff --git a/src/main/javascript/ts/src/view/FetchHandler.ts b/src/main/frontend/chat/view/FetchHandler.ts similarity index 100% rename from src/main/javascript/ts/src/view/FetchHandler.ts rename to src/main/frontend/chat/view/FetchHandler.ts diff --git a/src/main/javascript/ts/src/view/UserView.ts b/src/main/frontend/chat/view/UserView.ts similarity index 100% rename from src/main/javascript/ts/src/view/UserView.ts rename to src/main/frontend/chat/view/UserView.ts diff --git a/src/main/javascript/ts/src/view/UserViewDeps.ts b/src/main/frontend/chat/view/UserViewDeps.ts similarity index 100% rename from src/main/javascript/ts/src/view/UserViewDeps.ts rename to src/main/frontend/chat/view/UserViewDeps.ts diff --git a/src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts b/src/main/frontend/chat/viewmodel/ActiveUserViewModel.ts similarity index 100% rename from src/main/javascript/ts/src/viewmodel/ActiveUserViewModel.ts rename to src/main/frontend/chat/viewmodel/ActiveUserViewModel.ts diff --git a/src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts b/src/main/frontend/chat/viewmodel/ChatMessageViewModel.ts similarity index 100% rename from src/main/javascript/ts/src/viewmodel/ChatMessageViewModel.ts rename to src/main/frontend/chat/viewmodel/ChatMessageViewModel.ts diff --git a/src/main/javascript/workers/encryption-worker/main.ts b/src/main/frontend/workers/encryption-worker/main.ts similarity index 100% rename from src/main/javascript/workers/encryption-worker/main.ts rename to src/main/frontend/workers/encryption-worker/main.ts diff --git a/src/main/javascript/workers/encryption-worker/tsconfig.json b/src/main/javascript/workers/encryption-worker/tsconfig.json deleted file mode 100644 index 9fa07a6..0000000 --- a/src/main/javascript/workers/encryption-worker/tsconfig.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "compilerOptions": { - /* Basic Options */ - // "incremental": true, /* Enable incremental compilation */ - "target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ - // "lib": [], /* Specify library files to be included in the compilation. */ - // "allowJs": true, /* Allow javascript files to be compiled. */ - // "checkJs": true, /* Report errors in .js files. */ - // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */ - // "declaration": true, /* Generates corresponding '.d.ts' file. */ - // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ - // "sourceMap": true, /* Generates corresponding '.map' file. */ - // "outFile": "./", /* Concatenate and emit output to single file. */ - // "outDir": "./", /* Redirect output structure to the directory. */ - // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ - // "composite": true, /* Enable project compilation */ - // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ - // "removeComments": true, /* Do not emit comments to output. */ - // "noEmit": true, /* Do not emit outputs. */ - // "importHelpers": true, /* Import emit helpers from 'tslib'. */ - // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ - // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ - - /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* Enable strict null checks. */ - // "strictFunctionTypes": true, /* Enable strict checking of function types. */ - // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ - // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ - // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ - // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ - - /* Additional Checks */ - // "noUnusedLocals": true, /* Report errors on unused locals. */ - // "noUnusedParameters": true, /* Report errors on unused parameters. */ - // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ - // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ - - /* Module Resolution Options */ - // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ - // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ - // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ - // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ - // "typeRoots": [], /* List of folders to include type definitions from. */ - // "types": [], /* Type declaration files to be included in compilation. */ - "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ - // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - - /* Source Map Options */ - // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ - // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ - - /* Experimental Options */ - // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ - // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ - - /* Advanced Options */ - "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ - } -} diff --git a/src/main/javascript/ts/tsconfig.json b/tsconfig.json similarity index 87% rename from src/main/javascript/ts/tsconfig.json rename to tsconfig.json index c15a0ba..dce5a40 100644 --- a/src/main/javascript/ts/tsconfig.json +++ b/tsconfig.json @@ -2,8 +2,8 @@ "compilerOptions": { /* Basic Options */ // "incremental": true, /* Enable incremental compilation */ - "target": "ES2017", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */ - "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */ + "target": "ES6" /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */, + "module": "commonjs" /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */, // "lib": [ "ES2015" ], // "lib": [], /* Specify library files to be included in the compilation. */ // "allowJs": true, /* Allow javascript files to be compiled. */ @@ -13,7 +13,7 @@ // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ // "sourceMap": true, /* Generates corresponding '.map' file. */ // "outFile": "./", /* Concatenate and emit output to single file. */ - "outDir": "./out", /* Redirect output structure to the directory. */ + // "outDir": "./out" /* Redirect output structure to the directory. */, // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ // "composite": true, /* Enable project compilation */ // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ @@ -23,7 +23,7 @@ // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ /* Strict Type-Checking Options */ - "strict": true, /* Enable all strict type-checking options. */ + "strict": true /* Enable all strict type-checking options. */, // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ // "strictNullChecks": true, /* Enable strict null checks. */ // "strictFunctionTypes": true, /* Enable strict checking of function types. */ @@ -44,9 +44,9 @@ // "typeRoots": [], /* List of folders to include type definitions from. */ // "types": [], /* Type declaration files to be included in compilation. */ // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ - "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */, // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ - "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + "allowUmdGlobalAccess": true /* Allow accessing UMD globals from modules. */, /* Source Map Options */ // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ @@ -58,7 +58,5 @@ /* Advanced Options */ "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ }, - "include": [ - "src/**/*" - ] -} \ No newline at end of file + "include": ["src/main/frontend/**/*"] +} diff --git a/src/main/javascript/yarn.lock b/yarn.lock similarity index 100% rename from src/main/javascript/yarn.lock rename to yarn.lock