Skip to content
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
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH

COPY package.json ./
COPY package-lock.json ./
RUN npm install --silent
RUN npm install react-scripts@latest -g --silent
RUN npm i --silent
RUN npm i react-scripts@latest -g --silent

COPY . ./
8 changes: 4 additions & 4 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# build environment
FROM node:22-alpine3.18 as build
FROM node:22-alpine as build
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH
COPY package.json ./
COPY package-lock.json ./
RUN export NODE_OPTIONS=--max-old-space-size=8192
RUN npm ci --silent
RUN npm install react-scripts@latest -g --silent
RUN npm i --silent

RUN npm i react-scripts@latest -g --silent
COPY . ./
RUN npm run build

Expand Down
5 changes: 2 additions & 3 deletions Dockerfile.prod
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ FROM node:22-alpine3.18 as build
WORKDIR /app
ENV PATH /app/node_modules/.bin:$PATH
COPY package.json ./
COPY package-lock.json ./
RUN export NODE_OPTIONS=--max-old-space-size=8192
RUN npm ci --silent
RUN npm install react-scripts@latest -g --silent
RUN npm i --silent
RUN npm i react-scripts@latest -g --silent
COPY . ./
RUN echo "export default { version: '$RELEASE_VERSION' };" > src/versionInfo.ts
RUN npm run build -- --outDir=build
Expand Down
7 changes: 7 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ export default [
...ts,
...unicorn,
...react,
{
files: ['**/*.{ts,tsx,cts,mts}'],
rules: {
'@typescript-eslint/consistent-type-imports': 'error',
'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
},
},
{
rules: {
'import/default': 'off',
Expand Down
333 changes: 324 additions & 9 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.0",
"private": false,
"license": "MIT",
"main": "lib/NMRiumWrapper.js",
"module": "lib/NMRiumWrapper.js",
"type": "module",
"exports": "./lib/NMRiumWrapper.js",
"files": [
"lib"
],
Expand All @@ -20,8 +20,7 @@
"nmr-load-save": "^3.1.2",
"nmr-processing": "^16.0.1",
"nmrium": "^0.60.1-pre.1741337420",
"react-science": "^14.0.0",
"vite-plugin-pwa": "^0.21.1"
"react-science": "^14.0.0"
},
"scripts": {
"start": "vite --host localhost --port 3000 --open",
Expand All @@ -31,8 +30,8 @@
"test": "jest --coverage",
"eslint": "eslint . --cache",
"eslint-fix": "npm run eslint -- --fix",
"compile": "tsc --project tsconfig.esm.json",
"check-types": "tsc --project tsconfig.esm.json",
"compile": "tsc --project tsconfig.build.json",
"check-types": "tsc --noEmit",
"prettier": "prettier --check src",
"prettier-write": "prettier --write src",
"test-e2e": "playwright test --project chromium",
Expand Down Expand Up @@ -61,6 +60,7 @@
"react-router-dom": "^7.3.0",
"serve": "^14.2.4",
"typescript": "^5.8.2",
"vite": "^6.2.1"
"vite": "^6.2.1",
"vite-plugin-pwa": "^0.21.1"
}
}
}
10 changes: 5 additions & 5 deletions src/NMRiumWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import type { CSSProperties } from 'react';
import { useEffect, useState, useCallback, useRef } from 'react';
import { RootLayout } from 'react-science/ui';

import events from './events';
import { useLoadSpectra } from './hooks/useLoadSpectra';
import { usePreferences } from './hooks/usePreferences';
import { useWhiteList } from './hooks/useWhiteList';
import AboutUsModal from './modal/AboutUsModal';
import events from './events/event.js';
import { useLoadSpectra } from './hooks/useLoadSpectra.js';
import { usePreferences } from './hooks/usePreferences.js';
import { useWhiteList } from './hooks/useWhiteList.js';
import AboutUsModal from './modal/AboutUsModal.js';

const styles: Record<'container' | 'loadingContainer', CSSProperties> = {
container: {
Expand Down
10 changes: 5 additions & 5 deletions src/demo/NMRiumWrapperDemo.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import styled from '@emotion/styled';
import type { NMRiumData } from 'nmrium';
import { Button } from 'react-science/ui';

import NMRiumWrapper from '../NMRiumWrapper';
import events from '../events';
import { loadFilesFromURLs } from '../utilities/loadFilesFromURLs';
import NMRiumWrapper from '../NMRiumWrapper.js';
import events from '../events/event.js';
import { loadFilesFromURLs } from '../utilities/loadFilesFromURLs.js';

import jsonData from './data/test.json';
import jsonData from './data/test.json' with { type: 'json' };

const Container = styled.div`
display: flex;
Expand All @@ -29,7 +29,7 @@ export default function NMRiumWrapperDemo() {
style={{ marginRight: '10px' }}
onClick={() => {
events.trigger('load', {
data: jsonData as NMRiumData,
data: jsonData as unknown as NMRiumData,
type: 'nmrium',
});
}}
Expand Down
2 changes: 1 addition & 1 deletion src/events/event.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { EventType, EventData } from './types';
import type { EventType, EventData } from './types.js';

const namespace = 'nmr-wrapper';

Expand Down
1 change: 0 additions & 1 deletion src/events/index.ts

This file was deleted.

6 changes: 3 additions & 3 deletions src/hooks/useLoadSpectra.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import type { NmriumState, ParsingOptions, ViewState } from 'nmr-load-save';
import { read, readFromWebSource, CURRENT_EXPORT_VERSION } from 'nmr-load-save';
import { useCallback, useMemo, useState } from 'react';

import events from '../events';
import { getFileNameFromURL } from '../utilities/getFileNameFromURL';
import { isArrayOfString } from '../utilities/isArrayOfString';
import events from '../events/event.js';
import { getFileNameFromURL } from '../utilities/getFileNameFromURL.js';
import { isArrayOfString } from '../utilities/isArrayOfString.js';

type DeepPartial<T> = {
[K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/usePreferences.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type { CustomWorkspaces, WorkspacePreferences } from 'nmr-load-save';
import type { NMRiumWorkspace } from 'nmrium';
import { useLayoutEffect, useState } from 'react';

import { getNmrXivWorkspace } from '../workspaces/nmrxiv';
import { getNmrXivWorkspace } from '../workspaces/nmrxiv.js';

interface Preferences {
preferences: WorkspacePreferences | undefined;
Expand Down
4 changes: 2 additions & 2 deletions src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { createRoot } from 'react-dom/client';
import { HashRouter as Router, Route, Routes } from 'react-router-dom';
import { registerSW } from 'virtual:pwa-register';

import NMRiumWrapper from './NMRiumWrapper';
import NMRiumWrapperDemo from './demo/NMRiumWrapperDemo';
import NMRiumWrapper from './NMRiumWrapper.js';
import NMRiumWrapperDemo from './demo/NMRiumWrapperDemo.js';

const rootContainer = document.querySelector('#root');

Expand Down
2 changes: 1 addition & 1 deletion src/modal/AboutUsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Dialog, DialogBody } from '@blueprintjs/core';
import styled from '@emotion/styled';
import { useOnOff } from 'react-science/ui';

import versionInfo from '../versionInfo';
import versionInfo from '../versionInfo.js';

const Title = styled.span`
font-weight: bold;
Expand Down
2 changes: 1 addition & 1 deletion src/utilities/loadFilesFromURLs.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getFileNameFromURL } from './getFileNameFromURL';
import { getFileNameFromURL } from './getFileNameFromURL.js';

export function loadFilesFromURLs(urls: string[]): Promise<File[]> {
const fetches = urls.map((url) =>
Expand Down
2 changes: 1 addition & 1 deletion test-e2e/core.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { test, expect } from '@playwright/test';

import NmriumWrapperPage from './NmriumWrapperPage';
import NmriumWrapperPage from './NmriumWrapperPage.js';

async function testLoadStructure(nmrium: NmriumWrapperPage) {
// Open the "Chemical structures" panel.
Expand Down
File renamed without changes.
27 changes: 13 additions & 14 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,34 @@
"compilerOptions": {
"target": "ES2020",
"lib": [
"dom",
"dom.iterable",
"esnext"
"DOM",
"ES2022"
],
"types": [
"vite/client"
"vite/client",
"vite-plugin-pwa/client.d.ts"
],
"outDir": "lib",
"allowJs": false,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"noImplicitAny": false,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"moduleResolution": "Bundler",
"module": "ES2022",
"module": "NodeNext",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx"
"jsx": "react-jsx",
"verbatimModuleSyntax": true,
"sourceMap": true,
"declaration": true,
"declarationMap": true,
"skipLibCheck": true,
},
"include": [
"src",
"test-e2e",
"playwright.config.ts",
"vite.config.ts"
"vite.config.ts",
],
"exclude": [
"node_modules"
]
}
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import react from '@vitejs/plugin-react-swc';
import { defineConfig } from 'vite';
import { VitePWA, Options } from 'vite-plugin-pwa';
import { VitePWA, type Options } from 'vite-plugin-pwa';

const pwaSettings: Partial<Options> = {
// cache all the imports
Expand Down
Loading