Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into traverse-merge
Browse files Browse the repository at this point in the history
  • Loading branch information
nullableVoidPtr committed Jun 14, 2023
2 parents 66c4357 + 5f74b51 commit 881528e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ enableGlobalCache: true

enableTransparentWorkspaces: false

# Disable postinstall scripts.
enableScripts: false

nodeLinker: node-modules

plugins:
Expand Down
11 changes: 2 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"type": "commonjs",
"scripts": {
"postinstall": "husky install",
"prepare": "is-ci || husky install",
"bootstrap": "make bootstrap",
"codesandbox:build": "make build-no-bundle",
"build": "make build",
Expand Down Expand Up @@ -62,6 +62,7 @@
"gulp-plumber": "^1.2.1",
"husky": "^7.0.4",
"import-meta-resolve": "^3.0.0",
"is-ci": "^3.0.1",
"jest": "^29.5.0",
"jest-light-runner": "^0.5.0",
"jest-worker": "^29.5.0",
Expand Down Expand Up @@ -106,14 +107,6 @@
"eslint --format=codeframe --cache --cache-strategy=content"
]
},
"dependenciesMeta": {
"core-js": {
"built": false
},
"core-js-pure": {
"built": false
}
},
"changelog": {
"repo": "babel/babel",
"cacheDir": ".changelog",
Expand Down
17 changes: 12 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6286,6 +6286,7 @@ __metadata:
gulp-plumber: ^1.2.1
husky: ^7.0.4
import-meta-resolve: ^3.0.0
is-ci: ^3.0.1
jest: ^29.5.0
jest-light-runner: ^0.5.0
jest-worker: ^29.5.0
Expand All @@ -6301,11 +6302,6 @@ __metadata:
test262-stream: ^1.4.0
through2: ^4.0.0
typescript: ^5.0.2
dependenciesMeta:
core-js:
built: false
core-js-pure:
built: false
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -10198,6 +10194,17 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"is-ci@npm:^3.0.1":
version: 3.0.1
resolution: "is-ci@npm:3.0.1"
dependencies:
ci-info: ^3.2.0
bin:
is-ci: bin.js
checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
languageName: node
linkType: hard

"is-core-module@npm:^2.12.0, is-core-module@npm:^2.8.1":
version: 2.12.0
resolution: "is-core-module@npm:2.12.0"
Expand Down

0 comments on commit 881528e

Please sign in to comment.