Skip to content

Commit 08aa9d5

Browse files
author
Sterling Michel
committed
Merge branch 'main' of github.com:NEONScience/portal-core-components into NSE-11100-Update-the-BOLD-data-links-exposed-in-NEON-API-for-each-barcode-data-product
2 parents d86486a + a947b73 commit 08aa9d5

File tree

303 files changed

+43876
-31041
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+43876
-31041
lines changed

.dockerignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.git
2+
node_modules
3+
build
4+
test-coverage
5+
reference
6+
7+
.DS_Store

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
PORT=3010
2+
REACT_APP_NAME=$npm_package_name
23
REACT_APP_VERSION=$npm_package_version
34

45
#-------------------------------------------------------------------------------

.env.production

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
REACT_APP_NAME=$npm_package_name
12
REACT_APP_VERSION=$npm_package_version
23

34
#-------------------------------------------------------------------------------

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
# production
1010
/build
1111

12+
.next
13+
1214
# misc
1315
.DS_Store
1416
.env.local
@@ -20,3 +22,5 @@ npm-debug.log*
2022
yarn-debug.log*
2123
yarn-error.log*
2224
.vscode
25+
.Rproj.user
26+
*.Rproj

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ https://data.neonscience.org/core-components
99

1010
## Using Components
1111

12-
You don't need a copy of this project to use it!
13-
(You _will_ need your git credentials to be up to date from the "git" command line, but they should be anyway.)
14-
1512
In the target project directory, preferentially install this package with a versioned release tag:
1613

1714
npm install github:NEONScience/portal-core-components#tag

build.Dockerfile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM node:22.5-alpine
2+
3+
EXPOSE 3000
4+
EXPOSE 3010
5+
6+
WORKDIR /app
7+
COPY . ./build-temp
8+
9+
WORKDIR /app/build-temp
10+
RUN npm ci
11+
12+
WORKDIR /app
13+
RUN mv ./build-temp/node_modules ./
14+
RUN rm -rf ./build-temp

index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

jest.config.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ module.exports = {
77
moduleNameMapper: {
88
'@stomp/stompjs': '<rootDir>/src/__mocks__/fileMock.js',
99
'@stomp/rx-stomp': '<rootDir>/src/__mocks__/fileMock.js',
10-
'(pdfjs-dist/legacy/build/pdf.worker)': '<rootDir>/src/__mocks__/constructorMock.js',
10+
'(pdfjs-dist/build/pdf.worker.mjs)': '<rootDir>/src/__mocks__/constructorMock.js',
1111
'\\.(css|less)$': '<rootDir>/src/__mocks__/styleMock.js',
1212
'\\.(svg)$': '<rootDir>/src/__mocks__/svgMock.js',
13+
'react-markdown': [
14+
'<rootDir>/node_modules/react-markdown/react-markdown.min.js',
15+
'<rootDir>/../node_modules/react-markdown/react-markdown.min.js',
16+
],
1317
},
1418
transform: {
1519
'\\.(js|jsx|ts|tsx)$': 'babel-jest',
@@ -18,8 +22,9 @@ module.exports = {
1822
// The dateformat module is in ES6 format and needs to be transformed.
1923
// Set Jest transform to ignore all node modules that aren't dateformat.
2024
transformIgnorePatterns: [
21-
"node_modules/(?!dateformat|d3-[a-z]+)",
25+
"node_modules/(?!(dateformat|remark-gfm|micromark-.+|decode-named-character-reference|character-entities|mdast-.*|escape-string-regexp|unist-util-.*|markdown-.*|ccount|d3-[a-z]+)/)",
2226
],
27+
globalSetup: '<rootDir>/scripts/jest-global-setup.js',
2328
setupFiles: [
2429
'jest-canvas-mock',
2530
],

0 commit comments

Comments
 (0)