From c586302ca9826e1ba0be478b25c2ea637bd014cc Mon Sep 17 00:00:00 2001 From: Chandler Prall Date: Wed, 12 Feb 2020 11:04:56 -0700 Subject: [PATCH 1/2] Fix dev&docs build issues on Windows --- package.json | 4 ++-- src-docs/webpack.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6bbc40b9f68..450b7a653ab 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "docker_image": "node:10", "sideEffects": false, "scripts": { - "start": "BABEL_MODULES=false webpack-dev-server --port 8030 --inline --hot --config=src-docs/webpack.config.js", + "start": "cross-env BABEL_MODULES=false webpack-dev-server --port 8030 --inline --hot --config=src-docs/webpack.config.js", "test-docker": "docker pull $npm_package_docker_image && docker run --rm -i -e GIT_COMMITTER_NAME=test -e GIT_COMMITTER_EMAIL=test --user=$(id -u):$(id -g) -e HOME=/tmp -v $(pwd):/app -w /app $npm_package_docker_image bash -c 'npm config set spin false && /opt/yarn*/bin/yarn && npm run test && npm run build'", "sync-docs": "node ./scripts/docs-sync.js", - "build-docs": "BABEL_MODULES=false cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 webpack --config=src-docs/webpack.config.js", + "build-docs": "cross-env BABEL_MODULES=false cross-env NODE_ENV=production NODE_OPTIONS=--max-old-space-size=4096 webpack --config=src-docs/webpack.config.js", "build": "yarn extract-i18n-strings && node ./scripts/compile-clean.js && node ./scripts/compile-eui.js && node ./scripts/compile-scss.js $npm_package_name", "compile-icons": "node ./scripts/compile-icons.js && prettier --write --loglevel=warn \"./src/components/icon/assets/**/*.js\"", "extract-i18n-strings": "node ./scripts/babel/fetch-i18n-strings", diff --git a/src-docs/webpack.config.js b/src-docs/webpack.config.js index 42b4fc6f642..644e79d63d2 100644 --- a/src-docs/webpack.config.js +++ b/src-docs/webpack.config.js @@ -41,7 +41,7 @@ const webpackConfig = { { test: /\.(js|tsx?)$/, loaders: useCache(['babel-loader']), // eslint-disable-line react-hooks/rules-of-hooks - exclude: [/node_modules/, /packages\/react-datepicker/], + exclude: [/node_modules/, /packages(\/|\\)react-datepicker/], }, { test: /\.scss$/, From 0f7e652b089d39533f6ff3ca149015c5c21b7ca5 Mon Sep 17 00:00:00 2001 From: Chandler Prall Date: Wed, 12 Feb 2020 11:08:38 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d53545e7685..44a120fab9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Exported `EuiSelectOptionProps` type ([#2830](https://github.com/elastic/eui/pull/2830)) - Added `paperClip` glyph to `EuiIcon` ([#2845](https://github.com/elastic/eui/pull/2845)) +**Bug fixes** + +- Fixed building dev & docs on Windows ([#2847](https://github.com/elastic/eui/pull/2847)) + ## [`19.0.0`](https://github.com/elastic/eui/tree/v19.0.0) - Added `cheer` glyph to `EuiIcon` ([#2814](https://github.com/elastic/eui/pull/2814))