Merge pull request #55 from Caleydo/release-1.0.0

.circleci/config.yml

@@ -3,39 +3,33 @@ jobs:
   build:
     working_directory: ~/phovea
     docker:
-      - image: circleci/node:12-browsers
+      - image: circleci/node:12.13-buster-browsers
     steps:
       - checkout
       - run:
           name: Show Node.js and npm version
           command: |
             node -v
             npm -v
-      - run:
-          name: NPM Force Resolutions
-          command: npx npm-force-resolutions
       - restore_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
       - run:
           name: Install npm dependencies
-          command: npm ci
-      # - run:
-      #     name: Remove npm dependencies installed from git repositories (avoid caching of old commits)
-      #     command: |
-      #       (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
+          command: npm install
+      - run:
+          name: Remove npm dependencies installed from git repositories (avoid caching of old commits)
+          command: |
+            (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
       - save_cache:
-          key: deps1-{{ .Branch }}-{{ checksum "package-lock.json" }}
+          key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
           paths:
           - ./node_modules
-      # - run:
-      #     name: Install npm dependencies from git repositories (always get latest commit)
-      #     command: npm install
       - run:
-          name: List node_modules directory
-          command: ls -la ./node_modules
+          name: Install npm dependencies from git repositories (always get latest commit)
+          command: npm install
       - run:
           name: Show installed npm dependencies
-          command: npm list --depth=2 || true
+          command: npm list --depth=1 || true
       - run:
           name: Build
           command: npm run dist

.gitattributes

@@ -125,3 +125,10 @@ AUTHORS text
 # with the python modules ``pickle``, ``dbm.*``,
 # ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
 # (among others).
+
+
+# Mark compiled files as generated to hide them in PRs
+/dist/** linguist-generated=true
+
+# Hide compiled files from git diff and auto-replace them when merging different branches
+/dist/** -diff -merge

.github/CODEOWNERS

@@ -0,0 +1 @@
+*   @thinkh 

.gitignore

@@ -1,11 +1,14 @@
 /.tscache
 /.idea
-/build/
-/dist/
+/lib/
+/dist/tsBuildInfoFile
 node_modules/
 /src/**/*.js
 /tests/**/*.js
-*.map
+/src/**/*.map
+/tests/**/*.map
 *.css
 *.log
-/.cache-loader
+/.awcache
+/.cache-loader
+package-lock.json

.yo-rc.json

@@ -2,12 +2,17 @@
   "generator-phovea": {
     "type": "app",
     "name": "vega_clue",
-    "app": "Vega CLUE",
+    "app": "vega_clue",
     "author": "The Caleydo Team",
     "githubAccount": "caleydo",
     "clientOnly": false,
     "entries": {
-      "app": "./src/index.ts"
+      "app": {
+        "js": "dist/initialize.js",
+        "template": "dist/index.template.ejs",
+        "html": "index.html",
+        "chunkName": "app"
+      }
     },
     "libraries": [
       "d3"
@@ -17,8 +22,17 @@
       "phovea_ui",
       "phovea_clue"
     ],
+    "vendors": {
+      "others": "phovea.*|tdp_.*|tdp-.*|datavisyn.*",
+      "phovea": "phovea.*",
+      "tdp": "tdp_.|tdp-.*",
+      "dv": "datavisyn.*"
+    },
+    "filesToLoad": {
+      "file-loader": "404|robots"
+    },
     "libraryAliases": {
-      "d3": "d3/d3"
+      "d3": "d3/d3.js"
     },
     "libraryExternals": [
       "d3",
@@ -28,6 +42,12 @@
     ],
     "ignores": [],
     "extensions": [],
-    "today": "Tue, 13 Mar 2018 10:20:09 GMT"
+    "today": "Tue, 13 Mar 2018 10:20:09 GMT",
+    "promptValues": {
+      "authorName": "The Caleydo Team",
+      "authorEmail": "contact@caleydo.org",
+      "authorUrl": "https://caleydo.org",
+      "githubAccount": "caleydo"
+    }
   }
 }

AppWrapper.d.ts

@@ -0,0 +1,46 @@
+import { ACLUEWrapper, CLUEGraphManager, IVisStateApp } from 'phovea_clue';
+import { AppHeader } from 'phovea_ui';
+import { ProvenanceGraph } from 'phovea_core';
+import App from './internal/App';
+export interface IView<T> {
+    init(): Promise<T>;
+    remove(): any;
+}
+export interface IAppWrapperOptions {
+    /**
+     * name of this application
+     */
+    name: string;
+    /**
+     * prefix used for provenance graphs and used to identify matching provenance graphs
+     */
+    prefix: string;
+    /**
+     * Show/hide the EU cookie disclaimer bar from `cookie-bar.eu`
+     */
+    showCookieDisclaimer: boolean;
+}
+/**
+ * The main class for the App app
+ */
+export declare class AppWrapper<T extends IView<T> & IVisStateApp> extends ACLUEWrapper {
+    protected readonly options: IAppWrapperOptions;
+    protected app: Promise<App>;
+    protected header: AppHeader;
+    constructor(options?: Partial<IAppWrapperOptions>);
+    init(): Promise<void>;
+    protected buildImpl(body: HTMLElement): {
+        graph: Promise<ProvenanceGraph>;
+        manager: CLUEGraphManager;
+        storyVis: () => Promise<import("phovea_clue").VerticalStoryVis>;
+        provVis: () => Promise<import("phovea_clue").LayoutedProvVis>;
+    };
+    /**
+     * build the actual main application given the arguments
+     * @param {ProvenanceGraph} graph the resolved current provenance graph
+     * @param {CLUEGraphManager} manager its manager
+     * @param {HTMLElement} main root dom element
+     * @returns {PromiseLike<T> | T}
+     */
+    protected createApp(graph: ProvenanceGraph, manager: CLUEGraphManager, main: HTMLElement): PromiseLike<App> | App;
+}

README.md

@@ -1,5 +1,7 @@
-Vega CLUE [![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Build Status][circleci-image]][circleci-url]
+Vega CLUE  
 =====================
+[![Phovea][phovea-image]][phovea-url] [![NPM version][npm-image]][npm-url] [![Build Status][circleci-image]][circleci-url]
+
 
 [Vega examples](https://vega.github.io/vega/examples/) with [CLUE](https://github.com/phovea/phovea_clue)
 
@@ -44,9 +46,5 @@ This repository is part of **[Phovea](http://phovea.caleydo.org/)**, a platform
 [phovea-url]: https://phovea.caleydo.org
 [npm-image]: https://badge.fury.io/js/vega_clue.svg
 [npm-url]: https://npmjs.org/package/vega_clue
-[travis-image]: https://travis-ci.org/Caleydo/vega_clue.svg?branch=master
-[travis-url]: https://travis-ci.org/Caleydo/vega_clue
-[daviddm-image]: https://david-dm.org/Caleydo/vega_clue/status.svg
-[daviddm-url]: https://david-dm.org/Caleydo/vega_clue
-[circleci-image]: https://circleci.com/gh/Caleydo/vega_clue/tree/master.svg?style=svg
-[circleci-url]: https://circleci.com/gh/Caleydo/vega_clue/tree/master
+[circleci-image]: https://circleci.com/gh/Caleydo/vega_clue.svg?style=shield
+[circleci-url]: https://circleci.com/gh/Caleydo/vega_clue