Use sass instead of node-sass (#354)

aqua-examples/aqua-ipfs-integration/aqua/package.json

@@ -25,7 +25,6 @@
         "@fluencelabs/aqua-ipfs": "^0.5.5",
         "@fluencelabs/fluence": "^0.23.0",
         "@fluencelabs/fluence-network-environment": "1.0.13",
-        "ipfs-http-client": "^56.0.3",
         "it-all": "^1.0.5",
         "multiaddr": "^10.0.0",
         "uint8arrays": "^2.1.5"

aqua-examples/aqua-ipfs-integration/nodejs/jest.config.js

@@ -1,5 +1,4 @@
 module.exports = {
     preset: 'ts-jest',
-    testEnvironment: 'node',
     testPathIgnorePatterns: ['dist'],
 };

aqua-examples/aqua-ipfs-integration/nodejs/package.json

@@ -27,7 +27,6 @@
         "@fluencelabs/fluence": "^0.23.0",
         "@fluencelabs/fluence-network-environment": "1.0.13",
         "@fluencelabs/ipfs-execution-aqua": "file:../aqua",
-        "ipfs-http-client": "^50.1.2",
         "it-all": "^1.0.5",
         "multiaddr": "^10.0.0",
         "uint8arrays": "^2.1.5"

aqua-examples/aqua-ipfs-integration/nodejs/src/main.ts

@@ -32,8 +32,12 @@ export async function main(environment: Node[]) {
     try {
         await providerClient.start({ connectTo: providerHost });
         console.log('📘 uploading .wasm to node %s', providerHost.multiaddr);
-        let path = globSource('../service/artifacts/process_files.wasm');
+        const firstThing = await globSource('../service/artifacts/', 'process_files.wasm').next();
-        let { file, swarmAddr, rpcAddr } = await provideFile(path, providerClient);
+        const fileCandidate = await firstThing.value
+        if(fileCandidate === undefined) {
+            throw new Error("Couldn't read process_files.wasm");
+        }
+        let { file, swarmAddr, rpcAddr } = await provideFile(fileCandidate, providerClient);
         console.log('📗 swarmAddr', swarmAddr);
         console.log('📗 rpcAddr', rpcAddr);
 

aqua-examples/aqua-ipfs-integration/nodejs/src/provider.ts

@@ -1,12 +1,13 @@
 import { create, CID } from 'ipfs-http-client';
-import { AddResult } from 'ipfs-core-types/src/root';
+import type { AddResult } from 'ipfs-core-types/src/root';
+import type { ImportCandidate } from 'ipfs-core-types/src/utils';
 import { Multiaddr, protocols } from 'multiaddr';
 
 import { FluencePeer } from '@fluencelabs/fluence';
 import { get_external_api_multiaddr, get_external_swarm_multiaddr } from '@fluencelabs/ipfs-execution-aqua';
 
 export async function provideFile(
-    source: any,
+    source: ImportCandidate,
     provider: FluencePeer,
 ): Promise<{ file: AddResult; swarmAddr: string; rpcAddr: string }> {
     const relayPeerId = provider.getStatus().relayPeerId!;

aqua-examples/aqua-ipfs-integration/package.json

@@ -9,6 +9,7 @@
         "build": "check-node-version --npm '>= 7' && npm run build -w aqua -w nodejs -w web"
     },
     "dependencies": {
+        "ipfs-http-client": "^56.0.3",
         "@fluencelabs/aqua": "^0.7.4-322",
         "@fluencelabs/fluence": "^0.23.0",
         "typescript": "^4.6.3"

aqua-examples/aqua-ipfs-integration/web/package.json

@@ -13,7 +13,6 @@
         "@types/node": "^12.20.16",
         "@types/react": "^17.0.14",
         "@types/react-dom": "^17.0.9",
-        "ipfs-http-client": "^50.1.2",
         "multiaddr": "^10.0.0",
         "react": "^17.0.2",
         "react-dom": "^17.0.2",
@@ -25,7 +24,7 @@
     "scripts": {
         "postinstall": "copy-marine public",
         "start": "react-scripts start",
-        "build": "react-scripts build",
+        "build": "react-scripts build && copy-marine public",
         "test": "jest --config=jest.config.js",
         "_test": "react-scripts test",
         "eject": "react-scripts eject"
@@ -54,7 +53,7 @@
         "@types/serve-handler": "^6.1.1",
         "@types/jest-environment-puppeteer": "^4.4.1",
         "@types/puppeteer": "^5.4.4",
-        "node-sass": "^6.0.1",
+        "sass": "1.53.0",
         "jest-puppeteer": "^6.0.2",
         "serve": "^13.0.2",
         "ts-jest": "^27.1.3"