Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(hooks, ui): drop cjs build support #1732

Merged
merged 5 commits into from
Jan 22, 2025
Merged

chore(hooks, ui): drop cjs build support #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
391187a
chore(hooks): drop `cjs` build support
nikitayutanov Jan 21, 2025
abdf310
drop gear-ui cjs support
nikitayutanov Jan 21, 2025
cb2b5dd
bump versions
nikitayutanov Jan 21, 2025
1dc2880
fix: hooks build
osipov-mit Jan 22, 2025
b5eebcc
drop custom resolve
nikitayutanov Jan 22, 2025
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"build:gear-idea-backend": "lerna run build --scope @gear-js/api --scope gear-idea-common --scope gear-idea-explorer --scope gear-idea-faucet --scope gear-idea-indexer-db --scope gear-idea-meta-storage --scope gear-idea-squid",
"build:gear-idea-frontend": "lerna run build --scope gear-idea-frontend --scope @gear-js/ui --scope @gear-js/vara-ui --scope @gear-js/react-hooks --scope @gear-js/wallet-connect --scope @gear-js/api",
"build:ui": "lerna run build --parallel --scope @gear-js/ui --scope @gear-js/vara-ui",
"build:hooks": "lerna run build --scope @gear-js/react-hooks",
"build:hooks": "lerna run build --scope @gear-js/react-hooks --scope @gear-js/api",
"build:wallet-connect": "lerna run build --scope @gear-js/wallet-connect --scope @gear-js/react-hooks --scope @gear-js/ui --scope @gear-js/vara-ui",
"build:utils": "lerna run build --scope @gear-js/ui --scope @gear-js/vara-ui --scope @gear-js/react-hooks --scope @gear-js/wallet-connect",
"build:txwrapper": "lerna run build --scope @gear-js/txwrapper",
Expand Down Expand Up @@ -73,6 +73,7 @@
"@rollup/plugin-image": "^3.0.3",
"@rollup/plugin-json": "^6.1.0",
"@rollup/plugin-node-resolve": "^16.0.0",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^12.1.2",
"@types/babel-core": "^6",
"@types/babel__core": "^7",
Expand Down Expand Up @@ -105,7 +106,6 @@
"rollup-plugin-dts": "^6.1.1",
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-terser": "^7.0.2",
"rollup-plugin-typescript2": "^0.36.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
Expand Down
7 changes: 3 additions & 4 deletions utils/gear-hooks/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gear-js/react-hooks",
"version": "0.14.2",
"version": "0.15.0",
"description": "React hooks used across Gear applications",
"author": "Gear Technologies",
"license": "GPL-3.0",
Expand Down Expand Up @@ -50,9 +50,8 @@
"react-dom": "18.2.0",
"sails-js": "0.3.0"
},
"main": "dist/cjs/index.js",
"module": "dist/esm/index.mjs",
"types": "dist/esm/index.d.ts",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist"
],
Expand Down
9 changes: 3 additions & 6 deletions utils/gear-hooks/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
import packageJson from './package.json' with { type: 'json' };
import resolve from '@rollup/plugin-node-resolve';
import commonjs from '@rollup/plugin-commonjs';
import typescript from 'rollup-plugin-typescript2';
import { terser } from 'rollup-plugin-terser';
import typescript from '@rollup/plugin-typescript';
import terser from '@rollup/plugin-terser';
import peerDepsExternal from 'rollup-plugin-peer-deps-external';

export default [
{
input: 'src/index.ts',
output: [
{ file: packageJson.main, format: 'cjs', inlineDynamicImports: true },
{ file: packageJson.module, format: 'esm', inlineDynamicImports: true },
],
output: [{ file: packageJson.main, format: 'esm', inlineDynamicImports: true }],
plugins: [peerDepsExternal(), resolve(), commonjs(), typescript(), terser()],
},
];
1 change: 0 additions & 1 deletion utils/gear-hooks/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"jsx": "react-jsx",
"module": "esnext",
"declaration": true,
"declarationDir": "types",
"outDir": "dist",
"moduleResolution": "node",
"allowSyntheticDefaultImports": true,
Expand Down
5 changes: 2 additions & 3 deletions utils/gear-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gear-js/ui",
"version": "0.5.28",
"version": "0.6.0",
"description": "React UI components used across Gear applications",
"author": "Gear Technologies",
"license": "GPL-3.0",
Expand Down Expand Up @@ -36,8 +36,7 @@
"identity-obj-proxy": "3.0.0",
"jest-environment-jsdom": "29.0.1"
},
"main": "dist/cjs/index.js",
"module": "dist/esm/index.mjs",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"files": [
"dist",
Expand Down
7 changes: 2 additions & 5 deletions utils/gear-ui/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import commonjs from '@rollup/plugin-commonjs';
import typescript from '@rollup/plugin-typescript';
import dts from 'rollup-plugin-dts';
import postcss from 'rollup-plugin-postcss';
import { terser } from 'rollup-plugin-terser';
import terser from '@rollup/plugin-terser';
import peerDepsExternal from 'rollup-plugin-peer-deps-external';
import fs from 'fs';
import image from '@rollup/plugin-image';
Expand All @@ -28,10 +28,7 @@ const writeCssImport = () => ({
export default [
{
input: 'src/index.ts',
output: [
{ file: packageJson.main, format: 'cjs' },
{ file: packageJson.module, format: 'esm' },
],
output: [{ file: packageJson.main, format: 'esm' }],
plugins: [
peerDepsExternal(),
postcss({ extract: true, minimize: true }),
Expand Down
4 changes: 2 additions & 2 deletions utils/wallet-connect/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"clean": "echo \"clean @gear-js/wallet-connect\" && rm -rf dist"
},
"peerDependencies": {
"@gear-js/react-hooks": "^0.14.2",
"@gear-js/ui": "^0.5.28",
"@gear-js/react-hooks": "^0.15.0",
"@gear-js/ui": "^0.6.0",
"@gear-js/vara-ui": "^0.0.11"
},
"peerDependenciesMeta": {
Expand Down
72 changes: 35 additions & 37 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3447,8 +3447,8 @@ __metadata:
clsx: "npm:2.1.1"
sass: "npm:1.77.2"
peerDependencies:
"@gear-js/react-hooks": ^0.14.2
"@gear-js/ui": ^0.5.28
"@gear-js/react-hooks": ^0.15.0
"@gear-js/ui": ^0.6.0
"@gear-js/vara-ui": ^0.0.11
peerDependenciesMeta:
"@gear-js/ui":
Expand Down Expand Up @@ -5969,6 +5969,22 @@ __metadata:
languageName: node
linkType: hard

"@rollup/plugin-terser@npm:^0.4.4":
version: 0.4.4
resolution: "@rollup/plugin-terser@npm:0.4.4"
dependencies:
serialize-javascript: "npm:^6.0.1"
smob: "npm:^1.0.0"
terser: "npm:^5.17.4"
peerDependencies:
rollup: ^2.0.0||^3.0.0||^4.0.0
peerDependenciesMeta:
rollup:
optional: true
checksum: 10c0/b9cb6c8f02ac1c1344019e9fb854321b74f880efebc41b6bdd84f18331fce0f4a2aadcdb481042245cd3f409b429ac363af71f9efec4a2024731d67d32af36ee
languageName: node
linkType: hard

"@rollup/plugin-typescript@npm:^12.1.2":
version: 12.1.2
resolution: "@rollup/plugin-typescript@npm:12.1.2"
Expand Down Expand Up @@ -14726,6 +14742,7 @@ __metadata:
"@rollup/plugin-image": "npm:^3.0.3"
"@rollup/plugin-json": "npm:^6.1.0"
"@rollup/plugin-node-resolve": "npm:^16.0.0"
"@rollup/plugin-terser": "npm:^0.4.4"
"@rollup/plugin-typescript": "npm:^12.1.2"
"@types/babel-core": "npm:^6"
"@types/babel__core": "npm:^7"
Expand Down Expand Up @@ -14758,7 +14775,6 @@ __metadata:
rollup-plugin-dts: "npm:^6.1.1"
rollup-plugin-peer-deps-external: "npm:^2.2.4"
rollup-plugin-postcss: "npm:^4.0.2"
rollup-plugin-terser: "npm:^7.0.2"
rollup-plugin-typescript2: "npm:^0.36.0"
ts-jest: "npm:^29.2.5"
ts-node: "npm:^10.9.2"
Expand Down Expand Up @@ -17300,17 +17316,6 @@ __metadata:
languageName: node
linkType: hard

"jest-worker@npm:^26.2.1":
version: 26.6.2
resolution: "jest-worker@npm:26.6.2"
dependencies:
"@types/node": "npm:*"
merge-stream: "npm:^2.0.0"
supports-color: "npm:^7.0.0"
checksum: 10c0/07e4dba650381604cda253ab6d5837fe0279c8d68c25884995b45bfe149a7a1e1b5a97f304b4518f257dac2a9ddc1808d57d650649c3ab855e9e60cf824d2970
languageName: node
linkType: hard

"jest-worker@npm:^29.7.0":
version: 29.7.0
resolution: "jest-worker@npm:29.7.0"
Expand Down Expand Up @@ -22284,20 +22289,6 @@ __metadata:
languageName: node
linkType: hard

"rollup-plugin-terser@npm:^7.0.2":
version: 7.0.2
resolution: "rollup-plugin-terser@npm:7.0.2"
dependencies:
"@babel/code-frame": "npm:^7.10.4"
jest-worker: "npm:^26.2.1"
serialize-javascript: "npm:^4.0.0"
terser: "npm:^5.0.0"
peerDependencies:
rollup: ^2.0.0
checksum: 10c0/f79b851c6f7b06555d3a8ce7a4e32abd2b7cb8318e89fb8db73e662fa6e3af1a59920e881d111efc65a7437fd9582b61b1f4859b6fd839ba948616829d92432d
languageName: node
linkType: hard

"rollup-plugin-typescript2@npm:^0.36.0":
version: 0.36.0
resolution: "rollup-plugin-typescript2@npm:0.36.0"
Expand Down Expand Up @@ -22698,12 +22689,12 @@ __metadata:
languageName: node
linkType: hard

"serialize-javascript@npm:^4.0.0":
version: 4.0.0
resolution: "serialize-javascript@npm:4.0.0"
"serialize-javascript@npm:^6.0.1":
version: 6.0.2
resolution: "serialize-javascript@npm:6.0.2"
dependencies:
randombytes: "npm:^2.1.0"
checksum: 10c0/510dfe7f0311c0b2f7ab06311afa1668ba2969ab2f1faaac0a4924ede76b7f22ba85cfdeaa0052ec5a047bca42c8cd8ac8df8f0efe52f9bd290b3a39ae69fe9d
checksum: 10c0/2dd09ef4b65a1289ba24a788b1423a035581bef60817bea1f01eda8e3bda623f86357665fe7ac1b50f6d4f583f97db9615b3f07b2a2e8cbcb75033965f771dd2
languageName: node
linkType: hard

Expand Down Expand Up @@ -22978,6 +22969,13 @@ __metadata:
languageName: node
linkType: hard

"smob@npm:^1.0.0":
version: 1.5.0
resolution: "smob@npm:1.5.0"
checksum: 10c0/a1067f23265812de8357ed27312101af49b89129eb973e3f26ab5856ea774f88cace13342e66e32470f933ccfa916e0e9d0f7ca8bbd4f92dfab2af45c15956c2
languageName: node
linkType: hard

"smoldot@npm:2.0.22":
version: 2.0.22
resolution: "smoldot@npm:2.0.22"
Expand Down Expand Up @@ -23701,7 +23699,7 @@ __metadata:
languageName: node
linkType: hard

"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0":
"supports-color@npm:^7.1.0":
version: 7.2.0
resolution: "supports-color@npm:7.2.0"
dependencies:
Expand Down Expand Up @@ -23828,17 +23826,17 @@ __metadata:
languageName: node
linkType: hard

"terser@npm:^5.0.0":
version: 5.31.3
resolution: "terser@npm:5.31.3"
"terser@npm:^5.17.4":
version: 5.37.0
resolution: "terser@npm:5.37.0"
dependencies:
"@jridgewell/source-map": "npm:^0.3.3"
acorn: "npm:^8.8.2"
commander: "npm:^2.20.0"
source-map-support: "npm:~0.5.20"
bin:
terser: bin/terser
checksum: 10c0/eb2b525dada9febd3db74e94bd295f9cd7abd809e4f9c6bbc795a3048ad50fd327c15eab99db383fa820239680eef6d2dbd7dc05361769c204ddee5cf684d41e
checksum: 10c0/ff0dc79b0a0da821e7f5bf7a047eab6d04e70e88b62339a0f1d71117db3310e255f5c00738fa3b391f56c3571f800a00047720261ba04ced0241c1f9922199f4
languageName: node
linkType: hard

Expand Down
Loading