From 32979fc46e093c33dd8df679ca77e4b6b99dc6bb Mon Sep 17 00:00:00 2001 From: Baozier Date: Sun, 9 Feb 2025 09:28:42 -0500 Subject: [PATCH] Linking to type from ./shared folder in react-sdk dist (#224) --- admin-panel/package-lock.json | 20 +++++++-------- admin-panel/package.json | 2 +- package-lock.json | 47 ++++++++++++++--------------------- react-sdk/package.json | 9 ++++--- react-sdk/rollup.config.mjs | 2 +- react-sdk/tsconfig.json | 3 +++ 6 files changed, 39 insertions(+), 44 deletions(-) diff --git a/admin-panel/package-lock.json b/admin-panel/package-lock.json index 289c4e20..beed45a2 100644 --- a/admin-panel/package-lock.json +++ b/admin-panel/package-lock.json @@ -7,7 +7,7 @@ "name": "admin-panel", "dependencies": { "@heroicons/react": "^2.1.4", - "@melody-auth/react": "^0.0.10", + "@melody-auth/react": "^0.0.11", "@preact/signals-react": "^2.1.0", "@reduxjs/toolkit": "^2.2.7", "class-validator": "^0.14.1", @@ -2159,9 +2159,9 @@ "license": "MIT" }, "node_modules/@melody-auth/react": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@melody-auth/react/-/react-0.0.10.tgz", - "integrity": "sha512-kr23/OCkN7kG9FCBKNep12bRlcYlETkA/Y3PaoWnZmmdm+oxoI632Bn/QxyMBnxIuChgSiu11V3T8Fr7tmdmbQ==", + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/@melody-auth/react/-/react-0.0.11.tgz", + "integrity": "sha512-9BHnhohgi20LTdPxQtz0J444qgKT6wuDEYSodWIsEHM7Pz641A0qEUPTIEp+nMgWg2K9IXZL6j6wYKfVgwNKDw==", "license": "MIT", "peerDependencies": { "react": "^16.11.0 || ^17 || ^18" @@ -7762,9 +7762,9 @@ "license": "MIT" }, "node_modules/undici": { - "version": "5.28.4", - "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz", - "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==", + "version": "5.28.5", + "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.5.tgz", + "integrity": "sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==", "dev": true, "license": "MIT", "dependencies": { @@ -7861,9 +7861,9 @@ } }, "node_modules/vite": { - "version": "5.4.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz", - "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/admin-panel/package.json b/admin-panel/package.json index eff08f7a..db143187 100644 --- a/admin-panel/package.json +++ b/admin-panel/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@heroicons/react": "^2.1.4", - "@melody-auth/react": "^0.0.10", + "@melody-auth/react": "^0.0.11", "@preact/signals-react": "^2.1.0", "@reduxjs/toolkit": "^2.2.7", "class-validator": "^0.14.1", diff --git a/package-lock.json b/package-lock.json index d6188ca2..264807f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "melody-auth", - "version": "1.1.5", + "version": "1.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "melody-auth", - "version": "1.1.5", + "version": "1.1.6", "license": "MIT", "workspaces": [ "shared", @@ -1712,13 +1712,11 @@ } }, "node_modules/@rollup/plugin-alias": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz", - "integrity": "sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-5.1.1.tgz", + "integrity": "sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==", "dev": true, - "dependencies": { - "slash": "^4.0.0" - }, + "license": "MIT", "engines": { "node": ">=14.0.0" }, @@ -1731,18 +1729,6 @@ } } }, - "node_modules/@rollup/plugin-alias/node_modules/slash": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", - "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==", - "dev": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/@rollup/plugin-commonjs": { "version": "26.0.1", "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-26.0.1.tgz", @@ -12232,15 +12218,15 @@ } }, "node_modules/vite": { - "version": "5.3.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.6.tgz", - "integrity": "sha512-es78AlrylO8mTVBygC0gTC0FENv0C6T496vvd33ydbjF/mIi9q3XQ9A3NWo5qLGFKywvz10J26813OkLvcQleA==", + "version": "5.4.14", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.14.tgz", + "integrity": "sha512-EK5cY7Q1D8JNhSaPKVK4pwBFvaTmZxEnoKXLG/U9gmdDcihQGNzFlgIvaxezFR4glP1LsuiedwMBqCXH3wZccA==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.39", - "rollup": "^4.13.0" + "postcss": "^8.4.43", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" @@ -12259,6 +12245,7 @@ "less": "*", "lightningcss": "^1.21.0", "sass": "*", + "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.4.0" @@ -12276,6 +12263,9 @@ "sass": { "optional": true }, + "sass-embedded": { + "optional": true + }, "stylus": { "optional": true }, @@ -13173,15 +13163,16 @@ }, "react-sdk": { "name": "@melody-auth/react", - "version": "0.0.10", + "version": "0.0.11", "license": "MIT", "devDependencies": { - "@rollup/plugin-alias": "^5.1.0", + "@rollup/plugin-alias": "^5.1.1", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-typescript": "^11.1.6", "react": "^18.2.0", - "rollup": "^4.19.2" + "rollup": "^4.19.2", + "tsc-alias": "^1.8.10" }, "peerDependencies": { "react": "^16.11.0 || ^17 || ^18" diff --git a/react-sdk/package.json b/react-sdk/package.json index 697571d9..62728712 100644 --- a/react-sdk/package.json +++ b/react-sdk/package.json @@ -1,6 +1,6 @@ { "name": "@melody-auth/react", - "version": "0.0.10", + "version": "0.0.11", "main": "dist/index.js", "repository": { "type": "git", @@ -11,18 +11,19 @@ "access": "public" }, "devDependencies": { - "@rollup/plugin-alias": "^5.1.0", + "@rollup/plugin-alias": "^5.1.1", "@rollup/plugin-commonjs": "^26.0.1", "@rollup/plugin-node-resolve": "^15.2.3", "@rollup/plugin-typescript": "^11.1.6", "react": "^18.2.0", - "rollup": "^4.19.2" + "rollup": "^4.19.2", + "tsc-alias": "^1.8.10" }, "peerDependencies": { "react": "^16.11.0 || ^17 || ^18" }, "scripts": { - "build": "rm -rf ./dist && mkdir ./dist && mkdir ./dist/shared && mkdir ./dist/web-sdk && cp -r ../shared/dist/* ./dist/shared && cp -r ../web-sdk/dist/* ./dist/web-sdk && rollup -c --bundleConfigAsCjs", + "build": "rm -rf ./dist && mkdir ./dist && mkdir ./dist/shared && mkdir ./dist/web-sdk && cp -r ../shared/dist/* ./dist/shared && cp -r ../web-sdk/dist/* ./dist/web-sdk && rollup -c --bundleConfigAsCjs && tsc-alias", "type:check": "tsc --noEmit" } } diff --git a/react-sdk/rollup.config.mjs b/react-sdk/rollup.config.mjs index 44881028..40e72196 100644 --- a/react-sdk/rollup.config.mjs +++ b/react-sdk/rollup.config.mjs @@ -21,7 +21,7 @@ export default { entries: [ { find: 'shared', replacement: path.resolve(__dirname, 'dist/shared') }, { find: 'web-sdk', replacement: path.resolve(__dirname, 'dist/web-sdk') } - ] + ], }), resolve(), commonjs(), diff --git a/react-sdk/tsconfig.json b/react-sdk/tsconfig.json index c17b408b..5097ba8a 100644 --- a/react-sdk/tsconfig.json +++ b/react-sdk/tsconfig.json @@ -11,6 +11,9 @@ "module": "ESNext", "rootDir": "src", "outDir": "./dist", + "paths": { + "shared": ["./shared"] + } }, "include": ["src/**/*.ts", "src/**/*.tsx"], "exclude": ["node_modules"]