Skip to content

Commit

Permalink
Solve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
AnastasiaSliusar committed Dec 13, 2024
2 parents eddf82f + 22a94fb commit 1bf9c7e
Show file tree
Hide file tree
Showing 24 changed files with 4,347 additions and 887 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ lib/
node_modules/
*.log
.eslintcache
.stylelintcache
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
Expand Down
28 changes: 26 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,32 @@

<!-- <START NEW CHANGELOG ENTRY> -->

## 3.0.0a0

([Full Changelog](https://github.com/jupyterlite/xeus/compare/v2.1.2...e5309712444f04c21cc6e45cd6fd1aec61689f6e))

### Enhancements made

- Split package in two: extension and library [#132](https://github.com/jupyterlite/xeus/pull/132) ([@martinRenou](https://github.com/martinRenou))
- Register all kernels in one plugin [#107](https://github.com/jupyterlite/xeus/pull/107) ([@trungleduc](https://github.com/trungleduc))

### Maintenance and upkeep improvements

- Remove unused attributes [#131](https://github.com/jupyterlite/xeus/pull/131) ([@martinRenou](https://github.com/martinRenou))
- Docs: more verbose build [#129](https://github.com/jupyterlite/xeus/pull/129) ([@martinRenou](https://github.com/martinRenou))

### Documentation improvements

- Docs: more verbose build [#129](https://github.com/jupyterlite/xeus/pull/129) ([@martinRenou](https://github.com/martinRenou))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/jupyterlite/xeus/graphs/contributors?from=2024-10-24&to=2024-12-13&type=c))

[@martinRenou](https://github.com/search?q=repo%3Ajupyterlite%2Fxeus+involves%3AmartinRenou+updated%3A2024-10-24..2024-12-13&type=Issues) | [@trungleduc](https://github.com/search?q=repo%3Ajupyterlite%2Fxeus+involves%3Atrungleduc+updated%3A2024-10-24..2024-12-13&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 2.1.2

([Full Changelog](https://github.com/jupyterlite/xeus/compare/v2.1.1...ea918a0cb1c5a59fc64e72f399effb0bdf66acd1))
Expand All @@ -16,8 +42,6 @@

[@trungleduc](https://github.com/search?q=repo%3Ajupyterlite%2Fxeus+involves%3Atrungleduc+updated%3A2024-10-23..2024-10-24&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 2.1.1

([Full Changelog](https://github.com/jupyterlite/xeus/compare/v2.1.0...473ab8be5735c267ea01dd2e17da77e50f6fda3a))
Expand Down
5 changes: 5 additions & 0 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "independent",
"npmClient": "yarn"
}
132 changes: 14 additions & 118 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "@jupyterlite/xeus",
"version": "2.1.2",
"name": "@jupyterlite/xeus-root",
"version": "3.0.0-a0",
"private": true,
"description": "JupyterLite loader for Xeus kernels",
"keywords": [
"jupyter",
Expand All @@ -13,125 +14,37 @@
},
"license": "BSD-3-Clause",
"author": "JupyterLite Contributors",
"files": [
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}",
"style/**/*.{css,js,eot,gif,html,jpg,json,png,svg,woff2,ttf}"
"workspaces": [
"packages/*"
],
"main": "lib/index.js",
"types": "lib/index.d.ts",
"style": "style/index.css",
"repository": {
"type": "git",
"url": "https://github.com/jupyterlite/xeus.git"
},
"scripts": {
"build": "jlpm build:lib && jlpm build:worker && jlpm build:labextension:dev",
"build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:worker:prod && jlpm build:labextension",
"build:worker": "webpack --config worker.webpack.config.js --mode=development",
"build:worker:prod": "webpack --config worker.webpack.config.js --mode=production",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:lib": "tsc --sourceMap",
"build:lib:prod": "tsc",
"clean": "jlpm clean:lib",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
"clean:labextension": "rimraf jupyterlite_xeus/labextension jupyterlite_xeus/_version.py",
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
"build": "lerna run build",
"build:prod": "lerna run build:prod",
"clean": "lerna run clean",
"clean:all": "lerna run clean:all",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
"install:extension": "jlpm build",
"lint": "jlpm stylelint && jlpm prettier && jlpm eslint",
"lint:check": "jlpm stylelint:check && jlpm prettier:check && jlpm eslint:check",
"lint": "jlpm prettier && jlpm eslint",
"lint:check": "jlpm prettier:check && jlpm eslint:check",
"prettier": "jlpm prettier:base --write --list-different",
"prettier:base": "prettier \"**/*{.ts,.tsx,.js,.jsx,.css,.json,.md}\"",
"prettier:check": "jlpm prettier:base --check",
"stylelint": "jlpm stylelint:check --fix",
"stylelint:check": "stylelint --cache \"style/**/*.css\"",
"watch": "run-p watch:src watch:labextension",
"watch:src": "tsc -w --sourceMap",
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/coreutils": "^6",
"@jupyterlab/services": "^7",
"@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@jupyterlite/kernel": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@jupyterlite/server": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@lumino/coreutils": "^2",
"@lumino/signaling": "^2",
"assert": "^2.1.0",
"browserify-fs": "^1.0.0",
"buffer": "^6.0.3",
"coincident": "^1.2.3",
"comlink": "^4.4.1",
"crypto-browserify": "^3.12.0",
"file-loader": "^6.2.0",
"https-browserify": "^1.0.0",
"os-browserify": "^0.3.0",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"tar-stream": "^3.1.7",
"url": "^0.11.4",
"v": "^0.3.0",
"vm-browserify": "^1.1.2"
"watch": "lerna run watch"
},
"devDependencies": {
"@jupyterlab/builder": "^4.1.0",
"@types/json-schema": "^7.0.11",
"@types/react": "^18.0.26",
"@types/react-addons-linked-state-mixin": "^0.14.22",
"@typescript-eslint/eslint-plugin": "^6.1.0",
"@typescript-eslint/parser": "^6.1.0",
"copy-webpack-plugin": "^10.0.0",
"css-loader": "^6.7.1",
"eslint": "^8.36.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-prettier": "^5.0.0",
"lerna": "^8.1.9",
"npm-run-all": "^4.1.5",
"prettier": "^3.0.0",
"rimraf": "^5.0.1",
"source-map-loader": "^1.0.2",
"style-loader": "^3.3.1",
"stylelint": "^15.10.1",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-csstree-validator": "^3.0.0",
"stylelint-prettier": "^4.0.0",
"ts-loader": "^9.2.6",
"typescript": "~5.0.2",
"webpack": "^5.87.0",
"yjs": "^13.5.0"
},
"sideEffects": [
"style/*.css",
"style/index.js"
],
"styleModule": "style/index.js",
"publishConfig": {
"access": "public"
},
"jupyterlab": {
"extension": true,
"webpackConfig": "lab.webpack.config.js",
"outputDir": "jupyterlite_xeus/labextension",
"sharedPackages": {
"@jupyterlite/kernel": {
"bundled": false,
"singleton": true
},
"@jupyterlite/server": {
"bundled": false,
"singleton": true
},
"@jupyterlite/contents": {
"bundled": false,
"singleton": true
}
}
},
"jupyterlite": {
"liteExtension": true
"rimraf": "^5.0.1"
},
"eslintIgnore": [
"node_modules",
Expand Down Expand Up @@ -209,22 +122,5 @@
}
}
]
},
"stylelint": {
"extends": [
"stylelint-config-recommended",
"stylelint-config-standard",
"stylelint-prettier/recommended"
],
"plugins": [
"stylelint-csstree-validator"
],
"rules": {
"csstree/validator": true,
"property-no-vendor-prefix": null,
"selector-class-pattern": "^([a-z][A-z\\d]*)(-[A-z\\d]+)*$",
"selector-no-vendor-prefix": null,
"value-no-vendor-prefix": null
}
}
}
86 changes: 86 additions & 0 deletions packages/xeus-extension/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"name": "@jupyterlite/xeus-extension",
"version": "2.1.2",
"description": "JupyterLite loader for Xeus kernels",
"keywords": [
"jupyter",
"jupyterlab",
"jupyterlab-extension"
],
"homepage": "https://github.com/jupyterlite/xeus",
"bugs": {
"url": "https://github.com/jupyterlite/xeus/issues"
},
"license": "BSD-3-Clause",
"author": "JupyterLite Contributors",
"files": [
"lib/**/*.{d.ts,eot,gif,html,jpg,js,js.map,json,png,svg,woff2,ttf}"
],
"main": "lib/index.js",
"types": "lib/index.d.ts",
"repository": {
"type": "git",
"url": "https://github.com/jupyterlite/xeus.git"
},
"scripts": {
"build": "jlpm build:lib && jlpm build:labextension:dev",
"build:prod": "jlpm clean && jlpm build:lib:prod && jlpm build:labextension",
"build:labextension": "jupyter labextension build .",
"build:labextension:dev": "jupyter labextension build --development True .",
"build:lib": "tsc --sourceMap",
"build:lib:prod": "tsc",
"clean": "jlpm clean:lib",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"clean:labextension": "rimraf jupyterlite_xeus/labextension jupyterlite_xeus/_version.py",
"clean:all": "jlpm clean:lib && jlpm clean:labextension",
"watch": "run-p watch:src watch:labextension",
"watch:src": "tsc -w --sourceMap",
"watch:labextension": "jupyter labextension watch ."
},
"dependencies": {
"@jupyterlab/coreutils": "^6",
"@jupyterlite/contents": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@jupyterlite/kernel": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@jupyterlite/server": "^0.2.0 || ^0.3.0 || ^0.4.0",
"@jupyterlite/xeus": "^2.1.2",
"@lumino/coreutils": "^2"
},
"devDependencies": {
"@jupyterlab/builder": "^4.1.0",
"@types/json-schema": "^7.0.11",
"@types/react": "^18.0.26",
"@types/react-addons-linked-state-mixin": "^0.14.22",
"css-loader": "^6.7.1",
"npm-run-all": "^4.1.5",
"rimraf": "^5.0.1",
"source-map-loader": "^1.0.2",
"ts-loader": "^9.2.6",
"typescript": "~5.0.2",
"webpack": "^5.87.0",
"yjs": "^13.5.0"
},
"publishConfig": {
"access": "public"
},
"jupyterlab": {
"extension": true,
"outputDir": "../../jupyterlite_xeus/labextension",
"sharedPackages": {
"@jupyterlite/kernel": {
"bundled": false,
"singleton": true
},
"@jupyterlite/server": {
"bundled": false,
"singleton": true
},
"@jupyterlite/contents": {
"bundled": false,
"singleton": true
}
}
},
"jupyterlite": {
"liteExtension": true
}
}
Loading

0 comments on commit 1bf9c7e

Please sign in to comment.