From 5b9fb085ea6e0cb1612c8d7c06d5e80baa8c4c79 Mon Sep 17 00:00:00 2001 From: Rolf Heij Date: Mon, 2 Dec 2024 17:30:40 +0100 Subject: [PATCH] Update links to core --- .../src/platform-get-resources/package.json | 8 ++++---- .../src/platform-get-resources/tsconfig.json | 6 +++--- .../webpack/webpack.config.base.ts | 20 ++++--------------- package-lock.json | 12 +++++------ 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/extensions/src/platform-get-resources/package.json b/extensions/src/platform-get-resources/package.json index 81511f6bef..67b5977a76 100644 --- a/extensions/src/platform-get-resources/package.json +++ b/extensions/src/platform-get-resources/package.json @@ -18,7 +18,7 @@ "zip": "zip-build dist release --template '%NAME%_%VERSION%.%EXT%' --override", "package": "npm run build:production && npm run zip", "package:debug": "cross-env DEBUG_PROD=true npm run package", - "start:core": "cd ../paranext-core && npm run start", + "start:core": "cd ../../.. && npm run start", "start": "cross-env MAIN_ARGS=\"--extensions $INIT_CWD/dist\" concurrently \"npm:watch\" \"npm:start:core\"", "start:production": "cross-env MAIN_ARGS=\"--extensions $INIT_CWD/dist\" concurrently \"npm:watch:production\" \"npm:start:core\"", "lint": "npm run lint:scripts && npm run lint:styles", @@ -34,7 +34,7 @@ }, "dependencies": { "@sillsdev/scripture": "^2.0.2", - "platform-bible-utils": "file:../paranext-core/lib/platform-bible-utils" + "platform-bible-utils": "file:../../../lib/platform-bible-utils" }, "devDependencies": { "@swc/core": "^1.7.35", @@ -66,8 +66,8 @@ "eslint-plugin-react-hooks": "^4.6.2", "glob": "^10.4.5", "lucide-react": "^0.452.0", - "papi-dts": "file:../paranext-core/lib/papi-dts", - "platform-bible-react": "file:../paranext-core/lib/platform-bible-react", + "papi-dts": "file:../../../lib/papi-dts", + "platform-bible-react": "file:../../../lib/platform-bible-react", "postcss": "^8.4.47", "postcss-loader": "^8.1.1", "prettier": "^3.3.3", diff --git a/extensions/src/platform-get-resources/tsconfig.json b/extensions/src/platform-get-resources/tsconfig.json index e34d04d731..c570d4c2d6 100644 --- a/extensions/src/platform-get-resources/tsconfig.json +++ b/extensions/src/platform-get-resources/tsconfig.json @@ -25,9 +25,9 @@ // Include default type declarations "node_modules/@types", // Include papi-dts type declarations (for papi.d.ts) - "../paranext-core/lib", + "../../../lib", // Include core extensions' type declarations - "../paranext-core/extensions/src", + "../../../extensions/src", // Include this extension's type declarations. It's in this location so there aren't any // unexpected files there for typeRoots to include "src/types", @@ -48,7 +48,7 @@ // Include cached extension type declarations in case this extension needs to depend on them // These are last, so any modules in the above typeRoots take precedence. - "../paranext-core/dev-appdata/cache/extension-types" + "../../../dev-appdata/cache/extension-types" ], // Papi exposes decorators for use in classes "experimentalDecorators": true, diff --git a/extensions/src/platform-get-resources/webpack/webpack.config.base.ts b/extensions/src/platform-get-resources/webpack/webpack.config.base.ts index f45ebb1dce..fc52d7d847 100644 --- a/extensions/src/platform-get-resources/webpack/webpack.config.base.ts +++ b/extensions/src/platform-get-resources/webpack/webpack.config.base.ts @@ -139,22 +139,10 @@ const configBase: webpack.Configuration = { // https://webpack.js.org/configuration/resolve/#resolvealias // TODO: Remove this when `platform-bible-react` is published to npm alias: { - '@emotion/react': path.resolve( - __dirname, - '..', - '../paranext-core/node_modules/@emotion/react', - ), - '@emotion/styled': path.resolve( - __dirname, - '..', - '../paranext-core/node_modules/@emotion/styled', - ), - '@mui/material': path.resolve(__dirname, '..', '../paranext-core/node_modules/@mui/material'), - 'react-data-grid': path.resolve( - __dirname, - '..', - '../paranext-core/node_modules/react-data-grid', - ), + '@emotion/react': path.resolve(__dirname, '..', '../../../node_modules/@emotion/react'), + '@emotion/styled': path.resolve(__dirname, '..', '../../../node_modules/@emotion/styled'), + '@mui/material': path.resolve(__dirname, '..', '../../../node_modules/@mui/material'), + 'react-data-grid': path.resolve(__dirname, '..', '../../../node_modules/react-data-grid'), }, }, }; diff --git a/package-lock.json b/package-lock.json index a2ae7ca10b..71f1530588 100644 --- a/package-lock.json +++ b/package-lock.json @@ -566,7 +566,7 @@ "license": "MIT", "dependencies": { "@sillsdev/scripture": "^2.0.2", - "platform-bible-utils": "file:../paranext-core/lib/platform-bible-utils" + "platform-bible-utils": "file:../../../lib/platform-bible-utils" }, "devDependencies": { "@swc/core": "^1.7.35", @@ -598,8 +598,8 @@ "eslint-plugin-react-hooks": "^4.6.2", "glob": "^10.4.5", "lucide-react": "^0.452.0", - "papi-dts": "file:../paranext-core/lib/papi-dts", - "platform-bible-react": "file:../paranext-core/lib/platform-bible-react", + "papi-dts": "file:../../../lib/papi-dts", + "platform-bible-react": "file:../../../lib/platform-bible-react", "postcss": "^8.4.47", "postcss-loader": "^8.1.1", "prettier": "^3.3.3", @@ -49931,9 +49931,9 @@ "eslint-plugin-react-hooks": "^4.6.2", "glob": "^10.4.5", "lucide-react": "^0.452.0", - "papi-dts": "file:../paranext-core/lib/papi-dts", - "platform-bible-react": "file:../paranext-core/lib/platform-bible-react", - "platform-bible-utils": "file:../paranext-core/lib/platform-bible-utils", + "papi-dts": "file:../../../lib/papi-dts", + "platform-bible-react": "file:../../../lib/platform-bible-react", + "platform-bible-utils": "file:../../../lib/platform-bible-utils", "postcss": "^8.4.47", "postcss-loader": "^8.1.1", "prettier": "^3.3.3",