From 2745e97510265647b48a2351224d8e13616f164b Mon Sep 17 00:00:00 2001 From: Holger Stitz Date: Fri, 10 Jan 2020 17:30:50 +0100 Subject: [PATCH 01/16] Prepare next dev release --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index b8a1642..4b0a7da 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phovea_vis", "description": "Utilitiy reposititory containing common visualizations (table, heatmap, scatterplot, axis, pie, distribution, ..)", - "version": "3.1.0", + "version": "3.1.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -49,8 +49,8 @@ "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "^3.1.0", - "phovea_d3": "^3.1.0", + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", "@types/d3": "~3.5.36", "d3": "~3.5.17" }, From 01561e7b74ee24c18410116f968960fdf4c4619e Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:11:28 +0100 Subject: [PATCH 02/16] add CODEOWNERS file --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..9836a90 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @thinkh From 879d2a2158eef96e24060853e68fce6c7b3ef43e Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:21:57 +0100 Subject: [PATCH 03/16] set `"downlevelIteration": true` in ts config --- tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/tsconfig.json b/tsconfig.json index ab4451b..3a54054 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,6 +7,7 @@ "moduleResolution": "node", "jsx": "react", "experimentalDecorators": true, + "downlevelIteration": true, // required as long as target is `es5` "lib": [ "dom", "es2015", From 71a6ffd0f7a74c145513fd828097bce3a1acf5da Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:22:13 +0100 Subject: [PATCH 04/16] switch branches in _package.json_ --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 4b0a7da..0244142 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#develop", - "phovea_d3": "github:phovea/phovea_d3#develop", + "phovea_core": "github:phovea/phovea_core#typescript_3.8", + "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", "@types/d3": "~3.5.36", "d3": "~3.5.17" }, From dc2c08c47fc68ef1e60aeef47b9ee32c4dde5114 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:22:27 +0100 Subject: [PATCH 05/16] update dependencies and remove `mkdirp` --- package.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 0244142..8413b45 100644 --- a/package.json +++ b/package.json @@ -72,16 +72,15 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", - "mkdirp": "0.5.1", "node-sass": "^4.12.0", "null-loader": "0.1.1", "raw-loader": "0.5.1", "sass-loader": "6.0.7", "style-loader": "0.16.1", - "tslib": "1.9.0", + "tslib": "~1.10.0", "tslint": "5.9.1", - "typedoc": "0.11.1", - "typescript": "2.8.1", + "typedoc": "~0.16.9", + "typescript": "~3.8.1-rc", "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2", From 1fb30e79cd1108c08219d735136932028e723188 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:36:24 +0100 Subject: [PATCH 06/16] revert mkdirp --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 8413b45..7e13e28 100644 --- a/package.json +++ b/package.json @@ -72,6 +72,7 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", + "mkdirp": "0.5.1", "node-sass": "^4.12.0", "null-loader": "0.1.1", "raw-loader": "0.5.1", From 0c5093f31fb51b64acb443079aad856e6f792068 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 12:50:15 +0100 Subject: [PATCH 07/16] update typescript and tslib --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 7e13e28..80afaea 100644 --- a/package.json +++ b/package.json @@ -78,10 +78,10 @@ "raw-loader": "0.5.1", "sass-loader": "6.0.7", "style-loader": "0.16.1", - "tslib": "~1.10.0", + "tslib": "~1.11.0", "tslint": "5.9.1", "typedoc": "~0.16.9", - "typescript": "~3.8.1-rc", + "typescript": "~3.8.2", "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2", From 614222211f3865936437fe917f782fddd5932188 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:16:01 +0100 Subject: [PATCH 08/16] switch branches in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 80afaea..5e30fcf 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#typescript_3.8", - "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", + "phovea_core": "github:phovea/phovea_core#update_dependencies_38", + "phovea_d3": "github:phovea/phovea_d3#update_dependencies_38", "@types/d3": "~3.5.36", "d3": "~3.5.17" }, From ac4fe4c17c78b6420df69b144dc0514bd09cd895 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:16:19 +0100 Subject: [PATCH 09/16] remove mkdirp dependency --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 5e30fcf..079822e 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "release:minor": "npm version minor && npm publish && git push --follow-tags", "release:patch": "npm version patch && npm publish && git push --follow-tags", "predist": "npm run build && npm run docs", - "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" + "dist": "mkdir dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { "phovea_core": "github:phovea/phovea_core#update_dependencies_38", @@ -72,7 +72,6 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", - "mkdirp": "0.5.1", "node-sass": "^4.12.0", "null-loader": "0.1.1", "raw-loader": "0.5.1", From fe9f7863884985377d49595f7c19d073d7218579 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:17:06 +0100 Subject: [PATCH 10/16] update node-sass and typedoc --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 079822e..aa56965 100644 --- a/package.json +++ b/package.json @@ -72,14 +72,14 @@ "karma-junit-reporter": "2.0.0", "karma-sourcemap-loader": "0.3.7", "karma-webpack": "2.0.3", - "node-sass": "^4.12.0", + "node-sass": "^4.13.1", "null-loader": "0.1.1", "raw-loader": "0.5.1", "sass-loader": "6.0.7", "style-loader": "0.16.1", "tslib": "~1.11.0", "tslint": "5.9.1", - "typedoc": "~0.16.9", + "typedoc": "~0.16.10", "typescript": "~3.8.2", "url-loader": "0.5.8", "webpack": "2.3.3", From 5b6b7ea51f623212c897028f2c921cf4b591e73c Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:17:35 +0100 Subject: [PATCH 11/16] update webpack plugin older version uses typescript 2 as peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa56965..26d5c37 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "webpack-dev-server": "2.4.2", "cache-loader": "1.2.0", "ifdef-loader": "2.0.0", - "fork-ts-checker-webpack-plugin": "0.4.1", + "fork-ts-checker-webpack-plugin": "0.4.4", "thread-loader": "1.1.2", "ts-loader": "4.0.1" } From 44918f64a466b21aaffb23bf697c432ecaf78f1f Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 4 Mar 2020 16:00:02 +0100 Subject: [PATCH 12/16] update webpack plugin older version uses typescript 2 as peerDependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 80afaea..d586746 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "webpack-dev-server": "2.4.2", "cache-loader": "1.2.0", "ifdef-loader": "2.0.0", - "fork-ts-checker-webpack-plugin": "0.4.1", + "fork-ts-checker-webpack-plugin": "0.4.4", "thread-loader": "1.1.2", "ts-loader": "4.0.1" } From 8f4b9c1d6483b9c7b3fad6e7cb9ede56e406b760 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Thu, 5 Mar 2020 13:46:56 +0100 Subject: [PATCH 13/16] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d586746..1253bd9 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "dist": "mkdirp dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#typescript_3.8", - "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", "@types/d3": "~3.5.36", "d3": "~3.5.17" }, From cd64eb1f7548c6cdd03622c73b8e1947a4585bb8 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 13 Mar 2020 00:53:22 +0100 Subject: [PATCH 14/16] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a8cb478..521f11c 100644 --- a/package.json +++ b/package.json @@ -49,8 +49,8 @@ "dist": "mkdir dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#update_dep_req", - "phovea_d3": "github:phovea/phovea_d3#update_dep_req", + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", "@types/d3": "~3.5.36", "d3": "~3.5.17" }, From 3c8ebaf81bb27dd6ce05442243a335b13b461a37 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 14:24:43 +0100 Subject: [PATCH 15/16] change `buildId` to `JSON.stringify(buildId)` --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 95542e3..7d76873 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -185,7 +185,7 @@ function generateWebpack(options) { 'process.env.NODE_ENV': JSON.stringify(options.isProduction ? 'production' : 'development'), __VERSION__: JSON.stringify(pkg.version), __LICENSE__: JSON.stringify(pkg.license), - __BUILD_ID__: buildId, + __BUILD_ID__: JSON.stringify(buildId), __DEBUG__: options.isDev || options.isTest, __TEST__: options.isTest, __PRODUCTION__: options.isProduction, From c6914c68e29e1bdaf916d61164fd5ea5496dac72 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Mon, 16 Mar 2020 17:45:39 +0100 Subject: [PATCH 16/16] init release-4.0.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 521f11c..76b0c17 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "phovea_vis", "description": "Utilitiy reposititory containing common visualizations (table, heatmap, scatterplot, axis, pie, distribution, ..)", - "version": "3.1.1-SNAPSHOT", + "version": "4.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -49,8 +49,8 @@ "dist": "mkdir dist && cd build && tar cvzf ../dist/phovea_vis.tar.gz *" }, "dependencies": { - "phovea_core": "github:phovea/phovea_core#develop", - "phovea_d3": "github:phovea/phovea_d3#develop", + "phovea_core": "^4.0.0", + "phovea_d3": "^4.0.0", "@types/d3": "~3.5.36", "d3": "~3.5.17" },