Skip to content

Commit a7c0dac

Browse files
fakenickelsfakenickels
authored
Merge pull request #249 from rescriptbr/feat/improve-stuff
bring back reschema, move everything to packages/ and setup rewatch, upgrade to v11
2 parents 870c3e1 + 284ee39 commit a7c0dac

105 files changed

Lines changed: 5056 additions & 993 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bsconfig.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"name": "reform-monorepo",
3+
"sources": [
4+
{
5+
"dir": "src/",
6+
"subdirs": true
7+
}
8+
],
9+
"package-specs": [
10+
{
11+
"module": "commonjs",
12+
"in-source": true
13+
}
14+
],
15+
"warnings": {
16+
"error": false
17+
},
18+
"suffix": ".bs.js",
19+
"bs-dependencies": ["@rescriptbr/reform", "@rescriptbr/reschema"]
20+
}

‎package.json‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
},
3636
"pre-commit": "lint:staged",
3737
"workspaces": [
38-
"reform",
39-
"website",
40-
"demo"
38+
"packages/reform",
39+
"packages/website",
40+
"packages/reschema"
4141
],
4242
"husky": {
4343
"hooks": {
@@ -48,15 +48,17 @@
4848
"scripts": {
4949
"docs:watch": "yarn workspace website start",
5050
"docs:build": "yarn workspace website build",
51-
"res:watch": "yarn workspace @rescriptbr/reform res:watch",
52-
"res:build": "yarn workspace @rescriptbr/reform res:build",
51+
"res:watch": "rewatch watch",
52+
"res:build": "rewatch build",
53+
"res:clean": "rewatch clean",
5354
"res:setup": "yarn workspace @rescriptbr/reform res:setup",
5455
"test": "yarn workspace @rescriptbr/reform test",
5556
"test:watch": "yarn workspace @rescriptbr/reform test:watch",
5657
"lint:staged": "lint-staged",
5758
"demo:build": "yarn workspace demo build"
5859
},
5960
"dependencies": {
60-
"rescript": "9.1.4"
61+
"@rolandpeelen/rewatch": "0.0.12-0c3740d.0",
62+
"rescript": "^11.0.0"
6163
}
6264
}

demo/.editorconfig renamed to packages/demo/.editorconfig

File renamed without changes.

demo/.gitignore renamed to packages/demo/.gitignore

File renamed without changes.

demo/bsconfig.json renamed to packages/demo/bsconfig.json

File renamed without changes.

demo/index.html renamed to packages/demo/index.html

File renamed without changes.

demo/package.json renamed to packages/demo/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
"private": true,
55
"dependencies": {
66
"@emotion/css": "11.7.1",
7-
"@rescript/react": "0.10.3",
7+
"@rescript/react": "^0.12.0",
88
"@rescriptbr/ancestor": "0.5.0",
99
"@rescriptbr/reform": "12.0.1",
1010
"@vitejs/plugin-react": "1.0.0",
1111
"lenses-ppx": "6.1.10",
12-
"react": "17.0.2",
13-
"react-dom": "17.0.2",
12+
"react": "^18.0.0",
13+
"react-dom": "^18.0.0",
1414
"@rescriptbr/reschema": "3.0.1",
15-
"rescript": "9.1.1",
15+
"rescript": "^11.0.0",
1616
"vite": "2.6.4"
1717
},
1818
"scripts": {

demo/public/_redirects renamed to packages/demo/public/_redirects

File renamed without changes.

demo/src/App.res renamed to packages/demo/src/App.res

File renamed without changes.

demo/src/Main.res renamed to packages/demo/src/Main.res

File renamed without changes.

0 commit comments

Comments
 (0)