Skip to content

Commit d50173d

Browse files
phryneasphryneas
committed
changes for github & CSB, rename files for windows compat
1 parent c11887e commit d50173d

File tree

6 files changed

+29
-24
lines changed

6 files changed

+29
-24
lines changed

‎.codesandbox/ci.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
"github/reduxjs/toolkit/examples/query/react/advanced"
88
],
99
"node": "14",
10-
"packages": ["packages/toolkit"]
10+
"buildCommand": "build:packages",
11+
"packages": ["packages/toolkit"],
12+
"publishDirectory": {
13+
"@reduxjs/toolkit": "packages/toolkit"
14+
}
1115
}

‎.github/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../packages/toolkit/README.md

‎.yarn/patches/react-scripts@npm:4.0.2.patch ‎.yarn/patches/react-scripts__npm_4.0.2.patch

File renamed without changes.

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636
"prettier": "^2.2.1"
3737
},
3838
"resolutions": {
39-
"react-scripts": "patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts@npm:4.0.2.patch",
39+
"react-scripts": "patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts__npm_4.0.2.patch",
4040
"react-redux": "npm:7.2.4",
4141
"react": "npm:17.0.2",
4242
"react-dom": "npm:17.0.2"
4343
},
4444
"scripts": {
4545
"build:examples": "yarn workspaces foreach --include '@reduxjs/*' --include '@examples-query-react/*' -vtp run build",
4646
"build:docs": "yarn workspace docs run build",
47-
"build:package": "yarn workspace @reduxjs/toolkit run build"
47+
"build:packages": "yarn workspace @reduxjs/toolkit run build"
4848
}
4949
}

‎packages/toolkit/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@
7878
"yargs": "^15.3.1"
7979
},
8080
"scripts": {
81-
"build-ci": "rimraf dist && tsc && node scripts/cli.js --skipExtraction ",
81+
"build-ci": "yarn rimraf dist && yarn tsc && node scripts/cli.js --skipExtraction",
8282
"build-prepare": "npm run build-ci",
83-
"build": "rimraf dist && tsc && node scripts/cli.js --local",
84-
"build-only": "rimraf dist && tsc && node scripts/cli.js --skipExtraction",
83+
"build": "yarn rimraf dist && yarn tsc && node scripts/cli.js --local --skipExtraction",
84+
"build-only": "yarn rimraf dist && yarn tsc && node scripts/cli.js --skipExtraction",
8585
"format": "prettier --write \"(src|examples)/**/*.{ts,tsx}\" \"**/*.md\"",
8686
"format:check": "prettier --list-different \"(src|examples)/**/*.{ts,tsx}\" \"docs/*/**.md\"",
8787
"lint": "eslint src examples",

‎yarn.lock

+18-18
Original file line numberDiff line numberDiff line change
@@ -3293,7 +3293,7 @@ __metadata:
32933293
version: 0.0.0-use.local
32943294
resolution: "@examples-query-react/advanced@workspace:examples/query/react/advanced"
32953295
dependencies:
3296-
"@reduxjs/toolkit": ^1.6.0-beta.0
3296+
"@reduxjs/toolkit": ^1.6.0-rc.1
32973297
"@types/react": 17.0.0
32983298
"@types/react-dom": 17.0.0
32993299
"@types/react-redux": 7.1.9
@@ -3312,7 +3312,7 @@ __metadata:
33123312
"@chakra-ui/react": 1.0.0
33133313
"@emotion/react": ^11.4.0
33143314
"@emotion/styled": ^11.3.0
3315-
"@reduxjs/toolkit": ^1.6.0-beta.0
3315+
"@reduxjs/toolkit": ^1.6.0-rc.1
33163316
"@types/react": 17.0.0
33173317
"@types/react-dom": 17.0.0
33183318
"@types/react-redux": 7.1.9
@@ -3336,7 +3336,7 @@ __metadata:
33363336
"@chakra-ui/react": 1.0.0
33373337
"@emotion/react": ^11.4.0
33383338
"@emotion/styled": ^11.3.0
3339-
"@reduxjs/toolkit": ^1.6.0-beta.0
3339+
"@reduxjs/toolkit": ^1.6.0-rc.1
33403340
"@types/react": 17.0.0
33413341
"@types/react-dom": 17.0.0
33423342
"@types/react-redux": 7.1.9
@@ -3357,7 +3357,7 @@ __metadata:
33573357
version: 0.0.0-use.local
33583358
resolution: "@examples-query-react/basic@workspace:examples/query/react/basic"
33593359
dependencies:
3360-
"@reduxjs/toolkit": ^1.6.0-beta.0
3360+
"@reduxjs/toolkit": ^1.6.0-rc.1
33613361
"@types/react": 17.0.0
33623362
"@types/react-dom": 17.0.0
33633363
"@types/react-redux": 7.1.9
@@ -3373,7 +3373,7 @@ __metadata:
33733373
version: 0.0.0-use.local
33743374
resolution: "@examples-query-react/conditional-fetching@workspace:examples/query/react/conditional-fetching"
33753375
dependencies:
3376-
"@reduxjs/toolkit": ^1.6.0-beta.0
3376+
"@reduxjs/toolkit": ^1.6.0-rc.1
33773377
"@types/react": 17.0.0
33783378
"@types/react-dom": 17.0.0
33793379
"@types/react-redux": 7.1.9
@@ -3389,7 +3389,7 @@ __metadata:
33893389
version: 0.0.0-use.local
33903390
resolution: "@examples-query-react/deduping-queries@workspace:examples/query/react/deduping-queries"
33913391
dependencies:
3392-
"@reduxjs/toolkit": ^1.6.0-beta.0
3392+
"@reduxjs/toolkit": ^1.6.0-rc.1
33933393
"@types/react": 17.0.0
33943394
"@types/react-dom": 17.0.0
33953395
"@types/react-redux": 7.1.9
@@ -3409,7 +3409,7 @@ __metadata:
34093409
"@emotion/react": ^11.4.0
34103410
"@emotion/styled": ^11.3.0
34113411
"@mswjs/data": ^0.3.0
3412-
"@reduxjs/toolkit": ^1.6.0-beta.0
3412+
"@reduxjs/toolkit": ^1.6.0-rc.1
34133413
"@types/faker": ^5.5.5
34143414
"@types/react": 17.0.0
34153415
"@types/react-dom": 17.0.0
@@ -3438,7 +3438,7 @@ __metadata:
34383438
"@emotion/react": ^11.4.0
34393439
"@emotion/styled": ^11.3.0
34403440
"@mswjs/data": ^0.3.0
3441-
"@reduxjs/toolkit": ^1.6.0-beta.0
3441+
"@reduxjs/toolkit": ^1.6.0-rc.1
34423442
"@types/react": 17.0.0
34433443
"@types/react-dom": 17.0.0
34443444
"@types/react-redux": 7.1.9
@@ -3463,7 +3463,7 @@ __metadata:
34633463
"@emotion/react": ^11.4.0
34643464
"@emotion/styled": ^11.3.0
34653465
"@mswjs/data": ^0.3.0
3466-
"@reduxjs/toolkit": ^1.6.0-beta.0
3466+
"@reduxjs/toolkit": ^1.6.0-rc.1
34673467
"@types/react": 17.0.0
34683468
"@types/react-dom": 17.0.0
34693469
"@types/react-redux": 7.1.9
@@ -3490,7 +3490,7 @@ __metadata:
34903490
"@emotion/react": ^11.4.0
34913491
"@emotion/styled": ^11.3.0
34923492
"@mswjs/data": ^0.3.0
3493-
"@reduxjs/toolkit": ^1.6.0-beta.0
3493+
"@reduxjs/toolkit": ^1.6.0-rc.1
34943494
"@types/faker": ^5.5.5
34953495
"@types/react": 17.0.0
34963496
"@types/react-dom": 17.0.0
@@ -3513,7 +3513,7 @@ __metadata:
35133513
version: 0.0.0-use.local
35143514
resolution: "@examples-query-react/polling@workspace:examples/query/react/polling"
35153515
dependencies:
3516-
"@reduxjs/toolkit": ^1.6.0-beta.0
3516+
"@reduxjs/toolkit": ^1.6.0-rc.1
35173517
"@types/react": 17.0.0
35183518
"@types/react-dom": 17.0.0
35193519
"@types/react-redux": 7.1.9
@@ -3533,7 +3533,7 @@ __metadata:
35333533
"@emotion/react": ^11.4.0
35343534
"@emotion/styled": ^11.3.0
35353535
"@mswjs/data": ^0.3.0
3536-
"@reduxjs/toolkit": ^1.6.0-beta.0
3536+
"@reduxjs/toolkit": ^1.6.0-rc.1
35373537
"@types/faker": ^5.5.5
35383538
"@types/react": 17.0.0
35393539
"@types/react-dom": 17.0.0
@@ -3560,7 +3560,7 @@ __metadata:
35603560
"@emotion/react": ^11.4.0
35613561
"@emotion/styled": ^11.3.0
35623562
"@mswjs/data": ^0.3.0
3563-
"@reduxjs/toolkit": ^1.6.0-beta.0
3563+
"@reduxjs/toolkit": ^1.6.0-rc.1
35643564
"@types/faker": ^5.5.5
35653565
"@types/react": 17.0.0
35663566
"@types/react-dom": 17.0.0
@@ -3587,7 +3587,7 @@ __metadata:
35873587
"@emotion/react": ^11.4.0
35883588
"@emotion/styled": ^11.3.0
35893589
"@mswjs/data": ^0.3.0
3590-
"@reduxjs/toolkit": ^1.6.0-beta.0
3590+
"@reduxjs/toolkit": ^1.6.0-rc.1
35913591
"@types/faker": ^5.5.5
35923592
"@types/react": 17.0.0
35933593
"@types/react-dom": 17.0.0
@@ -3610,7 +3610,7 @@ __metadata:
36103610
version: 0.0.0-use.local
36113611
resolution: "@examples-query-react/with-apiprovider@workspace:examples/query/react/with-apiprovider"
36123612
dependencies:
3613-
"@reduxjs/toolkit": ^1.6.0-beta.0
3613+
"@reduxjs/toolkit": ^1.6.0-rc.1
36143614
"@types/react": 17.0.0
36153615
"@types/react-dom": 17.0.0
36163616
"@types/react-redux": 7.1.9
@@ -4241,7 +4241,7 @@ __metadata:
42414241
languageName: node
42424242
linkType: hard
42434243

4244-
"@reduxjs/toolkit@^1.6.0-beta.0, @reduxjs/toolkit@workspace:packages/toolkit":
4244+
"@reduxjs/toolkit@^1.6.0-rc.1, @reduxjs/toolkit@workspace:packages/toolkit":
42454245
version: 0.0.0-use.local
42464246
resolution: "@reduxjs/toolkit@workspace:packages/toolkit"
42474247
dependencies:
@@ -18384,9 +18384,9 @@ fsevents@^1.2.7:
1838418384
languageName: node
1838518385
linkType: hard
1838618386

18387-
"react-scripts@patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts@npm:4.0.2.patch::locator=rtk-monorepo%40workspace%3A.":
18387+
"react-scripts@patch:react-scripts@npm:4.0.2#.yarn/patches/react-scripts__npm_4.0.2.patch::locator=rtk-monorepo%40workspace%3A.":
1838818388
version: 4.0.2
18389-
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."
18389+
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."
1839018390
dependencies:
1839118391
"@babel/core": 7.12.3
1839218392
"@pmmmwh/react-refresh-webpack-plugin": 0.4.3

0 commit comments

Comments
 (0)