Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: multiplatform building #474

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: multiplatform building #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f3c3e2
chore: building on windows
Sciator Feb 10, 2021
272cd36
chore: fixed multiplatform linting
Sciator Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions giraffe/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"module": "src/index.js",
"license": "MIT",
"scripts": {
"build": "rm -rf dist && 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}'",
"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}\"",
"publish": "echo 'To publish giraffe, run ./publish $version'",
"start": "webpack --config webpack.config.js --watch --progress",
"test": "jest --collectCoverage --maxWorkers=2",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
}
}
6 changes: 3 additions & 3 deletions stories/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 9 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

[email protected], 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"
Expand All @@ -5139,7 +5146,7 @@ [email protected], cross-spawn@^6.0.0, cross-spawn@^6.0.5:
shebang-command "^1.2.0"
which "^1.2.9"

[email protected], cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
[email protected], 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==
Expand Down Expand Up @@ -12746,7 +12753,7 @@ [email protected], 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==
Expand Down