From ff0b431192838206e1d2a4a1d2baef6bd3287484 Mon Sep 17 00:00:00 2001 From: Simon Holthausen Date: Mon, 26 Jun 2023 10:59:55 +0200 Subject: [PATCH] chore: 7.1.6 --- .eslintrc | 38 ++++++++++++++++---------------------- CHANGELOG.md | 4 ++++ index.js | 6 ++++-- package-lock.json | 24 ++++++++++++++++++++++-- package.json | 3 ++- 5 files changed, 48 insertions(+), 27 deletions(-) diff --git a/.eslintrc b/.eslintrc index 49f743b..a57d644 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,24 +1,18 @@ { - "root": true, - "rules": { - "indent": [ 2, "tab", { "SwitchCase": 1 } ], - "quotes": [ 2, "single" ], - "linebreak-style": [ 2, "unix" ], - "semi": [ 2, "always" ], - "keyword-spacing": [ 2, { "before": true, "after": true } ], - "space-before-blocks": [ 2, "always" ], - "no-mixed-spaces-and-tabs": [ 2, "smart-tabs" ], - "no-cond-assign": [ 0 ] - }, - "env": { - "es6": true, - "browser": true, - "mocha": true, - "node": true - }, - "extends": "eslint:recommended", - "parserOptions": { - "ecmaVersion": 10, - "sourceType": "module" - } + "root": true, + "rules": { + "keyword-spacing": [2, { "before": true, "after": true }], + "no-cond-assign": [0] + }, + "env": { + "es6": true, + "browser": true, + "mocha": true, + "node": true + }, + "extends": ["eslint:recommended", "prettier"], + "parserOptions": { + "ecmaVersion": 10, + "sourceType": "module" + } } diff --git a/CHANGELOG.md b/CHANGELOG.md index c234daa..f6f9ee4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # rollup-plugin-svelte changelog +## 7.1.6 + +- Adjust inferred `css` option for Svelte 4 + ## 7.1.5 - Get ready for Svelte 4 diff --git a/index.js b/index.js index 89b2366..1c0bd30 100644 --- a/index.js +++ b/index.js @@ -46,7 +46,9 @@ module.exports = function (options = {}) { const cssOptionValue = majorVer > 3 ? 'external' : false; if (compilerOptions.css) { console.warn( - `${PREFIX} Forcing \`"compilerOptions.css": ${typeof cssOptionValue === 'string' ? `"${cssOptionValue}"` : cssOptionValue}\` because "emitCss" was truthy.` + `${PREFIX} Forcing \`"compilerOptions.css": ${ + typeof cssOptionValue === 'string' ? `"${cssOptionValue}"` : cssOptionValue + }\` because "emitCss" was truthy.` ); } compilerOptions.css = cssOptionValue; @@ -103,7 +105,7 @@ module.exports = function (options = {}) { if (!warned) { console.error( - '\n\u001B[1m\u001B[31mWARNING: Your @rollup/plugin-node-resolve configuration\'s \'exportConditions\' array should include \'svelte\'. See https://github.com/sveltejs/rollup-plugin-svelte#svelte-exports-condition for more information\u001B[39m\u001B[22m\n' + "\n\u001B[1m\u001B[31mWARNING: Your @rollup/plugin-node-resolve configuration's 'exportConditions' array should include 'svelte'. See https://github.com/sveltejs/rollup-plugin-svelte#svelte-exports-condition for more information\u001B[39m\u001B[22m\n" ); warned = true; } diff --git a/package-lock.json b/package-lock.json index e65e552..abc7778 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rollup-plugin-svelte", - "version": "7.1.5", + "version": "7.1.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "rollup-plugin-svelte", - "version": "7.1.5", + "version": "7.1.6", "license": "MIT", "dependencies": { "@rollup/pluginutils": "^4.1.0", @@ -14,6 +14,7 @@ }, "devDependencies": { "eslint": "^7.14.0", + "eslint-config-prettier": "^8.8.0", "rollup": "^2.33.3", "sander": "^0.6.0", "source-map": "^0.7.3", @@ -490,6 +491,18 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-config-prettier": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz", + "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==", + "dev": true, + "bin": { + "eslint-config-prettier": "bin/cli.js" + }, + "peerDependencies": { + "eslint": ">=7.0.0" + } + }, "node_modules/eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -1818,6 +1831,13 @@ "v8-compile-cache": "^2.0.3" } }, + "eslint-config-prettier": { + "version": "8.8.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz", + "integrity": "sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==", + "dev": true, + "requires": {} + }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", diff --git a/package.json b/package.json index 9481f6b..a4b1a22 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "7.1.5", + "version": "7.1.6", "name": "rollup-plugin-svelte", "description": "Compile Svelte components with Rollup", "repository": "sveltejs/rollup-plugin-svelte", @@ -34,6 +34,7 @@ }, "devDependencies": { "eslint": "^7.14.0", + "eslint-config-prettier": "^8.8.0", "rollup": "^2.33.3", "sander": "^0.6.0", "source-map": "^0.7.3",