Merge pull request #107 from phovea/release-6.0.0

Release 6.0.0

.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" >> ~/.npmrc
+            echo -e "//$NPM_REPOSITORY:authToken=$NPM_TOKEN" >> ~/.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,11 +1,28 @@
+# general things to ignore
 /.tscache
 /.idea
+/build/
+/dist/tsBuildInfoFile
 /lib/
+*.egg-info/
+*.egg
+*.py[cod]
+__pycache__/
+*.so
+*~
+*.log
+*.pot
+*.pyc
+*.swp
+*.lock
+# due to using tox and pytest
+.tox
+.cache
 node_modules/
 /src/**/*.js
 /tests/**/*.js
 /src/**/*.map
 /tests/**/*.map
 *.css
-*.log
+/.cache-loader
 package-lock.json