diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56d005d..7ae2a60 100644
--- a/.circleci/config.yml
+++ b/.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,9 +39,8 @@ jobs:
command: npm run dist
- store_artifacts:
path: dist
- destination: dist
workflows:
- version: 2
+ version: 2.1
# build-nightly:
# triggers:
# - schedule:
@@ -48,17 +51,9 @@ workflows:
# - develop
# jobs:
# - build
- build-branch:
- jobs:
- - build:
- filters:
- tags:
- ignore: /^v.*/
- build-tag:
+ build-branches-and-tags:
jobs:
- build:
filters:
- branches:
- ignore: /.*/
tags:
- only: /^v.*/
\ No newline at end of file
+ only: /.*/
diff --git a/.gitattributes b/.gitattributes
index 544c336..711da28 100644
--- a/.gitattributes
+++ b/.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
diff --git a/.gitignore b/.gitignore
index bc72255..d825259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
/.tscache
/.idea
/lib/
+/dist/tsBuildInfoFile
node_modules/
/src/**/*.js
/tests/**/*.js
diff --git a/dist/404.html b/dist/404.html
deleted file mode 100644
index fdace4a..0000000
--- a/dist/404.html
+++ /dev/null
@@ -1,157 +0,0 @@
-
-
-
-
- Page Not Found :(
-
-
-
-
-
Not found :(
-
Sorry, but the page you were trying to view does not exist.
-
It looks like this was the result of either:
-
- - a mistyped address
- - an out-of-date link
-
-
-
-
-
Not found :(
-
Sorry, but the page you were trying to view does not exist.
-
It looks like this was the result of either:
-
- - a mistyped address
- - an out-of-date link
-
-
-
-