Skip to content

Commit

Permalink
Remove react from dependencies list in core (#157)
Browse files Browse the repository at this point in the history
* Remove react from dependencies list in core

* Remove duplicated dependencies from all packages

* fix dependency tree

* add display value & resolution

* resolve filbert/core to correct version

* Create six-toes-trade.md

* remove lerna link(already done by lerna bootstrap)

Co-authored-by: kuldeepkeshwar <kuldeepkeshwar@gmail.com>
  • Loading branch information
danedavid and kuldeepkeshwar authored Nov 29, 2020
1 parent a9474fc commit b3e80f1
Show file tree
Hide file tree
Showing 12 changed files with 808 additions and 762 deletions.
13 changes: 13 additions & 0 deletions .changeset/six-toes-trade.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"@filbert-js/browser-stylesheet": patch
"@filbert-js/core": patch
"@filbert-js/css-parser": patch
"gatsby-plugin-filbert": patch
"@filbert-js/server-stylesheet": patch
"@filbert-js/style-sheet-context": patch
"@filbert-js/stylesheet": patch
"@filbert-js/theming": patch
"@filbert-js/website": patch
---

Remove react from dependencies list in core
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@
"css",
"css-in-js"
],
"resolutions": {
"**/react": "16.12.0",
"**/react-dom": "16.12.0",
"**/@filbert-js/core": "^0.0.10",
"**/@filbert-js/browser-stylesheet": "^0.0.7",
"**/@filbert-js/style-sheet-context": "^0.0.7",
"**/@filbert-js/css-ast":"^0.0.7",
"**/@filbert-js/css-parser":"^0.0.7",
"**/@filbert-js/types":"^0.0.5"
"resolutions": {
"**/react": "16.12.0",
"**/react-dom": "16.12.0",
"**/@filbert-js/core": "^0.0.11",
"**/@filbert-js/browser-stylesheet": "^0.0.8",
"**/@filbert-js/style-sheet-context": "^0.0.8",
"**/@filbert-js/css-ast":"^0.0.7",
"**/@filbert-js/css-parser":"^0.0.7",
"**/@filbert-js/types":"^0.0.6"
},
"scripts": {
"develop": "lerna run --stream --parallel --ignore @filbert-js/examples-* --ignore benchmarks-* develop",
"postinstall": "lerna bootstrap --force-local && lerna link --force-local && yarn build-packages",
"postinstall": "lerna bootstrap --force-local && yarn build-packages",
"build": "lerna run build",
"build-packages": "lerna run --ignore @filbert-js/website --ignore benchmarks-* --ignore @filbert-js/examples-* build",
"develop-packages": "lerna run --parallel --stream --ignore @filbert-js/website --ignore benchmarks-* --ignore @filbert-js/examples-* develop",
Expand Down
5 changes: 0 additions & 5 deletions packages/browser-stylesheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@
"build": "microbundle --no-sourcemap",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/css-parser": "^0.0.7",
"@filbert-js/types": "^0.0.6",
"@filbert-js/stylesheet": "^0.0.6"
},
"peerDependencies": {
"@filbert-js/css-parser": "^0.0.7",
"@filbert-js/types": "^0.0.6",
Expand Down
13 changes: 9 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,20 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"@filbert-js/style-sheet-context": "^0.0.8",
"@filbert-js/theming": "^0.0.5",
"@filbert-js/types": "^0.0.6",
"react": "^16.8.6"
"@filbert-js/css-ast":"^0.0.7",
"@filbert-js/css-parser":"^0.0.7",
"@filbert-js/types":"^0.0.6",
"@filbert-js/theming": "^0.0.5"
},
"peerDependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"@filbert-js/style-sheet-context": "^0.0.8",
"@filbert-js/css-ast":"^0.0.7",
"@filbert-js/css-parser":"^0.0.7",
"@filbert-js/types":"^0.0.6",
"@filbert-js/theming": "^0.0.5",
"@filbert-js/types": "^0.0.6",
"react": "^16.8.6"
},
"devDependencies": {
Expand Down
3 changes: 0 additions & 3 deletions packages/css-parser/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"build": "microbundle --no-sourcemap",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/css-ast": "^0.0.7"
},
"peerDependencies": {
"@filbert-js/css-ast": "^0.0.7"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/gatsby-plugin-filbert/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@
"publishConfig": {
"access": "public"
},
"dependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"babel-plugin-filbert": "0.0.7",
"@filbert-js/autoprefixer": "^0.0.6",
"@filbert-js/style-sheet-context": "^0.0.8",
"@filbert-js/server-stylesheet": "^0.0.8",
"@filbert-js/css-parser": "^0.0.7"
"dependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"babel-plugin-filbert": "0.0.7",
"@filbert-js/autoprefixer": "^0.0.6",
"@filbert-js/style-sheet-context": "^0.0.8",
"@filbert-js/server-stylesheet": "^0.0.8",
"@filbert-js/css-parser": "^0.0.7"
},
"peerDependencies": {
"@filbert-js/css-parser": "^0.0.7",
Expand Down
6 changes: 0 additions & 6 deletions packages/server-stylesheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
"build": "microbundle --no-sourcemap --jsx React.createElement",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/css-parser": "^0.0.7",
"@filbert-js/style-sheet-context": "^0.0.8",
"@filbert-js/stylesheet": "^0.0.6",
"react": "^16.8.6"
},
"peerDependencies": {
"@filbert-js/css-parser": "^0.0.7",
"@filbert-js/style-sheet-context": "^0.0.8",
Expand Down
4 changes: 0 additions & 4 deletions packages/style-sheet-context/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
"build": "microbundle --no-sourcemap --jsx React.createElement",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"react": "^16.8.6"
},
"peerDependencies": {
"@filbert-js/browser-stylesheet": "^0.0.8",
"react": "^16.8.6"
Expand Down
3 changes: 0 additions & 3 deletions packages/stylesheet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"build": "microbundle --no-sourcemap",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@filbert-js/types": "^0.0.6"
},
"peerDependencies": {
"@filbert-js/types": "^0.0.6"
},
Expand Down
3 changes: 0 additions & 3 deletions packages/theming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
"build": "microbundle --no-sourcemap --jsx React.createElement",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"react": "^16.8.6"
},
"peerDependencies": {
"react": "^16.8.6"
},
Expand Down
2 changes: 1 addition & 1 deletion website/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module.exports = {
start_url: `/`,
background_color: `#663399`,
theme_color: `#663399`,
display: `filbert`,
display: `fullscreen`,
icon: `../filbert.png`, // This path is relative to the root of the site.
},
},
Expand Down
Loading

1 comment on commit b3e80f1

@vercel
Copy link

@vercel vercel bot commented on b3e80f1 Nov 29, 2020

Choose a reason for hiding this comment

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

Please sign in to comment.