Skip to content

Commit

Permalink
changes for github & CSB, rename files for windows compat
Browse files Browse the repository at this point in the history
  • Loading branch information
phryneas committed Jun 26, 2021
1 parent c11887e commit d50173d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 24 deletions.
6 changes: 5 additions & 1 deletion .codesandbox/ci.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@
"github/reduxjs/toolkit/examples/query/react/advanced"
],
"node": "14",
"packages": ["packages/toolkit"]
"buildCommand": "build:packages",
"packages": ["packages/toolkit"],
"publishDirectory": {
"@reduxjs/toolkit": "packages/toolkit"
}
}
1 change: 1 addition & 0 deletions .github/README.md
File renamed without changes.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"prettier": "^2.2.1"
},
"resolutions": {
"react-scripts": "patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts@npm:4.0.2.patch",
"react-scripts": "patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts__npm_4.0.2.patch",
"react-redux": "npm:7.2.4",
"react": "npm:17.0.2",
"react-dom": "npm:17.0.2"
},
"scripts": {
"build:examples": "yarn workspaces foreach --include '@reduxjs/*' --include '@examples-query-react/*' -vtp run build",
"build:docs": "yarn workspace docs run build",
"build:package": "yarn workspace @reduxjs/toolkit run build"
"build:packages": "yarn workspace @reduxjs/toolkit run build"
}
}
6 changes: 3 additions & 3 deletions packages/toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@
"yargs": "^15.3.1"
},
"scripts": {
"build-ci": "rimraf dist && tsc && node scripts/cli.js --skipExtraction ",
"build-ci": "yarn rimraf dist && yarn tsc && node scripts/cli.js --skipExtraction",
"build-prepare": "npm run build-ci",
"build": "rimraf dist && tsc && node scripts/cli.js --local",
"build-only": "rimraf dist && tsc && node scripts/cli.js --skipExtraction",
"build": "yarn rimraf dist && yarn tsc && node scripts/cli.js --local --skipExtraction",
"build-only": "yarn rimraf dist && yarn tsc && node scripts/cli.js --skipExtraction",
"format": "prettier --write \"(src|examples)/**/*.{ts,tsx}\" \"**/*.md\"",
"format:check": "prettier --list-different \"(src|examples)/**/*.{ts,tsx}\" \"docs/*/**.md\"",
"lint": "eslint src examples",
Expand Down
36 changes: 18 additions & 18 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3293,7 +3293,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/advanced@workspace:examples/query/react/advanced"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3312,7 +3312,7 @@ __metadata:
"@chakra-ui/react": 1.0.0
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3336,7 +3336,7 @@ __metadata:
"@chakra-ui/react": 1.0.0
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3357,7 +3357,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/basic@workspace:examples/query/react/basic"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3373,7 +3373,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/conditional-fetching@workspace:examples/query/react/conditional-fetching"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3389,7 +3389,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/deduping-queries@workspace:examples/query/react/deduping-queries"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3409,7 +3409,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/faker": ^5.5.5
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
Expand Down Expand Up @@ -3438,7 +3438,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3463,7 +3463,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3490,7 +3490,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/faker": ^5.5.5
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
Expand All @@ -3513,7 +3513,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/polling@workspace:examples/query/react/polling"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand All @@ -3533,7 +3533,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/faker": ^5.5.5
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
Expand All @@ -3560,7 +3560,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/faker": ^5.5.5
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
Expand All @@ -3587,7 +3587,7 @@ __metadata:
"@emotion/react": ^11.4.0
"@emotion/styled": ^11.3.0
"@mswjs/data": ^0.3.0
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/faker": ^5.5.5
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
Expand All @@ -3610,7 +3610,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@examples-query-react/with-apiprovider@workspace:examples/query/react/with-apiprovider"
dependencies:
"@reduxjs/toolkit": ^1.6.0-beta.0
"@reduxjs/toolkit": ^1.6.0-rc.1
"@types/react": 17.0.0
"@types/react-dom": 17.0.0
"@types/react-redux": 7.1.9
Expand Down Expand Up @@ -4241,7 +4241,7 @@ __metadata:
languageName: node
linkType: hard

"@reduxjs/toolkit@^1.6.0-beta.0, @reduxjs/toolkit@workspace:packages/toolkit":
"@reduxjs/toolkit@^1.6.0-rc.1, @reduxjs/toolkit@workspace:packages/toolkit":
version: 0.0.0-use.local
resolution: "@reduxjs/toolkit@workspace:packages/toolkit"
dependencies:
Expand Down Expand Up @@ -18384,9 +18384,9 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"react-scripts@patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts@npm:4.0.2.patch::locator=rtk-monorepo%40workspace%3A.":
"react-scripts@patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts__npm_4.0.2.patch::locator=rtk-monorepo%40workspace%3A.":
version: 4.0.2
resolution: "react-scripts@patch:react-scripts@npm%3A4.0.2#.yarn/patches/react-scripts@npm%3A4.0.2.patch::version=4.0.2&hash=bfb7c4&locator=rtk-monorepo%40workspace%3A."
resolution: "react-scripts@patch:react-scripts@npm%3A4.0.2#.yarn/patches/react-scripts__npm_4.0.2.patch::version=4.0.2&hash=bfb7c4&locator=rtk-monorepo%40workspace%3A."
dependencies:
"@babel/core": 7.12.3
"@pmmmwh/react-refresh-webpack-plugin": 0.4.3
Expand Down

0 comments on commit d50173d

Please sign in to comment.