diff --git a/.browserslistrc b/.browserslistrc new file mode 100644 index 0000000000000..0d12a58ee17fc --- /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 c099dd8c871f1..0000000000000 --- 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 0000000000000..b0ac9404c8e18 --- /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 80cb5b11ac272..96ee5550ce0a1 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 3c23876939682..ef5e58244e7b9 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 bb218dcecde2e..81a2e6da73224 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 355bedf07a5f4..6ff10d4862243 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 926857c4ad24f..23cba86b61a54 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(); @@ -123,29 +123,29 @@ module.exports = function setKarmaConfig(config) { base: 'BrowserStack', os: 'OS X', os_version: 'Sierra', - browser: 'Chrome', - browser_version: '49.0', + browser: 'chrome', + browser_version: '83.0', }, BrowserStack_Firefox: { base: 'BrowserStack', os: 'Windows', os_version: '10', - browser: 'Firefox', - browser_version: '52.0', + browser: 'firefox', + browser_version: '78.0', }, BrowserStack_Safari: { base: 'BrowserStack', os: 'OS X', - os_version: 'Sierra', - browser: 'Safari', - browser_version: '10.1', + os_version: 'High Sierra', + browser: 'safari', + browser_version: '11.1', }, BrowserStack_Edge: { base: 'BrowserStack', os: 'Windows', os_version: '10', - browser: 'Edge', - browser_version: '14.0', + browser: 'edge', + browser_version: '83.0', }, }, };