From f6a7f2f09853380e146db490268d5d0c84c52401 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 16 Jan 2020 14:23:40 +0100 Subject: [PATCH 01/15] Prepare next dev branch --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 04167c6..ecf1655 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "gapminder", "description": "", - "version": "2.0.0", + "version": "2.0.1-SNAPSHOT", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -88,7 +88,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "^3.1.0", - "phovea_clue": "^4.0.0" + "phovea_vis": "github:phovea/phovea_vis#develop", + "phovea_clue": "github:phovea/phovea_clue#develop" } } From d428280abd63d5bcf529df13d10c210fdd621b41 Mon Sep 17 00:00:00 2001 From: rumersdorfer <45141967+rumersdorfer@users.noreply.github.com> Date: Wed, 29 Jan 2020 15:15:18 +0100 Subject: [PATCH 02/15] 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 19e3f9fca3bc1c73529837fed8a96c2d1f1355c4 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:55:45 +0100 Subject: [PATCH 03/15] 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 69b27076aa5a070c9794e9759ad6978307641890 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:56:01 +0100 Subject: [PATCH 04/15] switch branches in _package.json_ --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ecf1655..9e8cea2 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "github:phovea/phovea_vis#develop", - "phovea_clue": "github:phovea/phovea_clue#develop" + "phovea_vis": "github:phovea/phovea_vis#typescript_3.8", + "phovea_clue": "github:phovea/phovea_clue#typescript_3.8" } } From 20bbdefdd1d869db51116c8b462cd71bb48e5da3 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Tue, 18 Feb 2020 13:56:09 +0100 Subject: [PATCH 05/15] update dependencies --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 9e8cea2..6a15f30 100644 --- a/package.json +++ b/package.json @@ -74,13 +74,13 @@ "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", "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 7a4af9fb08fc5a6af09b38e582371a7adea9d262 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Thu, 27 Feb 2020 13:09:43 +0100 Subject: [PATCH 06/15] update typescript and tslib --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6a15f30..c0a12d2 100644 --- a/package.json +++ b/package.json @@ -74,9 +74,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 c120a4789f5053e7e73a21c7ec5c18734b31230c Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:29:26 +0100 Subject: [PATCH 07/15] switch branches in package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c0a12d2..1b9aeab 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "github:phovea/phovea_vis#typescript_3.8", - "phovea_clue": "github:phovea/phovea_clue#typescript_3.8" + "phovea_vis": "github:phovea/phovea_vis#update_dependencies_38", + "phovea_clue": "github:phovea/phovea_clue#update_dependencies_38" } } From a474d8584bd4eeaa8246d410058e253dddc0cbb9 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:29:48 +0100 Subject: [PATCH 08/15] remove mkdirp dependency --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 1b9aeab..0073584 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/gapminder.tar.gz *", + "dist": "mkdir dist && cd build && tar cvzf ../dist/gapminder.tar.gz *", "predocker": "npm run build", "docker": "docker build -t gapminder -f deploy/Dockerfile ." }, @@ -67,7 +67,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 cbfbb6d84d20a3562816723378870eea5271a3c6 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:30:15 +0100 Subject: [PATCH 09/15] 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 0073584..d8e49eb 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 c40272d88fce9388e1aff72f9823c98b020e7344 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 28 Feb 2020 10:31:03 +0100 Subject: [PATCH 10/15] update node-sass and typedoc --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d8e49eb..ec6c006 100644 --- a/package.json +++ b/package.json @@ -67,14 +67,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 177f6a8f794c24564f2e8bed81965055f1e30d32 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 4 Mar 2020 16:00:47 +0100 Subject: [PATCH 11/15] 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 c0a12d2..06ca36a 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,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 36f0408cfeb633f5df902ab45a89d6c97f1c897f Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Thu, 5 Mar 2020 13:53:52 +0100 Subject: [PATCH 12/15] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 06ca36a..f4f5aaa 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "github:phovea/phovea_vis#typescript_3.8", - "phovea_clue": "github:phovea/phovea_clue#typescript_3.8" + "phovea_vis": "github:phovea/phovea_vis#develop", + "phovea_clue": "github:phovea/phovea_clue#develop" } } From a69c54aa3828b8ba1f20e8aedee953e8c0ef3c3a Mon Sep 17 00:00:00 2001 From: Anita Steiner Date: Fri, 13 Mar 2020 01:56:23 +0100 Subject: [PATCH 13/15] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index f8fac5e..46468e4 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "github:phovea/phovea_vis#update_dep_req", - "phovea_clue": "github:phovea/phovea_clue#update_dep_req" + "phovea_vis": "github:phovea/phovea_vis#develop", + "phovea_clue": "github:phovea/phovea_clue#develop" } } From 225a7f15ab8fe773019134eb48ccc276eeab1494 Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Fri, 13 Mar 2020 12:48:07 +0100 Subject: [PATCH 14/15] 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 27afe4c540f83f36d73dfec89d67c082dc8a488b Mon Sep 17 00:00:00 2001 From: dvvanessastoiber Date: Wed, 18 Mar 2020 14:49:20 +0100 Subject: [PATCH 15/15] prepare release 3.0.0 --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 46468e4..ef0f805 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "gapminder", "description": "", - "version": "2.0.1-SNAPSHOT", + "version": "3.0.0", "author": { "name": "The Caleydo Team", "email": "contact@caleydo.org", @@ -87,7 +87,7 @@ "ts-loader": "4.0.1" }, "dependencies": { - "phovea_vis": "github:phovea/phovea_vis#develop", - "phovea_clue": "github:phovea/phovea_clue#develop" + "phovea_vis": "^4.0.0", + "phovea_clue": "^5.0.0" } }