This repository was archived by the owner on Jul 10, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 26
Fix issue when FluenceJS was not working in webpack-based web projects #176
Merged
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
d9b0148
Add ci.js
coder11 a5f16f8
fixes
coder11 d28ad3c
fixes contd
coder11 6a9fcc3
fix ci contd2
coder11 86b49ac
Update publish script
coder11 2d24df8
one more fix
coder11 3831b39
CI script should work
coder11 bd6ae25
Add react test
coder11 680afb8
use polyfill for buffer
coder11 78386eb
make build work
coder11 2e600af
fix CI
coder11 442f522
Move aqua code into correct place
coder11 21b41fd
Skip react test
coder11 c8f8916
Better ci pipeline
coder11 68a1839
fix bash script
coder11 6dac128
even better Click to see published version
coder11 156b588
contd
coder11 8397cda
correct registry name in output
coder11 b493398
Code review fixes
coder11 88618dc
Fix PR comments contd
coder11 2181215
Fix import buffer
coder11 47a6bf3
Revert "Fix PR comments contd"
coder11 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| #! /usr/bin/env node | ||
|
|
||
| const fs = require("fs").promises; | ||
| const path = require("path"); | ||
|
|
||
| function printUsage() { | ||
| console.log( | ||
| `Usage: "ci check-consistency" or "ci bump-version %postfix%" or "ci get-version"` | ||
| ); | ||
| } | ||
|
|
||
| let postfix; | ||
| const mode = process.argv[2]; | ||
|
|
||
| function validateArgs() { | ||
| switch (mode) { | ||
| case "get-version": | ||
| return true; | ||
|
|
||
| case "bump-version": | ||
| postfix = process.argv[3]; | ||
| if (!postfix) { | ||
| printUsage(); | ||
| process.exit(); | ||
| } | ||
| return true; | ||
|
|
||
| case "": | ||
| case undefined: | ||
| case "check-consistency": | ||
| return true; | ||
|
|
||
| default: | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| const PATH_TO_PACKAGES = "./packages/"; | ||
|
|
||
| async function getPackageJsonsRecursive(currentPath) { | ||
| return ( | ||
| await Promise.all( | ||
| (await fs.readdir(currentPath, { withFileTypes: true })) | ||
| .filter( | ||
| (file) => | ||
| file.name !== "node_modules" && | ||
| (file.isDirectory() || file.name === "package.json") | ||
| ) | ||
| .map((file) => | ||
| file.isDirectory() | ||
| ? getPackageJsonsRecursive( | ||
| path.join(currentPath, file.name) | ||
| ) | ||
| : Promise.resolve([ | ||
| path.join(process.cwd(), currentPath, file.name), | ||
| ]) | ||
| ) | ||
| ) | ||
| ).flat(); | ||
| } | ||
|
|
||
| async function getVersion(file) { | ||
| const content = await fs.readFile(file); | ||
| const json = JSON.parse(content); | ||
| return [json.name, json.version]; | ||
| } | ||
|
|
||
| function processDep(obj, name, fn) { | ||
| if (!obj) { | ||
| return; | ||
| } | ||
|
|
||
| if (!obj[name]) { | ||
| return; | ||
| } | ||
|
|
||
| if (!/^workspace\:/.test(obj[name])) { | ||
| return; | ||
| } | ||
|
|
||
| const version = obj[name].replace("workspace:", ""); | ||
| fn(obj, version); | ||
| } | ||
| async function getVersionsMap(allPackageJsons) { | ||
| return new Map(await Promise.all(allPackageJsons.map(getVersion))); | ||
| } | ||
|
|
||
| function getVersionForPackageOrThrow(versionsMap, packageName) { | ||
| const version = versionsMap.get(packageName); | ||
| if (!version) { | ||
| console.log("Failed to get version for package: ", packageName); | ||
| process.exit(1); | ||
| } | ||
| return version; | ||
| } | ||
|
|
||
| async function checkConsistency(file, versionsMap) { | ||
| console.log("Checking: ", file); | ||
| const content = await fs.readFile(file); | ||
| const json = JSON.parse(content); | ||
|
|
||
| for (const [name, versionInDep] of versionsMap) { | ||
| const check = (x, version) => { | ||
| if (version.includes("*")) { | ||
| return; | ||
| } | ||
|
|
||
| if (versionInDep !== version) { | ||
| console.log( | ||
| `Error, versions don't match: ${name}:${version} !== ${versionInDep}`, | ||
| file | ||
| ); | ||
| process.exit(1); | ||
| } | ||
| }; | ||
| processDep(json.dependencies, name, check); | ||
| processDep(json.devDependencies, name, check); | ||
| } | ||
| } | ||
|
|
||
| async function bumpVersions(file, versionsMap) { | ||
| console.log("Updating: ", file); | ||
| const content = await fs.readFile(file); | ||
| const json = JSON.parse(content); | ||
|
|
||
| // bump dependencies | ||
| for (const [name, version] of versionsMap) { | ||
| const update = (x) => (x[name] = `workspace:${version}-${postfix}`); | ||
| processDep(json.dependencies, name, update); | ||
| processDep(json.devDependencies, name, update); | ||
| } | ||
|
|
||
| // also bump version in package itself | ||
| const version = getVersionForPackageOrThrow(versionsMap, json.name); | ||
| json.version = `${version}-${postfix}`; | ||
|
|
||
| const newContent = JSON.stringify(json, undefined, 4) + "\n"; | ||
| await fs.writeFile(file, newContent); | ||
| } | ||
|
|
||
| async function processPackageJsons(allPackageJsons, versionsMap, fn) { | ||
| await Promise.all(allPackageJsons.map((x) => fn(x, versionsMap))); | ||
| } | ||
|
|
||
| async function run() { | ||
| if (!validateArgs()) { | ||
| printUsage(); | ||
| process.exit(0); | ||
| } | ||
|
|
||
| const packageJsons = await getPackageJsonsRecursive(PATH_TO_PACKAGES); | ||
| const versionsMap = await getVersionsMap(packageJsons); | ||
|
|
||
| if (mode === "get-version") { | ||
| const fjs = versionsMap.get("@fluencelabs/fluence"); | ||
| console.log(fjs); | ||
| return; | ||
| } | ||
|
|
||
| // always check consistency | ||
| console.log("Checking versions consistency..."); | ||
| await processPackageJsons(packageJsons, versionsMap, checkConsistency); | ||
| console.log("Versions are consistent"); | ||
|
|
||
| if (mode === "bump-version") { | ||
| console.log("Adding postfix: ", postfix); | ||
| await processPackageJsons(packageJsons, versionsMap, bumpVersions); | ||
| console.log("Done"); | ||
| } | ||
| } | ||
|
|
||
| run(); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. | ||
|
|
||
| # dependencies | ||
| /node_modules | ||
| /.pnp | ||
| .pnp.js | ||
|
|
||
| # testing | ||
| /coverage | ||
|
|
||
| # production | ||
| /build | ||
|
|
||
| # misc | ||
| .DS_Store | ||
| .env.local | ||
| .env.development.local | ||
| .env.test.local | ||
| .env.production.local | ||
|
|
||
| npm-debug.log* | ||
| yarn-debug.log* | ||
| yarn-error.log* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| # Getting Started with Create React App | ||
|
|
||
| This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). | ||
|
|
||
| ## Available Scripts | ||
|
|
||
| In the project directory, you can run: | ||
|
|
||
| ### `npm start` | ||
|
|
||
| Runs the app in the development mode.\ | ||
| Open [http://localhost:3000](http://localhost:3000) to view it in the browser. | ||
|
|
||
| The page will reload if you make edits.\ | ||
| You will also see any lint errors in the console. | ||
|
|
||
| ### `npm test` | ||
|
|
||
| Launches the test runner in the interactive watch mode.\ | ||
| See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. | ||
|
|
||
| ### `npm run build` | ||
|
|
||
| Builds the app for production to the `build` folder.\ | ||
| It correctly bundles React in production mode and optimizes the build for the best performance. | ||
|
|
||
| The build is minified and the filenames include the hashes.\ | ||
| Your app is ready to be deployed! | ||
|
|
||
| See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. | ||
|
|
||
| ### `npm run eject` | ||
|
|
||
| **Note: this is a one-way operation. Once you `eject`, you can’t go back!** | ||
|
|
||
| If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. | ||
|
|
||
| Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. | ||
|
|
||
| You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. | ||
|
|
||
| ## Learn More | ||
|
|
||
| You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). | ||
|
|
||
| To learn React, check out the [React documentation](https://reactjs.org/). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| { | ||
| "name": "@test/react", | ||
| "version": "0.1.0", | ||
| "private": true, | ||
| "dependencies": { | ||
| "@fluencelabs/fluence": "workspace:*", | ||
| "@fluencelabs/fluence-network-environment": "^1.0.13", | ||
| "@testing-library/jest-dom": "^5.16.5", | ||
| "@testing-library/react": "^13.4.0", | ||
| "@testing-library/user-event": "^13.5.0", | ||
| "@types/jest": "^27.5.2", | ||
| "@types/node": "^16.11.56", | ||
| "@types/react": "^18.0.18", | ||
| "@types/react-dom": "^18.0.6", | ||
| "react": "^18.2.0", | ||
| "react-dom": "^18.2.0", | ||
| "react-scripts": "5.0.1", | ||
| "typescript": "^4.8.2", | ||
| "web-vitals": "^2.1.4" | ||
| }, | ||
| "scripts": { | ||
| "start": "react-scripts start", | ||
| "build": "react-scripts build", | ||
| "test": "react-scripts test", | ||
| "eject": "react-scripts eject" | ||
| }, | ||
| "eslintConfig": { | ||
| "extends": [ | ||
| "react-app", | ||
| "react-app/jest" | ||
| ] | ||
| }, | ||
| "browserslist": { | ||
| "production": [ | ||
| ">0.2%", | ||
| "not dead", | ||
| "not op_mini all" | ||
| ], | ||
| "development": [ | ||
| "last 1 chrome version", | ||
| "last 1 firefox version", | ||
| "last 1 safari version" | ||
| ] | ||
| } | ||
| } | ||
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <link rel="icon" href="%PUBLIC_URL%/favicon.ico" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="theme-color" content="#000000" /> | ||
| <meta | ||
| name="description" | ||
| content="Web site created using create-react-app" | ||
| /> | ||
| <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" /> | ||
| <!-- | ||
| manifest.json provides metadata used when your web app is installed on a | ||
| user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/ | ||
| --> | ||
| <link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> | ||
| <!-- | ||
| Notice the use of %PUBLIC_URL% in the tags above. | ||
| It will be replaced with the URL of the `public` folder during the build. | ||
| Only files inside the `public` folder can be referenced from the HTML. | ||
|
|
||
| Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will | ||
| work correctly both with client-side routing and a non-root public URL. | ||
| Learn how to configure a non-root public URL by running `npm run build`. | ||
| --> | ||
| <title>React App</title> | ||
| </head> | ||
| <body> | ||
| <noscript>You need to enable JavaScript to run this app.</noscript> | ||
| <div id="root"></div> | ||
| <!-- | ||
| This HTML file is a template. | ||
| If you open it directly in the browser, you will see an empty page. | ||
|
|
||
| You can add webfonts, meta tags, or analytics to this file. | ||
| The build step will place the bundled scripts into the <body> tag. | ||
|
|
||
| To begin the development, run `npm start` or `yarn start`. | ||
| To create a production bundle, use `npm run build` or `yarn build`. | ||
| --> | ||
| </body> | ||
| </html> |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "short_name": "React App", | ||
| "name": "Create React App Sample", | ||
| "icons": [ | ||
| { | ||
| "src": "favicon.ico", | ||
| "sizes": "64x64 32x32 24x24 16x16", | ||
| "type": "image/x-icon" | ||
| }, | ||
| { | ||
| "src": "logo192.png", | ||
| "type": "image/png", | ||
| "sizes": "192x192" | ||
| }, | ||
| { | ||
| "src": "logo512.png", | ||
| "type": "image/png", | ||
| "sizes": "512x512" | ||
| } | ||
| ], | ||
| "start_url": ".", | ||
| "display": "standalone", | ||
| "theme_color": "#000000", | ||
| "background_color": "#ffffff" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # https://www.robotstxt.org/robotstxt.html | ||
| User-agent: * | ||
| Disallow: |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I suggest not to commit this folder with react test since it's not working