Skip to content

Commit 915fcab

Browse files
authored
Merge pull request #94 from vankeisb/feature/try-bomlint
BOM lint
2 parents a596b24 + 48107d3 commit 915fcab

7 files changed

Lines changed: 29 additions & 36 deletions

File tree

.bomlint.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"@types/react": "^16.7.22",
3+
"tea-cup-core": "2.2.2",
4+
"react-tea-cup": "2.2.2",
5+
"ts-jest": "^24.1.0",
6+
"bomlint": "1.2.3"
7+
}

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
defaults: &defaults
44
working_directory: ~/repo
55
docker:
6-
- image: circleci/node:erbium
6+
- image: circleci/node:gallium
77

88
jobs:
99
build:

build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
yarn install && \
2+
yarn bomlint && \
23
cd core && \
34
./build.sh && \
45
cd ../tea-cup && \

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
"jest": "24.9.0",
1212
"prettier": "2.0.5",
1313
"rimraf": "^2.6.3",
14-
"ts-jest": "24.0.2",
15-
"typescript": "~3.9.7"
14+
"ts-jest": "^24.1.0",
15+
"typescript": "~3.9.7",
16+
"bomlint": "1.2.3"
1617
},
1718
"scripts": {
1819
"release:gh": "gren release",
19-
"release:changelog": "gren changelog --tags all --generate --override"
20+
"release:changelog": "gren changelog --tags all --generate --override",
21+
"bomlint": "bomlint --allow-conflicts react package.json ./core/package.json ./tea-cup/package.json ./samples/package.json"
2022
}
2123
}

samples/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"proxy": "https://api.github.com",
66
"dependencies": {
77
"@types/node": "10.12.19",
8-
"@types/react": "16.7.22",
8+
"@types/react": "^16.7.22",
99
"@types/react-dom": "16.0.11",
1010
"jest-enzyme": "^7.1.1",
1111
"react": "^16.7.0",
@@ -36,7 +36,6 @@
3636
"enzyme": "^3.10.0",
3737
"enzyme-adapter-react-16": "^1.15.1",
3838
"enzyme-to-json": "^3.4.2",
39-
"jest-fetch-mock": "^2.1.2",
40-
"ts-jest": "^24.1.0"
39+
"jest-fetch-mock": "^2.1.2"
4140
}
4241
}

tea-cup/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"dependencies": {},
2424
"peerDependencies": {
2525
"react": "^16.7.0 || ^17.0.1",
26-
"tea-cup-core": "^2.2.2"
26+
"tea-cup-core": "2.2.2"
2727
},
2828
"devDependencies": {
2929
"@types/jsdom": "^16.2.5",

yarn.lock

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1633,14 +1633,6 @@
16331633
"@types/prop-types" "*"
16341634
csstype "^3.0.2"
16351635

1636-
"@types/react@16.7.22":
1637-
version "16.7.22"
1638-
resolved "https://registry.yarnpkg.com/@types/react/-/react-16.7.22.tgz#5bc6d166d5ac34b835756f0b736c7b1af0043e81"
1639-
integrity sha512-j/3tVoY09kHcTfbia4l67ofQn9xvktUvlC/4QN0KuBHAXlbU/wuGKMb8WfEb/vIcWxsOxHv559uYprkFDFfP8Q==
1640-
dependencies:
1641-
"@types/prop-types" "*"
1642-
csstype "^2.2.0"
1643-
16441636
"@types/stack-utils@^1.0.1":
16451637
version "1.0.1"
16461638
resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -2620,6 +2612,13 @@ body-parser@1.20.1:
26202612
type-is "~1.6.18"
26212613
unpipe "1.0.0"
26222614

2615+
bomlint@1.2.3:
2616+
version "1.2.3"
2617+
resolved "https://registry.yarnpkg.com/bomlint/-/bomlint-1.2.3.tgz#f181ec55a2a5de6943b87af91ded237820d01ebd"
2618+
integrity sha512-RK+fDLoNKxH+TLjmCda7RwU8i7E5xTMAPqdzWVsNKqgg0siHgYSRBr0bnzppkTRGvXyUW/a2gbXzxSFWSbhVUg==
2619+
dependencies:
2620+
commander "^10.0.1"
2621+
26232622
bonjour@^3.5.0:
26242623
version "3.5.0"
26252624
resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
@@ -3357,6 +3356,11 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
33573356
dependencies:
33583357
delayed-stream "~1.0.0"
33593358

3359+
commander@^10.0.1:
3360+
version "10.0.1"
3361+
resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
3362+
integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
3363+
33603364
commander@^2.11.0, commander@^2.19.0, commander@^2.20.0:
33613365
version "2.20.3"
33623366
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -3906,11 +3910,6 @@ cssstyle@^2.3.0:
39063910
dependencies:
39073911
cssom "~0.3.6"
39083912

3909-
csstype@^2.2.0:
3910-
version "2.6.13"
3911-
resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.13.tgz#a6893015b90e84dd6e85d0e3b442a1e84f2dbe0f"
3912-
integrity sha512-ul26pfSQTZW8dcOnD2iiJssfXw0gdNVX9IJDH/X3K5DGPfj+fUYe3kB+swUY6BF3oZDxaID3AJt+9/ojSAE05A==
3913-
39143913
csstype@^3.0.2:
39153914
version "3.0.3"
39163915
resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz#2b410bbeba38ba9633353aff34b05d9755d065f8"
@@ -12356,21 +12355,6 @@ tr46@~0.0.3:
1235612355
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
1235712356
integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
1235812357

12359-
ts-jest@24.0.2:
12360-
version "24.0.2"
12361-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.0.2.tgz#8dde6cece97c31c03e80e474c749753ffd27194d"
12362-
integrity sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==
12363-
dependencies:
12364-
bs-logger "0.x"
12365-
buffer-from "1.x"
12366-
fast-json-stable-stringify "2.x"
12367-
json5 "2.x"
12368-
make-error "1.x"
12369-
mkdirp "0.x"
12370-
resolve "1.x"
12371-
semver "^5.5"
12372-
yargs-parser "10.x"
12373-
1237412358
ts-jest@^24.1.0:
1237512359
version "24.3.0"
1237612360
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.3.0.tgz#b97814e3eab359ea840a1ac112deae68aa440869"

0 commit comments

Comments
 (0)