Skip to content

Commit 1dfb834

Browse files
craigrbarnescraigrbarnes
andauthored
PXP-11264: update lerna (#137)
* update lerna * update version number * remove publishConfig * update package-lock.json * update Docker with correct tools name * update package-lock * more updates * fix graphiq path * fix paths again --------- Co-authored-by: craigrbarnes <craigrbarnes@uchicago.edu>
1 parent 9f3d8d0 commit 1dfb834

File tree

9 files changed

+10997
-5701
lines changed

9 files changed

+10997
-5701
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
4040
&& npm install -g npm
4141

4242
RUN addgroup --system --gid 1001 nextjs && adduser --system --uid 1001 nextjs
43-
RUN npm install --location=global lerna@6.6.1
43+
RUN npm install --location=global lerna@6.6.2
4444
COPY ./package.json ./package-lock.json lerna.json ./
4545
COPY ./packages/core/package.json ./packages/core/
4646
COPY ./packages/tools/package.json ./packages/tools/
@@ -53,6 +53,7 @@ RUN npm install \
5353
"@napi-rs/magic-string"
5454
RUN lerna run --scope @gen3/core build
5555
RUN lerna run --scope @gen3/frontend build
56-
RUN lerna run --scope @gen3/datacommonsapp build
56+
RUN lerna run --scope @gen3/toolsff build
57+
RUN lerna run --scope @gen3/samplecommons build
5758
ENV PORT=80
5859
CMD ["npm", "run", "start"]

package-lock.json

Lines changed: 10976 additions & 5675 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gen3-frontend-framework",
3-
"version": "0.1.0",
4-
"description": "The Gen3 Gen3 Frontend Framework mono repo for development",
3+
"version": "0.6.0",
4+
"description": "The Gen3 Frontend Framework mono repo for development",
55
"private": true,
66
"workspaces": [
77
"packages/*"
@@ -51,7 +51,7 @@
5151
"eslint-plugin-react-hooks": "^4.6.0",
5252
"jest-canvas-mock": "^2.4.0",
5353
"jest-environment-jsdom": "^29.4.3",
54-
"lerna": "^6.1.0",
54+
"lerna": "^6.6.2",
5555
"prettier": "^2.7.1",
5656
"rollup-plugin-swc3": "^0.10.2",
5757
"rollup-swc-preserve-directives": "^0.5.0",

packages/core/.npmignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
src/
2+
tsconfig.*
3+
setupTests.js

packages/core/package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@gen3/core",
3-
"version": "0.1.0",
3+
"version": "0.20.2",
44
"author": "CTDS",
55
"description": "Core module for gen3 frontend. Provides an interface for interacting with the gen3 API and a redux store for managing state.",
66
"license": "Apache-2.0",
7-
"main": "dist/index.js",
7+
"main": "dist/index.esm.js",
88
"module": "dist/index.esm.js",
99
"unpkg": "dist/index.umd.js",
1010
"types": "dist/index.d.ts",
@@ -55,8 +55,5 @@
5555
},
5656
"files": [
5757
"dist"
58-
],
59-
"publishConfig": {
60-
"registry": "https://localhost:4873/"
61-
}
58+
]
6259
}

packages/frontend/package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"author": "",
77
"license": "Apache-2.0",
88
"sideEffects": false,
9-
"main": "dist/index.js",
9+
"main": "dist/index.esm.js",
1010
"module": "dist/index.esm.js",
1111
"unpkg": "dist/index.umd.js",
1212
"types": "dist/index.d.ts",
@@ -43,7 +43,7 @@
4343
"@fontsource/montserrat": "^4.5.12",
4444
"@fontsource/source-sans-pro": "^4.5.11",
4545
"@gen3/core": "file:../core",
46-
"@graphiql/plugin-explorer": "^1.0.2",
46+
"@graphiql/plugin-explorer": "^1.0.3",
4747
"@graphiql/react": "^0.20.2",
4848
"@iconify/react": "^4.0.1",
4949
"@mantine/core": "^6.0.4",
@@ -91,7 +91,7 @@
9191
"react-table": "^7.8.0",
9292
"recharts": "^2.4.3",
9393
"rollup-plugin-sourcemaps": "^0.6.3",
94-
"sharp": "^0.30.7",
94+
"sharp": "^0.33.2",
9595
"stable-hash": "^0.0.3",
9696
"swr": "^2.1.5",
9797
"tailwind-styled-components": "^2.2.0",
@@ -150,8 +150,5 @@
150150
},
151151
"files": [
152152
"dist"
153-
],
154-
"publishConfig": {
155-
"registry": "https://localhost:4873/"
156-
}
153+
]
157154
}

packages/sampleCommons/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"name": "@gen3/datacommonsapp",
3-
"version": "0.1.0",
2+
"name": "@gen3/samplecommons",
3+
"version": "0.20.2",
44
"private": true,
55
"scripts": {
66
"lint": "next lint",

packages/sampleCommons/src/pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import icons from '../../config/icons/gen3.json';
77
import '../styles/globals.css';
88
import 'react-responsive-carousel/lib/styles/carousel.min.css';
99
import 'graphiql/graphiql.css';
10-
import '../../../frontend/node_modules/@graphiql/plugin-explorer/dist/style.css';
10+
import '@graphiql/plugin-explorer/dist/style.css';
1111
import '@graphiql/react/dist/style.css';
1212
import { setDRSHostnames } from '@gen3/core';
1313

packages/tools/package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@gen3/toolsff",
3-
"version": "0.1.1",
3+
"version": "0.20.2",
44
"description": "tools for processing portal content",
55
"main": "index.js",
66
"type": "module",
@@ -36,8 +36,5 @@
3636
},
3737
"files": [
3838
"dist"
39-
],
40-
"publishConfig": {
41-
"registry": "https://localhost:4873/"
42-
}
39+
]
4340
}

0 commit comments

Comments
 (0)