Merge pull request #203 from phovea/release-6.0.0

Release 6.0.0

Author: Anita Steiner

.circleci/config.yml

@@ -1,9 +1,14 @@
-version: 2
-jobs:
-  build:
+version: 2.1
+
+executors:
+  node-executor:
     working_directory: ~/phovea
     docker:
       - image: circleci/node:12.13-buster-browsers
+
+jobs:
+  build:
+    executor: node-executor
     steps:
       - checkout
       - run:
@@ -22,8 +27,7 @@ jobs:
             (grep -l '._resolved.: .\(git[^:]*\|bitbucket\):' ./node_modules/*/package.json || true) | xargs -r dirname | xargs -r rm -rf
       - save_cache:
           key: deps1-{{ .Branch }}-{{ checksum "package.json" }}
-          paths:
-          - ./node_modules
+          paths: ./node_modules
       - run:
           name: Install npm dependencies from git repositories (always get latest commit)
           command: npm install
@@ -35,8 +39,24 @@ jobs:
           command: npm run dist
       - store_artifacts:
           path: dist
+      - persist_to_workspace:
+          root: ~/phovea
+          paths: .
+  publish:
+    executor: node-executor
+    steps:
+      - attach_workspace:
+          at: ~/phovea
+      - run:
+          name: Authentication
+          command: |
+            echo -e "registry=https://$NPM_REPOSITORY" >> ~/phovea/.npmrc
+            echo -e "//$NPM_REPOSITORY:authToken=$NPM_TOKEN" >> ~/phovea/.npmrc
+      - run:
+          name: Publish package
+          command: npm publish
 workflows:
-  version: 2
+  version: 2.1
 #  build-nightly:
 #    triggers:
 #      - schedule:
@@ -47,17 +67,27 @@ workflows:
 #                - develop
 #    jobs:
 #      - build
-  build-branch:
+  build-branches-only:
     jobs:
       - build:
           filters:
             tags:
-              ignore: /^v.*/
-  build-tag:
+              ignore: /.*/
+  build-publish-tag:
     jobs:
       - build:
           filters:
             branches:
               ignore: /.*/
             tags:
               only: /^v.*/
+      - publish:
+          context:
+            - org-public
+          requires:
+            - build
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^v.*/

.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

.gitignore

@@ -1,6 +1,7 @@
 /.tscache
 /.idea
 /build/
+/dist/tsBuildInfoFile/
 /lib/
 node_modules/
 /src/**/*.js

dist/provenance/LocalStorageProvenanceGraphManager.js

@@ -38,7 +38,7 @@ module.exports = {
     "__APP_CONTEXT__": "TEST_CONTEXT",
     'ts-jest': {
       // has to be set to true, otherwise i18n import fails
-      "tsConfig": {
+      "tsconfig": {
         "esModuleInterop": true,
       }
     }

dist/provenance/LocalStorageProvenanceGraphManager.js.map

@@ -1,7 +1,7 @@
 {
   "name": "phovea_core",
   "description": "Phovea Core including plugin registry, data definition (+ common types: tables, matrix, vector, stratification), ajax, selections",
-  "version": "5.0.1",
+  "version": "6.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -51,19 +51,19 @@
     "dist": "mkdir lib && cd dist && tar cvzf ../lib/phovea_core.tar.gz *"
   },
   "dependencies": {
-    "i18next": "^19.3.2"
+    "i18next": "^19.8.4"
   },
   "devDependencies": {
-    "@types/jest": "~26.0.5",
+    "@types/jest": "~26.0.20",
     "identity-obj-proxy": "~3.0.0",
-    "jest": "~26.1.0",
+    "jest": "~26.6.3",
     "jest-raw-loader": "~1.0.1",
     "rimraf": "~3.0.2",
-    "shx": "~0.3.2",
-    "ts-jest": "~26.1.3",
-    "tslib": "~2.0.0",
+    "shx": "~0.3.3",
+    "ts-jest": "~26.4.4",
+    "tslib": "~2.0.3",
     "tslint": "~5.20.1",
-    "typedoc": "~0.17.8",
+    "typedoc": "~0.19.2",
     "typescript": "~3.9.7"
   }
 }

jest.config.js

@@ -81,8 +81,11 @@ export class LocalStorageProvenanceGraphManager implements IProvenanceGraphManag
   }
 
   async clone(graph: GraphBase, desc: any = {}): Promise<ProvenanceGraph> {
-    const description = `Cloned from ${graph.desc.name} created by ${graph.desc.creator}\n${(graph.desc.description || '')}`;
-    const pdesc = this.createDesc(BaseUtils.mixin({name: graph.desc.name, description}, desc));
+    const name = graph.desc.name;
+    const prefix = 'Clone of ';
+    const newName = name.includes(prefix) ? name : prefix + name;
+    const description = `Cloned from ${name} created by ${graph.desc.creator}\n${(graph.desc.description || '')}`;
+    const pdesc = this.createDesc(BaseUtils.mixin({name: newName, description}, desc));
     const newGraph = await this.getGraph(pdesc);
     newGraph.restoreDump(graph.persist(), ProvenanceGraphUtils.provenanceGraphFactory());
     return new ProvenanceGraph(pdesc, newGraph);

package.json

@@ -17,7 +17,9 @@
     "esModuleInterop": false,
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true, // required for i18next,
-    "preserveWatchOutput":true
+    "preserveWatchOutput":true,
+    "incremental": true,
+    "tsBuildInfoFile": "dist/tsBuildInfoFile"
   },
   "include": [
     "src/**/*.ts",