From 1d0398d36d66e6ab7958e5e23946bda79937adb0 Mon Sep 17 00:00:00 2001 From: VsevolodX <79542055+VsevolodX@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:36:26 -0700 Subject: [PATCH 1/3] update: rename exabyte-io/made.js -> mat3ra/made --- README.md | 4 +- package-lock.json | 501 +++++++++++++++++--- package.json | 4 +- src/components/ThreeDEditor.jsx | 2 +- src/components/ThreejsEditorModal.jsx | 2 +- src/index.jsx | 2 +- src/mixins/bonds.js | 2 +- src/mixins/boundary.js | 2 +- src/mixins/repetition.js | 2 +- src/utils.js | 2 +- tests/__tests__/components/ThreeDEditor.jsx | 2 +- tests/enums.js | 2 +- 12 files changed, 452 insertions(+), 75 deletions(-) diff --git a/README.md b/README.md index 1d182b4d..c42826fd 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Exabyte.io believe in a collaborative future of materials design on the web. As below: - the package provides a web environment for the visualization of atomic structures and is written in ECMAScript 2015 (ES6) for use on the web -- ESSE Data Convention is employed to organize and store information [[1]](#links) via [Made.js](https://github.com/exabyte-io/made.js) +- ESSE Data Convention is employed to organize and store information [[1]](#links) via [Made.js](https://github.com/mat3ra/made) - [THREE.js](https://threejs.org/) is used for 3d visualization purposes - High-level classes for the representation of the [viewer](src/wave.js) and modular ES6-compatible mixins for the associated functionality, ie: - [Atoms](src/mixins/atoms.js), @@ -117,7 +117,7 @@ npm test ## Dependencies -This package depends on [Made.js](https://github.com/Exabyte-io/made.js), as well as a slightly [modified version of Three.js](https://github.com/Exabyte-io/three.js/commits/v0.90.0). See [package.json](package.json) for the full list. +This package depends on [Made.js](https://github.com/mat3ra/made), as well as a slightly [modified version of Three.js](https://github.com/Exabyte-io/three.js/commits/v0.90.0). See [package.json](package.json) for the full list. ## Links diff --git a/package-lock.json b/package-lock.json index a3ca5920..6ff9431e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,45 @@ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" }, + "@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + }, + "dependencies": { + "@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + } + } + }, "@babel/cli": { "version": "7.16.0", "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.16.0.tgz", @@ -1890,68 +1929,6 @@ "integrity": "sha512-2da786Y5j3soXcxRi/MST6qc2aIUgTjCjcqfm+xQkGfJSV8FaQR/jccENLZ5i5ynYUMqQ8Elir2Q3n4LBFqeBg==", "dev": true }, - "@exabyte-io/made.js": { - "version": "2024.2.21-0", - "resolved": "https://registry.npmjs.org/@exabyte-io/made.js/-/made.js-2024.2.21-0.tgz", - "integrity": "sha512-/0NVQBY5UQhedZNnlUdj7EA/mOUljEMVHmeLR8BiKTan9XN1En7qgq1z/LAXV4Iw9fFwiC7cqH/r836rZq+xgg==", - "dev": true, - "requires": { - "@babel/core": "^7.16.0", - "@exabyte-io/periodic-table.js": "2022.5.28-0", - "@types/chai": "^4.3.5", - "@types/mocha": "^10.0.1", - "@types/node": "^20.4.2", - "@types/underscore": "^1.11.6", - "@types/underscore.string": "^0.0.40", - "array-almost-equal": "^1.0.0", - "crypto-js": "^3.1.9-1", - "lodash": "^4.17.*", - "mathjs": "^3.9.0", - "typescript": "^4.5.5", - "underscore": "^1.8.3", - "underscore.string": "^3.3.4" - }, - "dependencies": { - "@exabyte-io/periodic-table.js": { - "version": "2022.5.28-0", - "resolved": "https://registry.npmjs.org/@exabyte-io/periodic-table.js/-/periodic-table.js-2022.5.28-0.tgz", - "integrity": "sha512-BA+u07dkt4e8yqcBHTv5szXXeMyNFcW0G2Ki3Vbugv6ku6dfl4+Sji8cs5PUr+hkYptc7rTg5r89lfr6Vt+oJw==", - "dev": true, - "requires": { - "@babel/cli": "7.16.0", - "@babel/core": "7.16.0", - "@babel/eslint-parser": "7.16.3", - "@babel/plugin-proposal-class-properties": "7.16.0", - "@babel/preset-env": "7.16.4", - "@babel/register": "7.16.0", - "underscore": "1.8.3" - }, - "dependencies": { - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==", - "dev": true - } - } - }, - "@types/underscore.string": { - "version": "0.0.40", - "resolved": "https://registry.npmjs.org/@types/underscore.string/-/underscore.string-0.0.40.tgz", - "integrity": "sha512-6J3Wp6PnuXhSxVSVaSoh9SKiormScoa2pPLKpZk5QsjKD3RKQZQj/mwBVfULd2MUl5gM/UlLSvr+cynd/7VWQA==", - "dev": true, - "requires": { - "@types/underscore": "*" - } - }, - "crypto-js": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz", - "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q==", - "dev": true - } - } - }, "@exabyte-io/periodic-table.js": { "version": "2022.5.5-2", "resolved": "https://registry.npmjs.org/@exabyte-io/periodic-table.js/-/periodic-table.js-2022.5.5-2.tgz", @@ -2853,6 +2830,400 @@ } } }, + "@mat3ra/made": { + "version": "2024.3.23-1", + "resolved": "https://registry.npmjs.org/@mat3ra/made/-/made-2024.3.23-1.tgz", + "integrity": "sha512-zRj+SoMzT9chbtfD5AJkxKWXKD8Wd7Bp0K5UV5QtzplS5VBKS1CFZTL3BuKfipR5CFwJ/sZd4tqm21UJeLKFww==", + "dev": true, + "requires": { + "@babel/core": "7.24.1", + "@exabyte-io/periodic-table.js": "2022.5.28-0", + "@types/chai": "^4.3.5", + "@types/mocha": "^10.0.1", + "@types/node": "^20.4.2", + "@types/underscore": "^1.11.6", + "@types/underscore.string": "^0.0.40", + "array-almost-equal": "^1.0.0", + "crypto-js": "4.2.0", + "lodash": "^4.17.*", + "mathjs": "12.4.1", + "typescript": "^4.5.5", + "underscore": "^1.8.3", + "underscore.string": "^3.3.4" + }, + "dependencies": { + "@babel/code-frame": { + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", + "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "dev": true, + "requires": { + "@babel/highlight": "^7.24.2", + "picocolors": "^1.0.0" + } + }, + "@babel/compat-data": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz", + "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==", + "dev": true + }, + "@babel/core": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.1.tgz", + "integrity": "sha512-F82udohVyIgGAY2VVj/g34TpFUG606rumIHjTfVbssPg2zTR7PuuEpZcX8JA6sgBfIYmJrFtWgPvHQuJamVqZQ==", + "dev": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.24.1", + "@babel/parser": "^7.24.1", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + } + }, + "@babel/generator": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz", + "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==", + "dev": true, + "requires": { + "@babel/types": "^7.24.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + } + }, + "@babel/helper-environment-visitor": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "dev": true + }, + "@babel/helper-function-name": { + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "dev": true, + "requires": { + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" + } + }, + "@babel/helper-module-transforms": { + "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "dev": true, + "requires": { + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.20" + } + }, + "@babel/helper-string-parser": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", + "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "dev": true + }, + "@babel/helpers": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz", + "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==", + "dev": true, + "requires": { + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0" + } + }, + "@babel/highlight": { + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", + "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", + "dev": true, + "requires": { + "@babel/helper-validator-identifier": "^7.22.20", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + } + }, + "@babel/parser": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", + "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==", + "dev": true + }, + "@babel/runtime": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", + "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", + "dev": true, + "requires": { + "regenerator-runtime": "^0.14.0" + } + }, + "@babel/template": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" + } + }, + "@babel/traverse": { + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", + "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.24.1", + "@babel/types": "^7.24.0", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", + "to-fast-properties": "^2.0.0" + } + }, + "@exabyte-io/periodic-table.js": { + "version": "2022.5.28-0", + "resolved": "https://registry.npmjs.org/@exabyte-io/periodic-table.js/-/periodic-table.js-2022.5.28-0.tgz", + "integrity": "sha512-BA+u07dkt4e8yqcBHTv5szXXeMyNFcW0G2Ki3Vbugv6ku6dfl4+Sji8cs5PUr+hkYptc7rTg5r89lfr6Vt+oJw==", + "dev": true, + "requires": { + "@babel/cli": "7.16.0", + "@babel/core": "7.16.0", + "@babel/eslint-parser": "7.16.3", + "@babel/plugin-proposal-class-properties": "7.16.0", + "@babel/preset-env": "7.16.4", + "@babel/register": "7.16.0", + "underscore": "1.8.3" + }, + "dependencies": { + "@babel/core": { + "version": "7.16.0", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.16.0.tgz", + "integrity": "sha512-mYZEvshBRHGsIAiyH5PzCFTCfbWfoYbO/jcSdXQSUQu1/pW0xDZAUP7KEc32heqWTAfAHhV9j1vH8Sav7l+JNQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.16.0", + "@babel/generator": "^7.16.0", + "@babel/helper-compilation-targets": "^7.16.0", + "@babel/helper-module-transforms": "^7.16.0", + "@babel/helpers": "^7.16.0", + "@babel/parser": "^7.16.0", + "@babel/template": "^7.16.0", + "@babel/traverse": "^7.16.0", + "@babel/types": "^7.16.0", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.1.2", + "semver": "^6.3.0", + "source-map": "^0.5.0" + } + }, + "convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha512-5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==", + "dev": true + } + } + }, + "@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "@types/underscore.string": { + "version": "0.0.40", + "resolved": "https://registry.npmjs.org/@types/underscore.string/-/underscore.string-0.0.40.tgz", + "integrity": "sha512-6J3Wp6PnuXhSxVSVaSoh9SKiormScoa2pPLKpZk5QsjKD3RKQZQj/mwBVfULd2MUl5gM/UlLSvr+cynd/7VWQA==", + "dev": true, + "requires": { + "@types/underscore": "*" + } + }, + "browserslist": { + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" + } + }, + "caniuse-lite": { + "version": "1.0.30001600", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz", + "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==", + "dev": true + }, + "complex.js": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.1.1.tgz", + "integrity": "sha512-8njCHOTtFFLtegk6zQo0kkVX1rngygb/KQI6z1qZxlFI3scluC+LVTCFbrkWjBv4vvLlbQ9t88IPMC6k95VTTg==", + "dev": true + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.4.715", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.715.tgz", + "integrity": "sha512-XzWNH4ZSa9BwVUQSDorPWAUQ5WGuYz7zJUNpNif40zFCiCl20t8zgylmreNmn26h5kiyw2lg7RfTmeMBsDklqg==", + "dev": true + }, + "fraction.js": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.4.tgz", + "integrity": "sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==", + "dev": true + }, + "mathjs": { + "version": "12.4.1", + "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-12.4.1.tgz", + "integrity": "sha512-welnW3khgwYjPYvECFHO+xkCxAx9IKIIPDDWPi8B5rKAvmgoEHnQX9slEmHKZTNaJiE+OS4qrJJcB4sfDn/4sw==", + "dev": true, + "requires": { + "@babel/runtime": "^7.24.0", + "complex.js": "^2.1.1", + "decimal.js": "^10.4.3", + "escape-latex": "^1.2.0", + "fraction.js": "4.3.4", + "javascript-natural-sort": "^0.7.1", + "seedrandom": "^3.0.5", + "tiny-emitter": "^2.1.0", + "typed-function": "^4.1.1" + } + }, + "node-releases": { + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + }, + "tiny-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", + "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==", + "dev": true + }, + "typed-function": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-4.1.1.tgz", + "integrity": "sha512-Pq1DVubcvibmm8bYcMowjVnnMwPVMeh0DIdA8ad8NZY2sJgapANJmiigSUwlt+EgXxpfIv8MWrQXTIzkfYZLYQ==", + "dev": true + }, + "update-browserslist-db": { + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", + "dev": true, + "requires": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + } + } + } + }, "@mui/base": { "version": "5.0.0-beta.15", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.15.tgz", @@ -19968,6 +20339,12 @@ "integrity": "sha512-34EQV6AAHQGhoc0tn/96a9Fsi6v2xdqe/dMUwljGRaFOzR3EgRmECvD0O8vi8X+/uQ50LGHfkNu/Eue5TPKZkQ==", "dev": true }, + "seedrandom": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz", + "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==", + "dev": true + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", diff --git a/package.json b/package.json index e631dc04..b1fa7101 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "moment": "^2.29.4" }, "peerDependencies": { - "@exabyte-io/made.js": "*", + "@mat3ra/made": "*", "@exabyte-io/cove.js": "*", "@exabyte-io/code.js": "*", "@exabyte-io/esse.js": "*", @@ -71,7 +71,7 @@ "devDependencies": { "@babel/preset-typescript": "^7.22.5", "@exabyte-io/eslint-config": "^2023.8.29-1", - "@exabyte-io/made.js": "^2024.2.21-0", + "@mat3ra/made": "^2024.3.23-1", "@exabyte-io/code.js": "^2024.2.20-0", "@exabyte-io/cove.js": "2024.2.21-1", "@mat3ra/esse": "^2024.2.19-0", diff --git a/src/components/ThreeDEditor.jsx b/src/components/ThreeDEditor.jsx index 54cc1993..62e39240 100644 --- a/src/components/ThreeDEditor.jsx +++ b/src/components/ThreeDEditor.jsx @@ -3,7 +3,7 @@ import { DarkMaterialUITheme } from "@exabyte-io/cove.js/dist/theme"; import ThemeProvider from "@exabyte-io/cove.js/dist/theme/provider"; -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import Article from "@mui/icons-material/Article"; import Autorenew from "@mui/icons-material/Autorenew"; import CheckIcon from "@mui/icons-material/Check"; diff --git a/src/components/ThreejsEditorModal.jsx b/src/components/ThreejsEditorModal.jsx index 48c9d9c0..b1f70d05 100644 --- a/src/components/ThreejsEditorModal.jsx +++ b/src/components/ThreejsEditorModal.jsx @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import PropTypes from "prop-types"; import React from "react"; import { ModalBody } from "react-bootstrap"; diff --git a/src/index.jsx b/src/index.jsx index 001d7b7b..896b1a82 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,7 +1,7 @@ import "./stylesheets/main.scss"; import "./MuiClassNameSetup"; -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import React from "react"; import ReactDOM from "react-dom"; diff --git a/src/mixins/bonds.js b/src/mixins/bonds.js index 90d3aa3b..1050a2c3 100644 --- a/src/mixins/bonds.js +++ b/src/mixins/bonds.js @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import { filterBondsDataByElementsAndOrder, getElementsBondsData, diff --git a/src/mixins/boundary.js b/src/mixins/boundary.js index e2a5a36a..44dbaee6 100644 --- a/src/mixins/boundary.js +++ b/src/mixins/boundary.js @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import * as THREE from "three"; import { BOUNDARY_CONDITIONS } from "../enums"; diff --git a/src/mixins/repetition.js b/src/mixins/repetition.js index bc929231..1117fe4f 100644 --- a/src/mixins/repetition.js +++ b/src/mixins/repetition.js @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import * as THREE from "three"; import { ATOM_GROUP_NAME } from "../enums"; diff --git a/src/utils.js b/src/utils.js index f0ad2400..ea70c1c2 100644 --- a/src/utils.js +++ b/src/utils.js @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import { sprintf } from "sprintf-js"; import * as THREE from "three"; diff --git a/tests/__tests__/components/ThreeDEditor.jsx b/tests/__tests__/components/ThreeDEditor.jsx index 53fccc1b..41c0a3bf 100644 --- a/tests/__tests__/components/ThreeDEditor.jsx +++ b/tests/__tests__/components/ThreeDEditor.jsx @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import Adapter from "@wojtekmaj/enzyme-adapter-react-17"; import Enzyme from "enzyme"; import React from "react"; diff --git a/tests/enums.js b/tests/enums.js index 97aa0a5a..e28511e4 100644 --- a/tests/enums.js +++ b/tests/enums.js @@ -1,4 +1,4 @@ -import { Made } from "@exabyte-io/made.js"; +import { Made } from "@mat3ra/made"; import fs from "fs"; import path from "path"; From c021751c92f17960bfbd8b2048b3640d61ea303f Mon Sep 17 00:00:00 2001 From: VsevolodX <79542055+VsevolodX@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:37:07 -0700 Subject: [PATCH 2/3] update: use new tsconfig --- package-lock.json | 6 ++++++ package.json | 1 + tsconfig.json | 24 +++--------------------- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ff9431e..f2ff91ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3224,6 +3224,12 @@ } } }, + "@mat3ra/tsconfig": { + "version": "2024.3.21-5", + "resolved": "https://registry.npmjs.org/@mat3ra/tsconfig/-/tsconfig-2024.3.21-5.tgz", + "integrity": "sha512-I1A4smllGb7ajlAygOvwuuu38LPm7BqZci3nVzwR61GKVcuPcTXNgohCCFu8OCpFcov9mKIjTtpzECBcYyvX1A==", + "dev": true + }, "@mui/base": { "version": "5.0.0-beta.15", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.15.tgz", diff --git a/package.json b/package.json index b1fa7101..c43fc6ca 100644 --- a/package.json +++ b/package.json @@ -71,6 +71,7 @@ "devDependencies": { "@babel/preset-typescript": "^7.22.5", "@exabyte-io/eslint-config": "^2023.8.29-1", + "@mat3ra/tsconfig": "^2024.3.21-5", "@mat3ra/made": "^2024.3.23-1", "@exabyte-io/code.js": "^2024.2.20-0", "@exabyte-io/cove.js": "2024.2.21-1", diff --git a/tsconfig.json b/tsconfig.json index a42b5ef9..7be764e9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,29 +1,11 @@ { + "extends": "@mat3ra/tsconfig/tsconfig.json", "compilerOptions": { - "target": "es2018", - "jsx": "react-jsx", - "module": "esNext", - "moduleResolution": "node", - "declaration": true, - "outDir": "./dist", - "noEmitOnError": false, - "isolatedModules": true, - "esModuleInterop": true, - "forceConsistentCasingInFileNames": true, - "strict": true, - "skipLibCheck": true, - "types": [], "rootDir": "./src", "baseUrl": "./src", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], - "allowJs": true, "allowSyntheticDefaultImports": true, - "noFallthroughCasesInSwitch": true, - "resolveJsonModule": true, + "module": "esnext", + "jsx": "react-jsx" }, "include": [ "./src" From 1e1b51f8b8438dd466f3bce7793eb5ca029517b1 Mon Sep 17 00:00:00 2001 From: VsevolodX <79542055+VsevolodX@users.noreply.github.com> Date: Fri, 22 Mar 2024 18:39:23 -0700 Subject: [PATCH 3/3] update: fix a test --- tests/__tests__/components/ThreeDEditor.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/__tests__/components/ThreeDEditor.jsx b/tests/__tests__/components/ThreeDEditor.jsx index 41c0a3bf..0eecce19 100644 --- a/tests/__tests__/components/ThreeDEditor.jsx +++ b/tests/__tests__/components/ThreeDEditor.jsx @@ -1,6 +1,7 @@ import { Made } from "@mat3ra/made"; import Adapter from "@wojtekmaj/enzyme-adapter-react-17"; import Enzyme from "enzyme"; +import expect from "expect"; import React from "react"; import { ThreeDEditor } from "../../../src/components/ThreeDEditor";