From 3a2c1ee8730ea54bcb295f1bfc762d585378fa55 Mon Sep 17 00:00:00 2001 From: anita-steiner Date: Mon, 13 Jan 2020 11:33:38 +0100 Subject: [PATCH 01/17] Prepeare next develop release --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 354ba56..656f154 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "phovea_importer", "description": "Flexible smart and visual data importer for web based visualization", "homepage": "https://github.com/phovea/phovea_importer", - "version": "4.1.0", + "version": "4.1.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -91,8 +91,8 @@ "@types/papaparse": "~4.5.3", "d3": "~3.5.17", "papaparse": "~4.6.0", - "phovea_core": "^3.1.0", - "phovea_d3": "^3.1.0", - "phovea_ui": "^3.1.0" + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", + "phovea_ui": "github:phovea/phovea_ui#develop" } } From 7cd207dfa4dbc5c2bfc0d5af187f19602b376441 Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Wed, 29 Jan 2020 14:20:08 +0100 Subject: [PATCH 02/17] 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 e93d45e336b88d7e4b6f3f8ac76fc01e243adcab Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:42:15 +0100 Subject: [PATCH 03/17] set "downlevelIteration": true in _tsconfig.json_ --- 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 b42a728e87c35e37f9c3cb7dbeaa54ac7c0de974 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:42:34 +0100 Subject: [PATCH 04/17] switch branches in _package.json_ --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 656f154..15663f4 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,8 @@ "@types/papaparse": "~4.5.3", "d3": "~3.5.17", "papaparse": "~4.6.0", - "phovea_core": "github:phovea/phovea_core#develop", - "phovea_d3": "github:phovea/phovea_d3#develop", - "phovea_ui": "github:phovea/phovea_ui#develop" + "phovea_core": "github:phovea/phovea_core#typescript_3.8", + "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", + "phovea_ui": "github:phovea/phovea_ui#typescript_3.8" } } From c7954c3fe46d492a7ff7c4ae0634979bff6687cc Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:42:46 +0100 Subject: [PATCH 05/17] update dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 15663f4..92a1e84 100644 --- a/package.json +++ b/package.json @@ -72,14 +72,14 @@ "sass-loader": "6.0.7", "style-loader": "0.16.1", "tslint": "5.9.1", - "typedoc": "0.11.1", - "typescript": "2.8.1", + "tslib": "~1.10.0", + "typedoc": "~0.16.9", + "typescript": "~3.8.1-rc", "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2", "mkdirp": "0.5.1", "extract-loader": "0.1.0", - "tslib": "1.9.0", "cache-loader": "1.2.0", "ifdef-loader": "2.0.0", "fork-ts-checker-webpack-plugin": "0.4.1", From dfada13233cfabe5eb1e46cbb4c68c0afd160413 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 13:07:12 +0100 Subject: [PATCH 06/17] update typescript and tslib --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 92a1e84..65e9b49 100644 --- a/package.json +++ b/package.json @@ -72,9 +72,9 @@ "sass-loader": "6.0.7", "style-loader": "0.16.1", "tslint": "5.9.1", - "tslib": "~1.10.0", + "tslib": "~1.11.0", "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 dccb14c1d1d7b05100432606d5802897cd15ccd8 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 08:43:57 +0100 Subject: [PATCH 07/17] switch branches in package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 65e9b49..3feb09a 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,8 @@ "@types/papaparse": "~4.5.3", "d3": "~3.5.17", "papaparse": "~4.6.0", - "phovea_core": "github:phovea/phovea_core#typescript_3.8", - "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", - "phovea_ui": "github:phovea/phovea_ui#typescript_3.8" + "phovea_core": "github:phovea/phovea_core#update_dependencies_38", + "phovea_d3": "github:phovea/phovea_d3#update_dependencies_38", + "phovea_ui": "github:phovea/phovea_ui#update_dependencies_38" } } From 2f2012c0bb8a4a022ccdf9b6d699f91801ac0c84 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 08:44:07 +0100 Subject: [PATCH 08/17] remove mkdirp dependency --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 3feb09a..5e13605 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,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_importer.tar.gz *" + "dist": "mkdir dist && cd build && tar cvzf ../dist/phovea_importer.tar.gz *" }, "devDependencies": { "@types/jasmine": "2.5.47", @@ -78,7 +78,6 @@ "url-loader": "0.5.8", "webpack": "2.3.3", "webpack-dev-server": "2.4.2", - "mkdirp": "0.5.1", "extract-loader": "0.1.0", "cache-loader": "1.2.0", "ifdef-loader": "2.0.0", From f636a802d7e8ea2069c1de956aa0bcab50490de3 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 08:44:32 +0100 Subject: [PATCH 09/17] update node-sass and typedoc --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5e13605..b0a7b5d 100644 --- a/package.json +++ b/package.json @@ -66,14 +66,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", "tslint": "5.9.1", "tslib": "~1.11.0", - "typedoc": "~0.16.9", + "typedoc": "~0.16.10", "typescript": "~3.8.2", "url-loader": "0.5.8", "webpack": "2.3.3", From 0ead831c3b06f056aa7f5298b7f70f0407dd216c Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 08:46:19 +0100 Subject: [PATCH 10/17] update papaparse version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index b0a7b5d..d661f73 100644 --- a/package.json +++ b/package.json @@ -87,9 +87,9 @@ }, "dependencies": { "@types/d3": "~3.5.36", - "@types/papaparse": "~4.5.3", + "@types/papaparse": "~5.0.3", "d3": "~3.5.17", - "papaparse": "~4.6.0", + "papaparse": "~5.1.1", "phovea_core": "github:phovea/phovea_core#update_dependencies_38", "phovea_d3": "github:phovea/phovea_d3#update_dependencies_38", "phovea_ui": "github:phovea/phovea_ui#update_dependencies_38" From 48d0ed8813dcfa5368636f4acf151ae75f7c0a23 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Mon, 2 Mar 2020 08:54:19 +0100 Subject: [PATCH 11/17] 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 d661f73..432a544 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "extract-loader": "0.1.0", "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 6bd8d8f1d2f1693386116d1f1f19e314ca1d6118 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 4 Mar 2020 15:56:21 +0100 Subject: [PATCH 12/17] 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 65e9b49..5d9c1a2 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "extract-loader": "0.1.0", "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 4fb6d76f6638b3128fdc456e9787138abaf1add5 Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Thu, 5 Mar 2020 13:48:34 +0100 Subject: [PATCH 13/17] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5d9c1a2..0eb221b 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,8 @@ "@types/papaparse": "~4.5.3", "d3": "~3.5.17", "papaparse": "~4.6.0", - "phovea_core": "github:phovea/phovea_core#typescript_3.8", - "phovea_d3": "github:phovea/phovea_d3#typescript_3.8", - "phovea_ui": "github:phovea/phovea_ui#typescript_3.8" + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", + "phovea_ui": "github:phovea/phovea_ui#develop" } } From 4f4c785e16a8b87c17bad6460e45471db7de8ffb Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 13 Mar 2020 00:58:00 +0100 Subject: [PATCH 14/17] Update package.json --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index ac988ae..3529820 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,8 @@ "@types/papaparse": "~5.0.3", "d3": "~3.5.17", "papaparse": "~5.1.1", - "phovea_core": "github:phovea/phovea_core#update_dep_req", - "phovea_d3": "github:phovea/phovea_d3#update_dep_req", - "phovea_ui": "github:phovea/phovea_ui#update_dep_req" + "phovea_core": "github:phovea/phovea_core#develop", + "phovea_d3": "github:phovea/phovea_d3#develop", + "phovea_ui": "github:phovea/phovea_ui#develop" } } From 744ec6ca6b5fad4561e04609487d07fd989ce4bc Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 14:34:09 +0100 Subject: [PATCH 15/17] 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 095c32837b0eae7522c8a5e2ef9fa9b47c27b92b Mon Sep 17 00:00:00 2001 From: Christian Lehner Date: Tue, 17 Mar 2020 13:24:54 +0100 Subject: [PATCH 16/17] use released versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 3529820..6266e0c 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,8 @@ "@types/papaparse": "~5.0.3", "d3": "~3.5.17", "papaparse": "~5.1.1", - "phovea_core": "github:phovea/phovea_core#develop", - "phovea_d3": "github:phovea/phovea_d3#develop", - "phovea_ui": "github:phovea/phovea_ui#develop" + "phovea_core": "^4.0.0", + "phovea_d3": "^4.0.0", + "phovea_ui": "^4.0.0" } } From acd5eb9350a77d67811cbd6632cf1101fd6907da Mon Sep 17 00:00:00 2001 From: Christian Lehner Date: Tue, 17 Mar 2020 13:28:20 +0100 Subject: [PATCH 17/17] increase version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6266e0c..6f864d8 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "phovea_importer", "description": "Flexible smart and visual data importer for web based visualization", "homepage": "https://github.com/phovea/phovea_importer", - "version": "4.1.1-SNAPSHOT", + "version": "5.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org",