diff --git a/pyscriptjs/.eslintrc.js b/pyscriptjs/.eslintrc.js index ff2b6c8e..95953941 100644 --- a/pyscriptjs/.eslintrc.js +++ b/pyscriptjs/.eslintrc.js @@ -10,25 +10,12 @@ module.exports = { sourceType: 'module', tsconfigRootDir: __dirname, project: ['./tsconfig.json'], - extraFileExtensions: ['.svelte'], }, env: { es6: true, browser: true, }, - overrides: [ - { - files: ['*.svelte'], - processor: 'svelte3/svelte3', - }, - ], - settings: { - 'svelte3/typescript': require('typescript'), - // ignore style tags in Svelte because of Tailwind CSS - // See https://github.com/sveltejs/eslint-plugin-svelte3/issues/70 - 'svelte3/ignore-styles': () => true, - }, - plugins: ['svelte3', '@typescript-eslint'], + plugins: ['@typescript-eslint'], ignorePatterns: ['node_modules'], rules: { 'no-prototype-builtins': 'warn', diff --git a/pyscriptjs/.prettierrc.js b/pyscriptjs/.prettierrc.js index e0c5738c..01d6f2da 100644 --- a/pyscriptjs/.prettierrc.js +++ b/pyscriptjs/.prettierrc.js @@ -3,11 +3,7 @@ module.exports = { bracketSameLine: true, singleQuote: true, printWidth: 120, - plugins: ['prettier-plugin-svelte'], semi: true, - svelteSortOrder: 'options-styles-scripts-markup', - svelteStrictMode: false, - svelteIndentScriptAndStyle: true, tabWidth: 4, trailingComma: 'all', -} +}; diff --git a/pyscriptjs/package-lock.json b/pyscriptjs/package-lock.json index 4ce45494..1c9a1a68 100644 --- a/pyscriptjs/package-lock.json +++ b/pyscriptjs/package-lock.json @@ -32,11 +32,9 @@ "autoprefixer": "^10.4.7", "cross-env": "^7.0.3", "eslint": "^8.14.0", - "eslint-plugin-svelte3": "^3.4.1", "jest": "^28.1.3", "jest-environment-jsdom": "^28.1.3", "prettier": "^2.6.2", - "prettier-plugin-svelte": "^2.7.0", "pyodide": "^0.21.0", "rollup": "^2.71.1", "rollup-plugin-copy": "^3.4.0", @@ -3409,19 +3407,6 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint-plugin-svelte3": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.4.1.tgz", - "integrity": "sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "eslint": ">=6.0.0", - "svelte": "^3.2.0" - } - }, "node_modules/eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -6993,16 +6978,6 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, - "node_modules/prettier-plugin-svelte": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz", - "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==", - "dev": true, - "peerDependencies": { - "prettier": "^1.16.4 || ^2.0.0", - "svelte": "^3.2.0" - } - }, "node_modules/pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", @@ -11154,13 +11129,6 @@ } } }, - "eslint-plugin-svelte3": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-svelte3/-/eslint-plugin-svelte3-3.4.1.tgz", - "integrity": "sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw==", - "dev": true, - "requires": {} - }, "eslint-scope": { "version": "7.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz", @@ -13733,13 +13701,6 @@ "integrity": "sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==", "dev": true }, - "prettier-plugin-svelte": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.7.0.tgz", - "integrity": "sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==", - "dev": true, - "requires": {} - }, "pretty-format": { "version": "28.1.3", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz", diff --git a/pyscriptjs/package.json b/pyscriptjs/package.json index 96ade111..cbe2fa99 100644 --- a/pyscriptjs/package.json +++ b/pyscriptjs/package.json @@ -7,10 +7,10 @@ "dev": "rollup -c -w", "start": "sirv public --no-clear --port 8080", "validate": "svelte-check", - "format:check": "prettier --check './src/**/*.{js,svelte,html,ts}'", - "format": "prettier --write './src/**/*.{js,svelte,html,ts}'", - "lint": "eslint './src/**/*.{js,svelte,html,ts}'", - "lint:fix": "eslint --fix './src/**/*.{js,svelte,html,ts}'", + "format:check": "prettier --check './src/**/*.{js,html,ts}'", + "format": "prettier --write './src/**/*.{js,html,ts}'", + "lint": "eslint './src/**/*.{js,html,ts}'", + "lint:fix": "eslint --fix './src/**/*.{js,html,ts}'", "xprelint": "npm run format", "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage", "test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --watch" @@ -28,11 +28,9 @@ "autoprefixer": "^10.4.7", "cross-env": "^7.0.3", "eslint": "^8.14.0", - "eslint-plugin-svelte3": "^3.4.1", "jest": "^28.1.3", "jest-environment-jsdom": "^28.1.3", "prettier": "^2.6.2", - "prettier-plugin-svelte": "^2.7.0", "pyodide": "^0.21.0", "rollup": "^2.71.1", "rollup-plugin-copy": "^3.4.0",