Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Binder and yarn tweaks #3795

Merged
merged 8 commits into from
Jul 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .binder/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
set -e

npm install -g yarn
yarn set version stable

./dev-install.sh
2 changes: 1 addition & 1 deletion .binder/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bqplot
ipyleaflet
jupyterlab-myst
jupyterlab~=3.0
jupyterlab==4.0.2
matplotlib
networkx
numpy
Expand Down
12 changes: 12 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1,13 @@
nodeLinker: node-modules

# prettier-ignore
packageExtensions:
"@nrwl/devkit@^15":
dependencies:
nx: ^15
postcss-cssnext@^3.1.0:
dependencies:
caniuse-lite: ^1
source-map-loader@^4:
dependencies:
webpack: ^5
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"build:nbextension": "lerna run --stream build:nbextension",
"build:test": "lerna run build:test --stream --ignore \"@jupyter-widgets/example-*\"",
"clean": "lerna run --stream clean",
"deduplicate": "yarn && yarn-deduplicate -s fewer --fail",
"docs": "typedoc",
"eslint": "eslint . --fix --ignore-path .gitignore --ext .ts,.tsx",
"eslint:check": "eslint . --ignore-path .gitignore --ext .ts,.tsx",
Expand Down Expand Up @@ -55,8 +54,7 @@
"prettier": "^2.8.3",
"sort-package-json": "^2.1.0",
"typedoc": "~0.23.24",
"typescript": "~4.9.4",
"yarn-deduplicate": "^6.0.1"
"typescript": "~4.9.4"
},
"engines": {
"node": ">=14",
Expand Down
89 changes: 69 additions & 20 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4356,7 +4356,7 @@ __metadata:
languageName: node
linkType: hard

"acorn-import-assertions@npm:^1.7.6":
"acorn-import-assertions@npm:^1.7.6, acorn-import-assertions@npm:^1.9.0":
version: 1.9.0
resolution: "acorn-import-assertions@npm:1.9.0"
peerDependencies:
Expand Down Expand Up @@ -5309,6 +5309,13 @@ __metadata:
languageName: node
linkType: hard

"caniuse-lite@npm:^1":
version: 1.0.30001511
resolution: "caniuse-lite@npm:1.0.30001511"
checksum: b7a8176673b15b9fbff689c6df1f38b69b877d68905120c5b1d4a1a6fa73d165f383aa1c818872435c0180681065b7be81c2cfff8303fed4b3cc54bd305fd67e
languageName: node
linkType: hard

"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30000792, caniuse-lite@npm:^1.0.30000805, caniuse-lite@npm:^1.0.30001449":
version: 1.0.30001487
resolution: "caniuse-lite@npm:1.0.30001487"
Expand Down Expand Up @@ -6815,6 +6822,16 @@ __metadata:
languageName: node
linkType: hard

"enhanced-resolve@npm:^5.15.0":
version: 5.15.0
resolution: "enhanced-resolve@npm:5.15.0"
dependencies:
graceful-fs: ^4.2.4
tapable: ^2.2.0
checksum: fbd8cdc9263be71cc737aa8a7d6c57b43d6aa38f6cc75dde6fcd3598a130cc465f979d2f4d01bb3bf475acb43817749c79f8eef9be048683602ca91ab52e4f11
languageName: node
linkType: hard

"enquirer@npm:~2.3.6":
version: 2.3.6
resolution: "enquirer@npm:2.3.6"
Expand Down Expand Up @@ -11232,7 +11249,7 @@ __metadata:
languageName: node
linkType: hard

"nx@npm:15.9.4, nx@npm:>=14.8.1 < 16":
"nx@npm:15.9.4, nx@npm:>=14.8.1 < 16, nx@npm:^15":
version: 15.9.4
resolution: "nx@npm:15.9.4"
dependencies:
Expand Down Expand Up @@ -13350,7 +13367,6 @@ __metadata:
sort-package-json: ^2.1.0
typedoc: ~0.23.24
typescript: ~4.9.4
yarn-deduplicate: ^6.0.1
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -13500,6 +13516,17 @@ __metadata:
languageName: node
linkType: hard

"schema-utils@npm:^3.2.0":
version: 3.3.0
resolution: "schema-utils@npm:3.3.0"
dependencies:
"@types/json-schema": ^7.0.8
ajv: ^6.12.5
ajv-keywords: ^3.5.2
checksum: ea56971926fac2487f0757da939a871388891bc87c6a82220d125d587b388f1704788f3706e7f63a7b70e49fc2db974c41343528caea60444afd5ce0fe4b85c0
languageName: node
linkType: hard

"schema-utils@npm:^4.0.0":
version: 4.0.1
resolution: "schema-utils@npm:4.0.1"
Expand Down Expand Up @@ -13570,7 +13597,7 @@ __metadata:
languageName: node
linkType: hard

"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0":
"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8":
version: 7.5.1
resolution: "semver@npm:7.5.1"
dependencies:
Expand Down Expand Up @@ -14650,7 +14677,7 @@ __metadata:
languageName: node
linkType: hard

"tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
"tslib@npm:^2.1.0, tslib@npm:^2.3.0, tslib@npm:^2.4.0":
version: 2.5.0
resolution: "tslib@npm:2.5.0"
checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
Expand Down Expand Up @@ -14825,7 +14852,6 @@ __metadata:
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: ab417a2f398380c90a6cf5a5f74badd17866adf57f1165617d6a551f059c3ba0a3e4da0d147b3ac5681db9ac76a303c5876394b13b3de75fdd5b1eaa06181c9d
languageName: node
linkType: hard

Expand Down Expand Up @@ -15429,6 +15455,43 @@ __metadata:
languageName: node
linkType: hard

"webpack@npm:^5":
version: 5.88.1
resolution: "webpack@npm:5.88.1"
dependencies:
"@types/eslint-scope": ^3.7.3
"@types/estree": ^1.0.0
"@webassemblyjs/ast": ^1.11.5
"@webassemblyjs/wasm-edit": ^1.11.5
"@webassemblyjs/wasm-parser": ^1.11.5
acorn: ^8.7.1
acorn-import-assertions: ^1.9.0
browserslist: ^4.14.5
chrome-trace-event: ^1.0.2
enhanced-resolve: ^5.15.0
es-module-lexer: ^1.2.1
eslint-scope: 5.1.1
events: ^3.2.0
glob-to-regexp: ^0.4.1
graceful-fs: ^4.2.9
json-parse-even-better-errors: ^2.3.1
loader-runner: ^4.2.0
mime-types: ^2.1.27
neo-async: ^2.6.2
schema-utils: ^3.2.0
tapable: ^2.1.1
terser-webpack-plugin: ^5.3.7
watchpack: ^2.4.0
webpack-sources: ^3.2.3
peerDependenciesMeta:
webpack-cli:
optional: true
bin:
webpack: bin/webpack.js
checksum: 726e7e05ab2e7c142609a673dd6aa1a711ed97f349418a2a393d650c5ddad172d191257f60e1e37f6b2a77261571c202aabd5ce9240791a686774f0801cf5ec2
languageName: node
linkType: hard

"webpack@npm:^5.65.0, webpack@npm:^5.76.1":
version: 5.82.1
resolution: "webpack@npm:5.82.1"
Expand Down Expand Up @@ -15850,20 +15913,6 @@ __metadata:
languageName: node
linkType: hard

"yarn-deduplicate@npm:^6.0.1":
version: 6.0.2
resolution: "yarn-deduplicate@npm:6.0.2"
dependencies:
"@yarnpkg/lockfile": ^1.1.0
commander: ^10.0.1
semver: ^7.5.0
tslib: ^2.5.0
bin:
yarn-deduplicate: dist/cli.js
checksum: 2f6c38deaa1139f3a099069dc946a3800e5ba64410d1c45f516dc381e4b1619f0d4f7ad3b38a617e3a85d629ce42e5592105de7089a0da4d0198881ee5390947
languageName: node
linkType: hard

"yjs@npm:^13.5.40":
version: 13.6.1
resolution: "yjs@npm:13.6.1"
Expand Down