Merge pull request #10 from bodhish/upgrade-tailwind

Update Deps
bodhish · Jan 18, 2021 · 2be15ce · 2be15ce
2 parents 277639f + 7a47492
commit 2be15ce
Show file tree

Hide file tree

Showing 8 changed files with 7,344 additions and 4,867 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/templates/tailwind-starter/.gitignore b/templates/tailwind-starter/.gitignore
@@ -2,6 +2,7 @@
 /dist
 /lib
 /node_modules
+/.parcel-cache
 
 # Ignore these associated with reason-react and bsb
 .merlin

diff --git a/templates/tailwind-starter/package-lock.json b/templates/tailwind-starter/package-lock.json
diff --git a/templates/tailwind-starter/package.json b/templates/tailwind-starter/package.json
@@ -3,9 +3,11 @@
   "version": "0.1.0",
   "license": "MIT",
   "devDependencies": {
-    "bs-platform": "7.3.2",
-    "parcel-bundler": "^1.12.4",
-    "tailwindcss": "^1.8.3"
+    "bs-platform": "8.4.2",
+    "parcel": "^2.0.0-beta.1",
+    "autoprefixer": "^10.2.1",
+    "postcss": "^8.2.4",
+    "tailwindcss": "^2.0.2"
   },
   "dependencies": {
     "react": "^16.13.1",

diff --git a/templates/tailwind-starter/src/Home.re b/templates/tailwind-starter/src/Home.re
@@ -1,5 +1,5 @@
 let str = React.string;
-let logo: string = [%raw "require('./assets/logo.png')"];
+let logo: string = [%raw "require('url:./assets/logo.png')"];
 
 [@react.component]
 let make = () =>

diff --git a/templates/webpack-tailwind/package-lock.json b/templates/webpack-tailwind/package-lock.json
diff --git a/templates/webpack-tailwind/package.json b/templates/webpack-tailwind/package.json
@@ -9,43 +9,32 @@
     "test": "echo \"Error: no test specified\" && exit 1",
     "webpack": "webpack -w",
     "webpack:production": "NODE_ENV=production webpack",
-    "server": "webpack-dev-server",
+    "server": "webpack serve",
     "re:build": "bsb -make-world -clean-world",
     "re:watch": "bsb -make-world -clean-world -w"
   },
-  "keywords": [
-    "BuckleScript",
-    "ReasonReact",
-    "reason-react"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/bodhish/create-reason-react-tailwind.git"
-  },
   "author": "bodhsih",
   "license": "MIT",
   "engines": {
     "node": ">=8"
   },
   "dependencies": {
-    "postcss-flexbugs-fixes": "^4.2.1",
-    "postcss-import": "^12.0.1",
-    "postcss-preset-env": "^6.7.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
-    "reason-react": "^0.9.1",
-    "style-loader": "^0.23.1",
-    "tailwindcss": "^1.8.3",
-    "url-loader": "^2.1.0"
+    "reason-react": "^0.9.1"
   },
   "devDependencies": {
-    "bs-platform": "^7.3.2",
-    "css-loader": "^3.6.0",
-    "file-loader": "^4.1.0",
-    "html-webpack-plugin": "^3.2.0",
-    "postcss-loader": "^3.0.0",
-    "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "bs-platform": "8.4.2",
+    "css-loader": "^5.0.1",
+    "html-webpack-plugin": "^4.5.1",
+    "postcss-flexbugs-fixes": "^5.0.2",
+    "postcss-import": "^14.0.0",
+    "postcss-loader": "^4.1.0",
+    "postcss-preset-env": "^6.7.0",
+    "style-loader": "^2.0.0",
+    "tailwindcss": "^2.0.2",
+    "webpack": "^5.15.0",
+    "webpack-cli": "^4.3.1",
+    "webpack-dev-server": "^3.11.2"
   }
 }
diff --git a/templates/webpack-tailwind/webpack.config.js b/templates/webpack-tailwind/webpack.config.js
@@ -35,14 +35,7 @@ module.exports = {
       },
       {
         test: /\.(png|jpg|jpeg|gif)$/i,
-        use: [
-          {
-            loader: "url-loader",
-            options: {
-              limit: 8192
-            }
-          }
-        ]
+        type: 'asset/resource'
       }
     ]
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     /dist
     /lib
     /node_modules
+    /.parcel-cache
     # Ignore these associated with reason-react and bsb
     .merlin
@@ Expand Down @@