Skip to content

Commit 2316111

Browse files
committed
yarn
1 parent 8ce9601 commit 2316111

8 files changed

Lines changed: 969 additions & 944 deletions

File tree

.github/workflows/publish.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ jobs:
1212

1313
strategy:
1414
matrix:
15-
node-version: [12.x, 14.x]
15+
node-version: [14.x]
1616

1717
steps:
1818
- uses: actions/checkout@v1
1919
- name: Use Node.js ${{ matrix.node-version }}
2020
uses: actions/setup-node@v1
2121
with:
2222
node-version: ${{ matrix.node-version }}
23-
- name: yarn install, build, and test
23+
- name: build and test
2424
run: |
2525
yarn install
26-
yarn build
27-
yarn test
26+
make build
27+
make test
2828
env:
2929
CI: true

Makefile

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
DEFAULT_GOAL: build
2+
3+
clean:
4+
make -C packages/demo $@
5+
make -C packages/react-sunbeam $@
6+
7+
build: clean
8+
make -C packages/react-sunbeam $@
9+
make -C packages/demo $@
10+
11+
dev: build
12+
yarn concurrently -n sunb,demo -c red,blue \
13+
"make -C packages/react-sunbeam ${@}" \
14+
"make -C packages/demo ${@}"
15+
16+
type-check:
17+
yarn tsc --noEmit
18+
19+
test:
20+
make -C packages/react-sunbeam $@
21+
22+
PHONY: clean build dev type-check test

packages/demo/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
DEFAULT_GOAL: build
22

3-
build:
3+
clean:
4+
rm -rf dist
5+
6+
build: clean
47
yarn tsc
58

69
dev:

packages/demo/package.json

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,14 @@
11
{
22
"name": "demo",
3-
"version": "2.0.0-alpha.1",
4-
"main": "index.js",
5-
"repository": "git+https://github.com/wzrdzl/react-sunbeam.git",
6-
"author": "Vova Guguiev <vladimir.guguiev@gmail.com>",
7-
"license": "MIT",
3+
"version": "1.0.0",
84
"private": true,
9-
"dependencies": {
10-
"framer-motion": "^2.9.4",
11-
"history": "^5.0.0",
12-
"react": "^17.0.1",
13-
"react-dom": "^17.0.1",
14-
"react-router": "^5.2.0",
15-
"react-router-dom": "^5.2.0",
16-
"react-sunbeam": "^2.0.0-alpha.1"
17-
},
185
"devDependencies": {
196
"@types/react": "^17.0.0",
207
"@types/react-dom": "^17.0.0",
21-
"@types/react-router-dom": "^5.1.6",
228
"concurrently": "^6.0.0",
23-
"http-server": "^0.12.3",
9+
"framer-motion": "^3.10.3",
10+
"react-router": "^5.2.0",
11+
"@types/react-router-dom": "5.1.6",
2412
"typescript": "^4.1.2"
25-
},
26-
"alias": {
27-
"scheduler/tracing": "scheduler/tracing-profiling"
28-
},
29-
"browserslist": [
30-
">5%",
31-
"not dead",
32-
"not ie <= 11",
33-
"not op_mini all"
34-
]
13+
}
3514
}

packages/react-sunbeam/Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
DEFAULT_GOAL: build
2+
3+
clean:
4+
rm -rf dist
5+
6+
build: clean
7+
yarn tsc
8+
9+
dev:
10+
yarn tsc --watch --preserveWatchOutput
11+
12+
type-check:
13+
yarn tsc --noEmit
14+
15+
test:
16+
yarn jest
17+
18+
PHONY: clean build dev type-check test

packages/react-sunbeam/package.json

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
"focus-management"
1010
],
1111
"main": "./dist/cjs/index.js",
12-
"exports": {
13-
".": "./dist/es/index.js"
14-
},
12+
"exports": "./dist/es/index.js",
1513
"module": "./dist/es/index.js",
1614
"types": "./dist/es/index.d.ts",
1715
"repository": {
@@ -21,14 +19,6 @@
2119
},
2220
"author": "Vova Guguiev <vladimir.guguiev@gmail.com>",
2321
"license": "MIT",
24-
"scripts": {
25-
"build": "tsc",
26-
"clean": "rimraf dist",
27-
"dev": "tsc --watch --preserveWatchOutput",
28-
"prebuild": "npm run clean",
29-
"test": "jest",
30-
"type-check": "tsc --noEmit"
31-
},
3222
"devDependencies": {
3323
"@testing-library/react": "^11.1.2",
3424
"@types/jest": "^26.0.15",
@@ -44,11 +34,5 @@
4434
"peerDependencies": {
4535
"react": "^16 || ^17",
4636
"react-dom": "^16 || ^17"
47-
},
48-
"browserslist": [
49-
">0.2%",
50-
"not dead",
51-
"not ie <= 11",
52-
"not op_mini all"
53-
]
37+
}
5438
}

0 commit comments

Comments
 (0)