sass削除と設定見直し

KentarouTakeda · Nov 13, 2024 · a942ebc · a942ebc
1 parent a1559f8
commit a942ebc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 32 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -1,21 +1,13 @@
 {
     "plugins": [
-        "stylelint-order",
-        "stylelint-scss"
+        "stylelint-order"
     ],
     "extends": [
         "stylelint-config-standard",
-        "stylelint-config-recommended-scss",
         "stylelint-prettier/recommended"
     ],
     "rules": {
         "at-rule-no-unknown": null,
-        "scss/at-rule-no-unknown": [
-          true,
-          {
-            "ignoreAtRules": ["tailwind", "apply", "variants", "responsive", "screen"]
-          }
-        ],
         "prettier/prettier": true,
         "order/properties-alphabetical-order": true,
         "no-empty-source": null,

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,48 +6,39 @@
     "**/node_modules/**": true,
     "**/vendor/**": true
   },
+  "files.associations": {
+    "*.css": "tailwindcss"
+  },
   "css.validate": false,
-  "[css]": {
-    "editor.formatOnSave": false,
+  "[tailwindcss]": {
+    "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
       "source.fixAll.stylelint": "explicit"
     }
   },
-  "scss.validate": false,
   "[scss]": {
     "editor.formatOnSave": false,
     "editor.codeActionsOnSave": {
       "source.fixAll.stylelint": "explicit"
     }
   },
-  "postcss.validate": false,
-  "[postcss]": {
-    "editor.formatOnSave": false,
-    "editor.codeActionsOnSave": {
-      "source.fixAll.stylelint": "explicit"
-    }
-  },
   "stylelint.validate": ["css", "scss", "postcss"],
   "intelephense.environment.phpVersion": "8.3.0",
   "intelephense.files.exclude": [
     "**/.git/**",
-    "**/.svn/**",
-    "**/.hg/**",
-    "**/CVS/**",
-    "**/.DS_Store/**",
     "**/node_modules/**",
-    "**/bower_components/**",
     "**/vendor/**/{Tests,tests}/**",
     "**/.history/**",
     "**/vendor/**/vendor/**",
     "/bootstrap/cache/**",
     "/storage/**"
   ],
   "diffEditor.ignoreTrimWhitespace": false,
-  "php-cs-fixer.allowRisky": false,
+  "php-cs-fixer.allowRisky": true,
   "php-cs-fixer.lastDownload": 0,
   "php-cs-fixer.executablePath": "${workspaceFolder}/vendor/bin/php-cs-fixer",
   "[php]": {
+    "editor.formatOnSave": true,
     "editor.defaultFormatter": "junstyle.php-cs-fixer"
   },
   "php-cs-fixer.onsave": true,

diff --git a/package.json b/package.json
@@ -1,5 +1,4 @@
 {
-    "name": "laravel",
     "private": true,
     "type": "module",
     "scripts": {
@@ -19,7 +18,6 @@
         "laravel-vite-plugin": "^1.0",
         "npm-run-all": "^4.1.5",
         "postcss": "^8.4.47",
-        "sass": "^1.35.1",
         "tailwindcss": "^3.4.13",
         "vite": "^5.0"
     },
@@ -30,16 +28,14 @@
         "lint-staged": "^15.2.0",
         "prettier": "^3.1.0",
         "stylelint": "^16.0.2",
-        "stylelint-config-recommended-scss": "^14.0.0",
         "stylelint-config-standard": "^36.0.0",
         "stylelint-order": "^6.0.0",
-        "stylelint-prettier": "^5.0.0",
-        "stylelint-scss": "^6.0.0"
+        "stylelint-prettier": "^5.0.0"
     },
     "lint-staged": {
         "app/**/*.php": "php-cs-fixer fix --config=.php-cs-fixer.php --path-mode=intersection --",
         "tests/**/*.php": "php-cs-fixer fix --config=.php-cs-fixer.php --path-mode=intersection --",
-        "resources/css/**/*.scss": "stylelint --fix",
+        "resources/css/**/*.css": "stylelint --fix",
         "resources/views/**/*.blade.php": "blade-formatter --w --wrap 9999 -i 2"
     },
     "run-if-changed": {

diff --git a/vite.config.js b/vite.config.js
@@ -4,7 +4,7 @@ import laravel from 'laravel-vite-plugin';
 export default defineConfig({
     plugins: [
         laravel({
-            input: ['resources/css/app.scss', 'resources/js/app.js'],
+            input: ['resources/css/app.css', 'resources/js/app.js'],
             refresh: true,
         }),
     ],