Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

intl: fix type error in vite.config.mts due to duplicate rollup packages

Abdullah Attae2d33381ccc4
diff --git a/packages/intl/package-lock.json b/packages/intl/package-lock.json
index a4a9775b8..faccf817c 100644
--- a/packages/intl/package-lock.json
+++ b/packages/intl/package-lock.json
@@ -17,6 +17,7 @@
"babel-plugin-macros": "^3.1.0",
"nodemon": "^3.1.7",
"react": "18.2.0",
+ "rollup": "^4.24.4",
"typescript": "5.5.3",
"vite": "^5.4.8",
"vite-plugin-dts": "^4.2.3",
@@ -4685,21 +4686,40 @@
}
},
"node_modules/rollup": {
- "version": "3.29.5",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
- "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
+ "version": "4.24.4",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz",
+ "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==",
"dev": true,
"license": "MIT",
- "optional": true,
- "peer": true,
+ "dependencies": {
+ "@types/estree": "1.0.6"
+ },
"bin": {
"rollup": "dist/bin/rollup"
},
"engines": {
- "node": ">=14.18.0",
+ "node": ">=18.0.0",
"npm": ">=8.0.0"
},
"optionalDependencies": {
+ "@rollup/rollup-android-arm-eabi": "4.24.4",
+ "@rollup/rollup-android-arm64": "4.24.4",
+ "@rollup/rollup-darwin-arm64": "4.24.4",
+ "@rollup/rollup-darwin-x64": "4.24.4",
+ "@rollup/rollup-freebsd-arm64": "4.24.4",
+ "@rollup/rollup-freebsd-x64": "4.24.4",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.24.4",
+ "@rollup/rollup-linux-arm-musleabihf": "4.24.4",
+ "@rollup/rollup-linux-arm64-gnu": "4.24.4",
+ "@rollup/rollup-linux-arm64-musl": "4.24.4",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4",
+ "@rollup/rollup-linux-riscv64-gnu": "4.24.4",
+ "@rollup/rollup-linux-s390x-gnu": "4.24.4",
+ "@rollup/rollup-linux-x64-gnu": "4.24.4",
+ "@rollup/rollup-linux-x64-musl": "4.24.4",
+ "@rollup/rollup-win32-arm64-msvc": "4.24.4",
+ "@rollup/rollup-win32-ia32-msvc": "4.24.4",
+ "@rollup/rollup-win32-x64-msvc": "4.24.4",
"fsevents": "~2.3.2"
}
},
@@ -5713,44 +5733,6 @@
"@esbuild/win32-x64": "0.21.5"
}
},
- "node_modules/vite/node_modules/rollup": {
- "version": "4.24.4",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.4.tgz",
- "integrity": "sha512-vGorVWIsWfX3xbcyAS+I047kFKapHYivmkaT63Smj77XwvLSJos6M1xGqZnBPFQFBRZDOcG1QnYEIxAvTr/HjA==",
- "dev": true,
- "license": "MIT",
- "dependencies": {
- "@types/estree": "1.0.6"
- },
- "bin": {
- "rollup": "dist/bin/rollup"
- },
- "engines": {
- "node": ">=18.0.0",
- "npm": ">=8.0.0"
- },
- "optionalDependencies": {
- "@rollup/rollup-android-arm-eabi": "4.24.4",
- "@rollup/rollup-android-arm64": "4.24.4",
- "@rollup/rollup-darwin-arm64": "4.24.4",
- "@rollup/rollup-darwin-x64": "4.24.4",
- "@rollup/rollup-freebsd-arm64": "4.24.4",
- "@rollup/rollup-freebsd-x64": "4.24.4",
- "@rollup/rollup-linux-arm-gnueabihf": "4.24.4",
- "@rollup/rollup-linux-arm-musleabihf": "4.24.4",
- "@rollup/rollup-linux-arm64-gnu": "4.24.4",
- "@rollup/rollup-linux-arm64-musl": "4.24.4",
- "@rollup/rollup-linux-powerpc64le-gnu": "4.24.4",
- "@rollup/rollup-linux-riscv64-gnu": "4.24.4",
- "@rollup/rollup-linux-s390x-gnu": "4.24.4",
- "@rollup/rollup-linux-x64-gnu": "4.24.4",
- "@rollup/rollup-linux-x64-musl": "4.24.4",
- "@rollup/rollup-win32-arm64-msvc": "4.24.4",
- "@rollup/rollup-win32-ia32-msvc": "4.24.4",
- "@rollup/rollup-win32-x64-msvc": "4.24.4",
- "fsevents": "~2.3.2"
- }
- },
"node_modules/vscode-uri": {
"version": "3.0.8",
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.8.tgz",
diff --git a/packages/intl/package.json b/packages/intl/package.json
index 9b214232c..f144a89d9 100644
--- a/packages/intl/package.json
+++ b/packages/intl/package.json
@@ -38,6 +38,7 @@
"babel-plugin-macros": "^3.1.0",
"nodemon": "^3.1.7",
"react": "18.2.0",
+ "rollup": "^4.24.4",
"typescript": "5.5.3",
"vite": "^5.4.8",
"vite-plugin-dts": "^4.2.3",
diff --git a/packages/intl/vite.config.mts b/packages/intl/vite.config.mts
index b8ae8594a..a6c457d07 100644
--- a/packages/intl/vite.config.mts
+++ b/packages/intl/vite.config.mts
@@ -17,10 +17,14 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-import { resolve } from "path";
+import path, { resolve } from "path";
import { defineConfig } from "vite";
import swc from "vite-plugin-swc-transform";
import dts from "vite-plugin-dts";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
export default defineConfig({
plugins: [
@@ -32,7 +36,7 @@ export default defineConfig({
syntax: "typescript",
tsx: true
},
- baseUrl: "./",
+ baseUrl: __dirname,
paths: {
"$src/*": ["src/*"]
},