Update dependencies

oldtinroof · Jan 16, 2021 · 87add5a · 87add5a
1 parent 70661b6
commit 87add5a
Show file tree

Hide file tree

Showing 10 changed files with 2,113 additions and 21,548 deletions.
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -1,6 +1,5 @@
 module.exports = {
 	trailingComma: "all",
-	svelteBracketNewLine: true,
 	proseWrap: "always",
 	arrowParens: "avoid",
 	useTabs: true,

diff --git a/example/url-bar/src/UrlBar.svelte b/example/url-bar/src/UrlBar.svelte
@@ -20,12 +20,6 @@
 	}
 </script>
 
-<style>
-	form {
-		display: inline-block;
-	}
-</style>
-
 <div>
 	<button type="submit" on:click={() => navigate(-1)}>&lt;-</button>
 	<button type="submit" on:click={() => navigate(1)}>-&gt;</button>
@@ -34,3 +28,9 @@
 		<button type="submit">GO</button>
 	</form>
 </div>
+
+<style>
+	form {
+		display: inline-block;
+	}
+</style>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,8 +58,9 @@
     "test": "npm run test:unit && npm run test:ssr && npm run test:integ",
     "lint": "eslint . && prettier . --check",
     "lint:fix": "eslint . --fix && prettier . --write",
+    "verify-build": "npm run lint && npm test && npm run build",
     "postinstall": "is-ci || husky install",
-    "prepublishOnly": "npm run lint && npm test && npm run build && pinst --disable",
+    "prepublishOnly": "npm run verify-build && pinst --disable",
     "postpublish": "pinst --enable",
     "prepack": "pinst --disable",
     "postpack": "pinst --enable"
@@ -71,50 +72,51 @@
     "svelte": "3.x"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.3",
+    "@babel/core": "^7.12.10",
     "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
     "@babel/plugin-transform-modules-commonjs": "^7.12.1",
     "@babel/plugin-transform-template-literals": "^7.12.1",
-    "@babel/preset-env": "^7.12.1",
-    "@cypress/code-coverage": "^3.8.2",
-    "@rollup/plugin-babel": "^5.2.1",
-    "@rollup/plugin-commonjs": "^15.1.0",
-    "@rollup/plugin-node-resolve": "^9.0.0",
-    "@testing-library/jest-dom": "^5.11.4",
-    "@testing-library/svelte": "^3.0.0",
-    "@types/jest": "^25.2.1",
-    "@typescript-eslint/eslint-plugin": "^4.4.1",
-    "@typescript-eslint/parser": "^4.4.1",
-    "babel-jest": "^26.5.2",
+    "@babel/preset-env": "^7.12.11",
+    "@cypress/code-coverage": "^3.9.2",
+    "@rollup/plugin-babel": "^5.2.2",
+    "@rollup/plugin-commonjs": "^17.0.0",
+    "@rollup/plugin-node-resolve": "^11.1.0",
+    "@testing-library/jest-dom": "^5.11.9",
+    "@testing-library/svelte": "^3.0.3",
+    "@types/jest": "^26.0.20",
+    "@typescript-eslint/eslint-plugin": "^4.13.0",
+    "@typescript-eslint/parser": "^4.13.0",
+    "babel-jest": "^26.6.3",
     "babel-plugin-istanbul": "^6.0.0",
-    "cheerio": "^1.0.0-rc.3",
-    "cypress": "^5.4.0",
-    "eslint": "^7.11.0",
-    "eslint-config-airbnb": "^18.2.0",
-    "eslint-config-airbnb-base": "^14.2.0",
+    "cheerio": "^1.0.0-rc.5",
+    "cypress": "^5.6.0",
+    "eslint": "^7.18.0",
+    "eslint-config-airbnb": "^18.2.1",
+    "eslint-config-airbnb-base": "^14.2.1",
     "eslint-plugin-cypress": "^2.11.2",
     "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.3.1",
-    "eslint-plugin-react": "^7.21.4",
-    "eslint-plugin-svelte3": "^2.7.3",
-    "husky": "^5.0.0-beta.0",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.22.0",
+    "eslint-plugin-svelte3": "^3.0.0",
+    "husky": "^5.0.6",
     "is-ci": "^2.0.0",
-    "jest": "^26.5.3",
-    "lint-staged": "^10.4.2",
+    "jest": "^26.6.3",
+    "lint-staged": "^10.5.3",
     "mkdirp": "^1.0.4",
-    "nyc": "^15.0.1",
-    "pinst": "^2.0.0",
-    "prettier": "^2.1.2",
-    "prettier-plugin-svelte": "^1.4.1",
+    "nyc": "^15.1.0",
+    "pinst": "^2.1.1",
+    "prettier": "^2.2.1",
+    "prettier-plugin-svelte": "^2.1.0",
     "rimraf": "^3.0.2",
-    "rollup": "^2.32.0",
-    "rollup-plugin-svelte": "^6.0.1",
+    "rollup": "^2.36.2",
+    "rollup-plugin-css-only": "^3.1.0",
+    "rollup-plugin-svelte": "^7.0.0",
     "rollup-plugin-terser": "^7.0.2",
-    "sirv-cli": "^1.0.7",
-    "start-server-and-test": "^1.11.5",
-    "svelte": "^3.29.0",
-    "svelte-jester": "^1.1.5",
-    "typescript": "^4.1.2"
+    "sirv-cli": "^1.0.10",
+    "start-server-and-test": "^1.11.7",
+    "svelte": "^3.31.2",
+    "svelte-jester": "^1.3.0",
+    "typescript": "^4.1.3"
   },
   "nyc": {
     "report-dir": "coverage-cypress",

diff --git a/test/ssr/scripts/build.js b/test/ssr/scripts/build.js
@@ -10,7 +10,11 @@ rimraf.sync(join(__dirname, "../dist"));
 async function main() {
 	const bundle = await rollup({
 		input: join(__dirname, "../ssrApp/App.svelte"),
-		plugins: [svelte({ generate: "ssr" }), nodeResolve(), commonjs()],
+		plugins: [
+			svelte({ compilerOptions: { generate: "ssr" } }),
+			nodeResolve(),
+			commonjs(),
+		],
 	});
 	await bundle.write({
 		format: "umd",

diff --git a/test/testApp/rollup.config.js b/test/testApp/rollup.config.js
@@ -4,6 +4,7 @@ import svelte from "rollup-plugin-svelte";
 import babel from "@rollup/plugin-babel";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
 import commonjs from "@rollup/plugin-commonjs";
+import css from "rollup-plugin-css-only";
 
 rimraf.sync(path.join(__dirname, "public/build"));
 
@@ -16,17 +17,9 @@ export default {
 		dir: path.join(__dirname, "public/build"),
 	},
 	plugins: [
-		svelte({
-			dev: true,
-			css: css => {
-				css.write("bundle.css");
-			},
-		}),
-		nodeResolve({
-			browser: true,
-			dedupe: importee =>
-				importee === "svelte" || importee.startsWith("svelte/"),
-		}),
+		svelte({ compilerOptions: { dev: true } }),
+		css({ output: "bundle.css" }),
+		nodeResolve({ browser: true, dedupe: ["svelte"] }),
 		commonjs(),
 		babel({
 			babelHelpers: "bundled",

diff --git a/test/testApp/src/App.svelte b/test/testApp/src/App.svelte
@@ -5,12 +5,6 @@
 	import A11y from "./A11y.svelte";
 </script>
 
-<style>
-	:global(*:focus) {
-		border: 2px dotted green;
-	}
-</style>
-
 <Main />
 
 <br />
@@ -27,3 +21,9 @@
 <br />
 
 <A11y />
+
+<style>
+	:global(*:focus) {
+		border: 2px dotted green;
+	}
+</style>
diff --git a/test/testApp/src/Blog.svelte b/test/testApp/src/Blog.svelte
@@ -47,7 +47,7 @@
 			<div data-testid="route-blog-id">ARTICLE_ID:{params.id}</div>
 		</Route>
 		<Route path="other/*" let:params>
-			<div data-testid="route-blog-id">SPLAT:{params['*']}</div>
+			<div data-testid="route-blog-id">SPLAT:{params["*"]}</div>
 		</Route>
 		<Route path="whatever/*splat" let:params>
 			<div data-testid="route-blog-id">NAMED_SPLAT:{params.splat}</div>

diff --git a/test/testApp/src/Main.svelte b/test/testApp/src/Main.svelte
@@ -21,11 +21,14 @@
 		<Link
 			data-spread-attr
 			data-duplicate-attr="rest"
-			getProps={() => ({ 'data-testid': 'link-get-props', 'data-has-attr': true, 'data-duplicate-attr': 'getProps' })}
+			getProps={() => ({
+				"data-testid": "link-get-props",
+				"data-has-attr": true,
+				"data-duplicate-attr": "getProps",
+			})}
 			to="about"
+		>GET PROPS</Link
 		>
-			GET PROPS
-		</Link>
 		<Link data-testid="link-about-rel" to="about">ABOUT REL</Link>
 		<Link data-testid="link-about-abs" to="/about">ABOUT ABS</Link>
 		<Link data-testid="link-app-home" to="/">APP HOME</Link>
@@ -37,27 +40,25 @@
 			Pauls Dashboard
 		</Link>
 		<Link data-testid="link-nowhere" to="nowhere">NOWHERE</Link>
-		<Link data-testid="link-state" to="/" state={{ value: 'test-state' }}>
+		<Link data-testid="link-state" to="/" state={{ value: "test-state" }}>
 			HOME STATE
 		</Link>
 		<Link
 			data-testid="link-about-push-state"
 			to="about"
-			state={{ value: 'test-push-state' }}
+			state={{ value: "test-push-state" }}
+		>ABOUT PUSH STATE</Link
 		>
-			ABOUT PUSH STATE
-		</Link>
 		<Link data-testid="link-about-replace" to="about" replace>
 			ABOUT REPLACE
 		</Link>
 		<Link
 			data-testid="link-about-replace-state"
 			to="about"
-			state={{ value: 'test-replace-state' }}
+			state={{ value: "test-replace-state" }}
 			replace
+		>ABOUT REPLACE STATE</Link
 		>
-			ABOUT REPLACE STATE
-		</Link>
 		<Link data-testid="link-blog" to="blog">BLOG</Link>
 		<Link data-testid="link-blog-match-empty" to="blog/match">MATCH EMPTY</Link>
 		<Link data-testid="link-blog-match-to" to="blog/match/some-path">
@@ -66,9 +67,8 @@
 		<Link
 			data-testid="link-blog-match-to-splat"
 			to="blog/match/some-path/some-splat"
+		>MATCH SOME PATH AND SPLAT</Link
 		>
-			MATCH SOME PATH AND SPLAT
-		</Link>
 
 		<div use:links>
 			<a href="/about">
@@ -100,10 +100,7 @@
 		<a
 			use:link={customNavigate}
 			data-testid="action-link-custom-navigate"
-			href="/about"
-		>
-			ACTION LINK ABOUT CUSTOM NAVIGATE
-		</a>
+			href="/about"> ACTION LINK ABOUT CUSTOM NAVIGATE </a>
 	</nav>
 	<br />
 	<main>

diff --git a/types/hooks.d.ts b/types/hooks.d.ts
@@ -56,9 +56,9 @@ export declare function useMatch<Params extends RouteParams>(
 /**
  * Access the parent Routes matched params and wildcards.
  */
-export declare function useParams<Params extends RouteParams>(): Readable<
-	Params
->;
+export declare function useParams<
+	Params extends RouteParams
+>(): Readable<Params>;
 
 /**
  * Provide a custom element to focus, when the parent route is visited.