fix rails_admin

comorebi-notes · comorebi-notes · commit 57f9932a188d · 2023-05-14T02:52:48.000+09:00
diff --git a/app/frontend/packs/rails_admin.js b/app/frontend/packs/rails_admin.js
@@ -1,2 +1,2 @@
 import "rails_admin/src/rails_admin/base";
-import "../stylesheets/rails_admin.scss";
+import "../styles/rails_admin.scss";
diff --git a/app/frontend/styles/rails_admin.scss b/app/frontend/styles/rails_admin.scss
diff --git a/package.json b/package.json
@@ -50,5 +50,8 @@
       "/node_modules/",
       "/config/"
     ]
+  },
+  "resolutions": {
+    "rails_admin/@fortawesome/fontawesome-free": "^5.15.0"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -989,10 +989,10 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@fortawesome/fontawesome-free@>=5.15.0 <7.0.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe"
-  integrity sha512-0NyytTlPJwB/BF5LtRV8rrABDbe3TdTXqNB3PdZ+UUUZAEIrdOJdmABqKjt4AXwIoJNaRVVZEXxpNrqvE1GAYQ==
+"@fortawesome/fontawesome-free@>=5.15.0 <7.0.0", "@fortawesome/fontawesome-free@^5.15.0":
+  version "5.15.4"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
+  integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
 
 "@gar/promisify@^1.0.1":
   version "1.1.3"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`import "rails_admin/src/rails_admin/base";`
`2`		`-import "../stylesheets/rails_admin.scss";`
	`2`	`+import "../styles/rails_admin.scss";`
Original file line number	Diff line number	Diff line change
`@@ -50,5 +50,8 @@`
`50`	`50`	`"/node_modules/",`
`51`	`51`	`"/config/"`
`52`	`52`	`]`
	`53`	`+ },`
	`54`	`+ "resolutions": {`
	`55`	`+ "rails_admin/@fortawesome/fontawesome-free": "^5.15.0"`
`53`	`56`	`}`
`54`	`57`	`}`