From 40188bde044478dabbddaae0cbc1dd4b90499456 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sun, 20 Sep 2020 19:57:49 +0200 Subject: [PATCH 1/4] differentiat builds --- test/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 926857c4ad24..2a32272be2f3 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -4,7 +4,7 @@ const webpack = require('webpack'); const browserStack = { username: process.env.BROWSERSTACK_USERNAME, accessKey: process.env.BROWSERSTACK_ACCESS_KEY, - build: `material-ui-${new Date().toISOString()}`, + build: `material-ui-x-${new Date().toISOString()}`, }; process.env.CHROME_BIN = require('puppeteer').executablePath(); From 4639be0bb7ed1bcc596977c246bd211b95d6dead Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 26 Sep 2020 02:05:09 +0200 Subject: [PATCH 2/4] increase versions --- .browserslistrc | 5 +++++ ignore_netlify.toml | 12 ------------ netlify.toml | 12 ++++++++++++ packages/grid/data-grid/package.json | 2 +- packages/grid/x-grid/package.json | 2 +- packages/x-grid-data-generator/package.json | 2 +- packages/x-license/package.json | 2 +- test/karma.conf.js | 8 ++++---- 8 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 .browserslistrc delete mode 100644 ignore_netlify.toml create mode 100644 netlify.toml diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 000000000000..0d12a58ee17f --- /dev/null +++ b/.browserslistrc @@ -0,0 +1,5 @@ +edge >= 83 +firefox >= 77 +chrome >= 83 +safari >= 11 +node 10.0 diff --git a/ignore_netlify.toml b/ignore_netlify.toml deleted file mode 100644 index c099dd8c871f..000000000000 --- a/ignore_netlify.toml +++ /dev/null @@ -1,12 +0,0 @@ -[build] - # Directory (relative to root of your repo) that contains the deploy-ready - # HTML files and assets generated by the build. If a base directory has - # been specified, include it in the publish directory path. - publish = "docs/export/" - - # Default build command. - command = "yarn docs:build && yarn docs:export && yarn storybook:build && yarn storybook:export && yarn demo:build && yarn demo:export" - -[build.environment] - NODE_VERSION = "10" - NODE_OPTIONS = "--max_old_space_size=4096" diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 000000000000..b0ac9404c8e1 --- /dev/null +++ b/netlify.toml @@ -0,0 +1,12 @@ +# [build] +# # Directory (relative to root of your repo) that contains the deploy-ready +# # HTML files and assets generated by the build. If a base directory has +# # been specified, include it in the publish directory path. +# publish = "docs/export/" + +# # Default build command. +# command = "yarn docs:build && yarn docs:export && yarn storybook:build && yarn storybook:export && yarn demo:build && yarn demo:export" + +[build.environment] + NODE_VERSION = "10" + NODE_OPTIONS = "--max_old_space_size=4096" diff --git a/packages/grid/data-grid/package.json b/packages/grid/data-grid/package.json index 80cb5b11ac27..96ee5550ce0a 100644 --- a/packages/grid/data-grid/package.json +++ b/packages/grid/data-grid/package.json @@ -53,6 +53,6 @@ ], "gitHead": "f1d56176bb6308bb55c69f5c2fd5593c4e4faebc", "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" } } diff --git a/packages/grid/x-grid/package.json b/packages/grid/x-grid/package.json index 3c2387693968..ef5e58244e7b 100644 --- a/packages/grid/x-grid/package.json +++ b/packages/grid/x-grid/package.json @@ -54,6 +54,6 @@ ], "gitHead": "f1d56176bb6308bb55c69f5c2fd5593c4e4faebc", "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" } } diff --git a/packages/x-grid-data-generator/package.json b/packages/x-grid-data-generator/package.json index bb218dcecde2..81a2e6da7322 100644 --- a/packages/x-grid-data-generator/package.json +++ b/packages/x-grid-data-generator/package.json @@ -56,6 +56,6 @@ ], "gitHead": "f1d56176bb6308bb55c69f5c2fd5593c4e4faebc", "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" } } diff --git a/packages/x-license/package.json b/packages/x-license/package.json index 355bedf07a5f..6ff10d486224 100644 --- a/packages/x-license/package.json +++ b/packages/x-license/package.json @@ -47,6 +47,6 @@ ], "gitHead": "f1d56176bb6308bb55c69f5c2fd5593c4e4faebc", "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" } } diff --git a/test/karma.conf.js b/test/karma.conf.js index 2a32272be2f3..84f33615e512 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -124,28 +124,28 @@ module.exports = function setKarmaConfig(config) { os: 'OS X', os_version: 'Sierra', browser: 'Chrome', - browser_version: '49.0', + browser_version: '83.0', }, BrowserStack_Firefox: { base: 'BrowserStack', os: 'Windows', os_version: '10', browser: 'Firefox', - browser_version: '52.0', + browser_version: '78.0', }, BrowserStack_Safari: { base: 'BrowserStack', os: 'OS X', os_version: 'Sierra', browser: 'Safari', - browser_version: '10.1', + browser_version: '11.1', }, BrowserStack_Edge: { base: 'BrowserStack', os: 'Windows', os_version: '10', browser: 'Edge', - browser_version: '14.0', + browser_version: '83.0', }, }, }; From 7128f312c3b5c5a0df89d3af3144b7c3a8705ad2 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 26 Sep 2020 11:45:46 +0200 Subject: [PATCH 3/4] rerun-ci From 74d952d3748c7e11c1f6f57051ed5c6996814b9e Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Sat, 26 Sep 2020 12:09:11 +0200 Subject: [PATCH 4/4] update version to match official targets --- test/karma.conf.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/karma.conf.js b/test/karma.conf.js index 84f33615e512..23cba86b61a5 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -123,28 +123,28 @@ module.exports = function setKarmaConfig(config) { base: 'BrowserStack', os: 'OS X', os_version: 'Sierra', - browser: 'Chrome', + browser: 'chrome', browser_version: '83.0', }, BrowserStack_Firefox: { base: 'BrowserStack', os: 'Windows', os_version: '10', - browser: 'Firefox', + browser: 'firefox', browser_version: '78.0', }, BrowserStack_Safari: { base: 'BrowserStack', os: 'OS X', - os_version: 'Sierra', - browser: 'Safari', + os_version: 'High Sierra', + browser: 'safari', browser_version: '11.1', }, BrowserStack_Edge: { base: 'BrowserStack', os: 'Windows', os_version: '10', - browser: 'Edge', + browser: 'edge', browser_version: '83.0', }, },