From 4f3c3e28a790cdf1cad3771941731d5687ce6d30 Mon Sep 17 00:00:00 2001 From: Sciator <39964450+Sciator@users.noreply.github.com> Date: Wed, 10 Feb 2021 13:55:50 +0100 Subject: [PATCH 1/2] chore: building on windows --- giraffe/package.json | 4 +++- yarn.lock | 11 +++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/giraffe/package.json b/giraffe/package.json index 9b648cdb..16c02ee3 100644 --- a/giraffe/package.json +++ b/giraffe/package.json @@ -5,7 +5,7 @@ "module": "src/index.js", "license": "MIT", "scripts": { - "build": "rm -rf dist && NODE_ENV=production webpack --config webpack.config.js", + "build": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.js", "lint": "eslint '{src,../stories/src}/**/*.{ts,tsx}'", "prettier": "prettier --config ../.prettierrc.json --check '{src,../stories/src}/**/*.{ts,tsx}'", "prettier:fix": "prettier --config ../.prettierrc.json --write '{src,../stories/src}/**/*.{ts,tsx}'", @@ -55,6 +55,7 @@ "canvas": "^2.6.1", "chroma-js": "^1.3.6", "classnames": "^2.2.3", + "cross-env": "^7.0.3", "css-loader": "^5.0.0", "css-modules-typescript-loader": "^4.0.0", "d3-array": "^2.0.3", @@ -91,6 +92,7 @@ "react-scrollbars-custom": "^4.0.20", "react-virtualized": "^9.21.2", "react-virtualized-auto-sizer": "^1.0.2", + "rimraf": "^3.0.2", "s2-geometry": "^1.2.10", "sass-loader": "^10.0.3", "style-loader": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index e5d6356c..14e7c1e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5128,6 +5128,13 @@ create-react-context@^0.2.1: fbjs "^0.8.0" gud "^1.0.0" +cross-env@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf" + integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw== + dependencies: + cross-spawn "^7.0.1" + cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -5139,7 +5146,7 @@ cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -12746,7 +12753,7 @@ rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3: dependencies: glob "^7.1.3" -rimraf@^3.0.0: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== From 272cd36987ad097cf02ca3e469926e7bb4528a23 Mon Sep 17 00:00:00 2001 From: Sciator <39964450+Sciator@users.noreply.github.com> Date: Tue, 2 Mar 2021 12:22:49 +0100 Subject: [PATCH 2/2] chore: fixed multiplatform linting --- giraffe/package.json | 6 +++--- package.json | 6 +++--- stories/package.json | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/giraffe/package.json b/giraffe/package.json index 16c02ee3..6878d5b9 100644 --- a/giraffe/package.json +++ b/giraffe/package.json @@ -6,9 +6,9 @@ "license": "MIT", "scripts": { "build": "rimraf dist && cross-env NODE_ENV=production webpack --config webpack.config.js", - "lint": "eslint '{src,../stories/src}/**/*.{ts,tsx}'", - "prettier": "prettier --config ../.prettierrc.json --check '{src,../stories/src}/**/*.{ts,tsx}'", - "prettier:fix": "prettier --config ../.prettierrc.json --write '{src,../stories/src}/**/*.{ts,tsx}'", + "lint": "eslint \"{src,../stories/src}/**/*.{ts,tsx}\"", + "prettier": "prettier --config ../.prettierrc.json --check \"{src,../stories/src}/**/*.{ts,tsx}\"", + "prettier:fix": "prettier --config ../.prettierrc.json --write \"{src,../stories/src}/**/*.{ts,tsx}\"", "publish": "echo 'To publish giraffe, run ./publish $version'", "start": "webpack --config webpack.config.js --watch --progress", "test": "jest --collectCoverage --maxWorkers=2", diff --git a/package.json b/package.json index 6bfbf0ba..62071cd9 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "private": true, "workspaces": ["giraffe", "stories"], "scripts": { - "lint": "eslint '{giraffe,stories}/src/**/*.{ts,tsx}'", - "prettier": "prettier --config .prettierrc.json --check '{giraffe,stories}/**/*.{ts,tsx}'", - "prettier:fix": "prettier --config .prettierrc.json --write '{giraffe,stories}/**/*.{ts,tsx}'", + "lint": "eslint \"{giraffe,stories}/src/**/*.{ts,tsx}\"", + "prettier": "prettier --config .prettierrc.json --check \"{giraffe,stories}/**/*.{ts,tsx}\"", + "prettier:fix": "prettier --config .prettierrc.json --write \"{giraffe,stories}/**/*.{ts,tsx}\"", "publish": "echo 'To publish giraffe, run ./giraffe/publish $version'" } } diff --git a/stories/package.json b/stories/package.json index b6f60ed1..07937b9d 100644 --- a/stories/package.json +++ b/stories/package.json @@ -3,9 +3,9 @@ "version": "1.0.0", "license": "MIT", "scripts": { - "lint": "eslint '{src,../giraffe/src}/**/*.{ts,tsx}'", - "prettier": "prettier --config ../.prettierrc.json --check '{src,../giraffe/src}/**/*.{ts,tsx}'", - "prettier:fix": "prettier --config ../.prettierrc.json --write '{src,../giraffe/src}/**/*.{ts,tsx}'", + "lint": "eslint \"{src,../giraffe/src}/**/*.{ts,tsx}\"", + "prettier": "prettier --config ../.prettierrc.json --check \"{src,../giraffe/src}/**/*.{ts,tsx}\"", + "prettier:fix": "prettier --config ../.prettierrc.json --write \"{src,../giraffe/src}/**/*.{ts,tsx}\"", "typecheck": "tsc --noEmit --pretty", "start": "yarn -s run prettier:fix && yarn -s run storybook", "storybook": "start-storybook -p 50000",