Skip to content

Commit

Permalink
Merge pull request #1163 from frontegg/valtio
Browse files Browse the repository at this point in the history
FR-15099 - Migrate to valtio
  • Loading branch information
frontegg-david authored Aug 5, 2024
2 parents 4a76a46 + d40134e commit fb7a3bf
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 190 deletions.
1 change: 0 additions & 1 deletion .github/workflows/publish-alpha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
echo "init-license=MIT" >> .npmrc
echo "always-auth=true" >> .npmrc
echo "registry=https://registry.npmjs.org" >> .npmrc
echo "_authToken=$NPM_TOKEN" >> .npmrc
echo "@frontegg:registry=https://registry.npmjs.org" >> .npmrc
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
npm whoami
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/publish-prerelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ jobs:
echo "init-license=MIT" >> .npmrc
echo "always-auth=true" >> .npmrc
echo "registry=https://registry.npmjs.org" >> .npmrc
echo "_authToken=$NPM_TOKEN" >> .npmrc
echo "@frontegg:registry=https://registry.npmjs.org" >> .npmrc
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
npm whoami
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v16.15.1
v18.18.0
4 changes: 2 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"packages": [
"packages/*"
],
"version": "6.0.48",
"version": "7.0.0",
"npmClient": "yarn",
"useWorkspaces": true,
"publishConfig": {
"registry": "https://registry.npmjs.org",
"directory": "dist"
}
}
}
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"prettier-check-hook": "pretty-quick --check",
"prepublishOnly": "make move-package-json-to-dist",
"update-version": "make update-entry",
"test": "jest --env=jsdom"
"test": "jest --env=jsdom",
"dev": "NODE_ENV=development lerna run build:watch --parallel",
"demo": "cd ./packages/demo-saas && yarn start",
"prettier": "pretty-quick"
},
"devDependencies": {
"@babel/preset-env": "^7.23.3",
Expand All @@ -18,7 +21,7 @@
"@testing-library/react": "12.1.2",
"@types/history": "^4.7.7",
"@types/jest": "^29.5.8 ",
"@types/node": "^13.9.1",
"@types/node": "^18.18.0",
"@types/react-is": "^17.0.3",
"babel-jest": "^29.7.0",
"eslint": "^7.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/demo-saas/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@frontegg/demo-saas",
"version": "6.0.48",
"version": "7.0.0",
"private": true,
"author": "Frontegg LTD",
"scripts": {
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@frontegg/react": "^6.0.48",
"@frontegg/react": "^7.0.0",
"@mui/icons-material": "5.11.0",
"@mui/material": "5.0.3",
"react": "^17.0.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@frontegg/react",
"libName": "FronteggReact",
"version": "6.0.48",
"version": "7.0.0",
"author": "Frontegg LTD",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand All @@ -19,8 +19,8 @@
"build:watch": "rm -rf dist && mkdir dist && rollup -w -c ./rollup.config.js"
},
"dependencies": {
"@frontegg/js": "6.207.0",
"@frontegg/react-hooks": "6.207.0"
"@frontegg/js": "7.0.0-alpha.9",
"@frontegg/react-hooks": "7.0.0-alpha.9"
},
"peerDependencies": {
"react": ">16.9.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/react/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ function movePackageJson() {
fs.writeFileSync(path.join(distFolder, 'package.json'), JSON.stringify(enhancedPkg, null, 2), {
encoding: 'utf8',
});
fs.rmdirSync(nodeModulesPath, { recursive: true });
if (fs.existsSync(nodeModulesPath)) {
fs.rmSync(nodeModulesPath, { recursive: true });
}
fs.symlinkSync(distFolder, nodeModulesPath, 'dir');
},
};
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/sdkVersion.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export default { version: '6.0.48' };
export default { version: '7.0.0' };
2 changes: 1 addition & 1 deletion packages/sanity-check/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "frontegg-react-sanity-check",
"private": true,
"version": "6.0.48",
"version": "7.0.0",
"scripts": {
"build": "docker-compose build test",
"build:dev": "docker-compose build test --no-cache",
Expand Down
Loading

0 comments on commit fb7a3bf

Please sign in to comment.