Skip to content

Commit def1571

Browse files
committed
Merge branch 'Adesin-fr-master' into get-axios-import-working-attempt-two
2 parents 0393ac5 + a374b65 commit def1571

File tree

5 files changed

+178
-90
lines changed

5 files changed

+178
-90
lines changed

js-src/Connector.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ export const broadcaster = (options: object): Connector => new Connector(options
77
const LOG_PREFIX = '[LE-AG-Connector]';
88

99
export class Connector extends BaseConnector {
10-
/**
11-
* The Socket.io connection instance.
12-
*/
10+
1311
socket: Websocket;
1412

1513
/**

js-src/Websocket.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { AxiosResponse } from "axios";
22
import { Channel } from "./Channel";
3+
import axios from 'axios';
34

45
export type Options = { authEndpoint: string, host: string, bearerToken: string, auth: any, debug: boolean };
56

package.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"@babel/plugin-transform-object-assign": "^7.8.3",
4141
"@babel/preset-env": "^7.9.6",
4242
"@rollup/plugin-babel": "^5.0.0",
43+
"@types/babel__traverse": "^7.20.6",
4344
"@types/jest": "^24.0.18",
4445
"@types/node": "^12.7.5",
4546
"@typescript-eslint/eslint-plugin": "^3.7.0",
@@ -48,14 +49,17 @@
4849
"eslint": "^7.5.0",
4950
"jest": "^24.9.0",
5051
"jest-websocket-mock": "^2.2.0",
51-
"laravel-echo": "^1.10.0",
52+
"laravel-echo": "1.10.0",
5253
"mock-socket": "^9.0.3",
5354
"rollup": "^2.10.2",
55+
"rollup-plugin-commonjs": "^10.1.0",
56+
"rollup-plugin-json": "^4.0.0",
57+
"rollup-plugin-node-resolve": "^5.2.0",
5458
"rollup-plugin-typescript2": "^0.27.1",
5559
"standard-version": "^8.0.1",
5660
"ts-jest": "^24.1.0",
5761
"tslib": "^1.10.0",
58-
"typescript": "^3.6.3"
62+
"typescript": "^5.7.2"
5963
},
6064
"engines": {
6165
"node": ">=10"

rollup.config.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ export default {
99
{ file: './dist/laravel-echo-api-gateway.iife.js', format: 'iife', name: 'LaravelEchoApiGateway' },
1010
],
1111
plugins: [
12-
typescript(),
12+
typescript({
13+
tsconfig: './tsconfig.json', // Chemin explicite vers votre fichier TypeScript
14+
useTsconfigDeclarationDir: true, // Respecte les options `outDir` et `declarationDir`
15+
}),
1316
babel({
1417
babelHelpers: 'bundled',
1518
exclude: 'node_modules/**',

0 commit comments

Comments
 (0)