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

Hotfix/update made #150

Merged
merged 3 commits into from
Mar 23, 2024
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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

Expand Down
507 changes: 445 additions & 62 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": "*",
Expand All @@ -71,7 +71,8 @@
"devDependencies": {
"@babel/preset-typescript": "^7.22.5",
"@exabyte-io/eslint-config": "^2023.8.29-1",
"@exabyte-io/made.js": "^2024.2.21-0",
"@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",
"@mat3ra/esse": "^2024.2.19-0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/ThreeDEditor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/components/ThreejsEditorModal.jsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/index.jsx
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
2 changes: 1 addition & 1 deletion src/mixins/bonds.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Made } from "@exabyte-io/made.js";
import { Made } from "@mat3ra/made";

Check warning on line 1 in src/mixins/bonds.js

View workflow job for this annotation

GitHub Actions / run-tests

Run autofix to sort these imports!
import {
filterBondsDataByElementsAndOrder,
getElementsBondsData,
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/boundary.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/repetition.js
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/utils.js
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
3 changes: 2 additions & 1 deletion tests/__tests__/components/ThreeDEditor.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
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 expect from "expect";
import React from "react";

import { ThreeDEditor } from "../../../src/components/ThreeDEditor";
Expand Down
2 changes: 1 addition & 1 deletion tests/enums.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Made } from "@exabyte-io/made.js";
import { Made } from "@mat3ra/made";
import fs from "fs";
import path from "path";

Expand Down
24 changes: 3 additions & 21 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
Loading