Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
e348ed8
extract tsconfig into top-level
coder11 Jan 24, 2023
99355e0
fix outdir
coder11 Jan 24, 2023
397b639
the project partly builds
coder11 Jan 26, 2023
652d2a4
wip
coder11 Jan 26, 2023
9532ae6
fix KeyPair stuff
coder11 Jan 26, 2023
65865d8
fix jest config
coder11 Jan 26, 2023
9785c3c
some progress
coder11 Jan 26, 2023
41766e9
fuck jest
coder11 Jan 27, 2023
29d0c38
WIP
coder11 Jan 27, 2023
0582813
WIP
coder11 Jan 28, 2023
4b254e2
Add comment
coder11 Jan 29, 2023
dc9b62e
Dump everything into one npm package
coder11 Jan 29, 2023
7155cef
Add more tests to keypair
coder11 Jan 31, 2023
69f7669
Tests kinda run
coder11 Jan 31, 2023
578372e
Update libp2p/crypto
coder11 Feb 1, 2023
e7a41ac
forgot npm lock
coder11 Feb 1, 2023
6c7e8d1
Bundled build works
coder11 Feb 2, 2023
45d7761
fix pnpm lock
coder11 Feb 2, 2023
a72a647
skip non-working tests
coder11 Feb 2, 2023
dc9cb86
Keep internal version of marine-js
coder11 Feb 3, 2023
05b6fcb
cleaning up
coder11 Feb 3, 2023
a4b16a0
uncomment
coder11 Feb 3, 2023
6b7721b
A little bit of renaming
coder11 Feb 3, 2023
2373f5a
fix lockfile
coder11 Feb 3, 2023
cffa585
regenerate pnpm-lock
coder11 Feb 3, 2023
41bb1cb
remove a bunch of ts-node's
coder11 Feb 3, 2023
367ad87
get pnpm workspace back
coder11 Feb 3, 2023
12fe816
regenerate pnpm-lock once more
coder11 Feb 3, 2023
7faa284
moduleResolution: nodenext by default
coder11 Feb 3, 2023
235b7d2
Update packages/client/js-client.web.standalone/build.ts
coder11 Feb 6, 2023
746e79c
Update packages/core/src/marine/deps-loader/common.ts
coder11 Feb 6, 2023
0db05d5
Update packages/core/src/marine/deps-loader/node.ts
coder11 Feb 6, 2023
362af53
Update packages/core/src/marine/deps-loader/common.ts
coder11 Feb 6, 2023
335d223
Update packages/client/js-client.web.standalone/build.ts
coder11 Feb 6, 2023
de513d5
pr comment fixes
coder11 Feb 6, 2023
95a1426
Fix pr comment
coder11 Feb 6, 2023
5469be9
Use release version of marine-js
coder11 Feb 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
auto-install-peers=true
save-exact=true
@fluencelabs:registry=https://npm.fluence.dev/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this necessary? shouldn't it work with the default npm registry?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are waiting for the fix from machines team. Once it's get done we will switch to release version

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed now!

6 changes: 0 additions & 6 deletions package-lock.json

This file was deleted.

19 changes: 19 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
Copy link
Contributor

@shamsartem shamsartem Feb 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is package-lock.json necessary top-level? Because there is already a pnpm-lock.yaml here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, package-lock.json isn't necessary at any level since we are using pnpm. The idea behind pacakge.json is to extract commonly used dev dependencies into a single place

"name": "common-dev-deps",
"version": "0.1.0",
"main": "./dist/index.js",
"typings": "./dist/index.d.ts",
"type": "module",
"engines": {
"node": ">=10",
"pnpm": ">=3"
},
"scripts": {},
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {},
"devDependencies": {
"ts-node": "10.9.1",
"typescript": "4.7"
}
}
16 changes: 3 additions & 13 deletions packages/@tests/marine/node/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
{
"extends": "../../../../tsconfig.json",
"compilerOptions": {
"lib": ["es2015", "dom"],
"outDir": "./dist/",
"target": "es5",
"module": "commonjs",
"strict": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
"declaration": true,
"declarationMap": false,
"sourceMap": true
"outDir": "./dist"
},
"exclude": ["node_modules", "dist"],
"include": ["src"]
"exclude": ["node_modules", "dist"]
}
8 changes: 0 additions & 8 deletions packages/@tests/marine/web/.prettierrc.js

This file was deleted.

22 changes: 3 additions & 19 deletions packages/@tests/marine/web/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
{
"extends": "../../../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist/",
"allowJs": true,
"baseUrl": ".",
"sourceMap": false,
"inlineSources": false,
"pretty": true,
"target": "esnext",
"module": "esnext",
"moduleResolution": "node",
"declaration": false,
"esModuleInterop": true,
"declarationMap": false,
"strict": true,
"noImplicitAny": false,
"alwaysStrict": true,
"noImplicitThis": true,
"strictNullChecks": false
"outDir": "./dist"
},
"exclude": ["node_modules", "dist"],
"include": ["src", "test"]
"exclude": ["node_modules", "dist"]
}
29 changes: 5 additions & 24 deletions packages/@tests/react_test/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,7 @@
{
"compilerOptions": {
"target": "es5",
"lib": [
"dom",
"dom.iterable",
"esnext"
],
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": true,
"module": "esnext",
"moduleResolution": "node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx"
},
"include": [
"src"
]
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist"
},
"exclude": ["node_modules", "dist"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/fluence": "workspace:*",
"@fluencelabs/js-client.node": "workspace:*",
"ts-node": "10.9.1"
"@fluencelabs/js-client.node": "workspace:*"
},
"devDependencies": {
"@types/node": "16.11.59",
Expand Down
13 changes: 4 additions & 9 deletions packages/@tests/smoke/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist/",
"module": "commonjs",
"moduleResolution": "node",
"sourceMap": true,
"declaration": true,
"skipDefaultLibCheck": true
},
"exclude": ["node_modules", "dist"],
"include": ["src/**/*"]
"outDir": "./dist"
},
"exclude": ["node_modules", "dist"]
}
8 changes: 0 additions & 8 deletions packages/client/compiler-support/.prettierrc.js

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@
"author": "Fluence Labs",
"license": "Apache-2.0",
"dependencies": {
"@fluencelabs/js-peer": "workspace:0.1.0"
"@fluencelabs/js-peer": "workspace:*"
},
"devDependencies": {
"@types/node": "16.11.59",
"@types/jest": "28.1.0",
"jest": "28.1.0",
"ts-jest": "28.0.2",
"ts-node": "10.9.1",
"typescript": "4.6.4"
"ts-jest": "28.0.2"
}
}
20 changes: 3 additions & 17 deletions packages/client/compiler-support/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,7 @@
{
"extends": "../../../tsconfig.json",
"compilerOptions": {
"outDir": "./dist/",
"baseUrl": ".",
"downlevelIteration": true,
"sourceMap": true,
"inlineSources": true,
"allowSyntheticDefaultImports": true,
"resolveJsonModule": true,
"target": "ES5",
"module": "commonjs",
"moduleResolution": "node",
"declaration": true,
"esModuleInterop": true,
"declarationMap": true,
"strict": true,
"skipLibCheck": true
"outDir": "./dist"
},
"exclude": ["node_modules", "dist", "bundle"],
"include": ["src/**/*"]
"exclude": ["node_modules", "dist"]
}
8 changes: 0 additions & 8 deletions packages/client/fluence-js/.prettierrc.js

This file was deleted.

17 changes: 0 additions & 17 deletions packages/client/fluence-js/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions packages/client/fluence-js/jest.config.js

This file was deleted.

32 changes: 0 additions & 32 deletions packages/client/fluence-js/package.json

This file was deleted.

92 changes: 0 additions & 92 deletions packages/client/fluence-js/src/index.ts

This file was deleted.

2 changes: 0 additions & 2 deletions packages/client/fluence-js/src/services.ts

This file was deleted.

21 changes: 0 additions & 21 deletions packages/client/fluence-js/tsconfig.json

This file was deleted.

8 changes: 0 additions & 8 deletions packages/client/js-client.node/.prettierrc.js

This file was deleted.

Loading