Update dependencies (#351)

three11 · May 25, 2021 · 37ab3c4 · 37ab3c4
1 parent e9b52cf
commit 37ab3c4
Show file tree

Hide file tree

Showing 9 changed files with 424 additions and 820 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,25 +4,24 @@
 name: Build
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+    push:
+        branches: [master]
+    pull_request:
+        branches: [master]
 
 jobs:
-  build:
+    build:
+        runs-on: ubuntu-latest
 
-    runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                node-version: [12.x, 14.x, 16.x]
 
-    strategy:
-      matrix:
-        node-version: [10.x, 12.x, 14.x]
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node-version }}
-    - run: yarn
-    - run: yarn build
+        steps:
+            - uses: actions/checkout@v2
+            - name: Use Node.js ${{ matrix.node-version }}
+              uses: actions/setup-node@v2
+              with:
+                  node-version: ${{ matrix.node-version }}
+            - run: yarn
+            - run: yarn build
diff --git a/.npmignore b/.npmignore
@@ -36,6 +36,8 @@ yarn.lock
 
 # Config files
 .babelrc
+.github
+.whitesource
 renovate.json
 rollup.config.js
 webpack.config.js
diff --git a/.whitesource b/.whitesource
@@ -5,4 +5,4 @@
   "issueSettings": {
     "minSeverityLevel": "LOW"
   }
-}
+}
diff --git a/demo/index.html b/demo/index.html
@@ -1,127 +1,125 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-	<meta charset="UTF-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<meta http-equiv="X-UA-Compatible" content="ie=edge">
-	<title>ScrollSpy Demo</title>
-
-	<style>
-		body {
-			font-family: monospace;
-			font-size: 1rem;
-			line-height: 1.25;
-			margin: 0;
-		}
-
-		header {
-			position: fixed;
-			top: 0;
-			right: 0;
-			left: 0;
-			z-index: 10;
-			background-color: #fff;
-			box-shadow: 0 0 1px rgba(0, 0, 0, 0.5);
-		}
-
-		nav ul {
-			display: flex;
-			flex-flow: row nowrap;
-			align-items: center;
-			justify-content: center;
-			padding: 0;
-			margin: 0;
-			list-style: none outside none;
-		}
-
-		nav li {
-			padding: 0 1rem;
-		}
-
-		nav a {
-			color: black;
-			padding: 1rem 0;
-			display: block;
-		}
-
-		nav a:hover {
-			text-decoration: none;
-		}
-
-		nav .current a {
-			color: red;
-		}
-
-		main {
-			padding-top: 3rem;
-		}
-
-		section {
-			text-align: center;
-			height: 75vh;
-			display: flex;
-			flex-flow: row wrap;
-			align-items: center;
-			justify-content: center;
-			border-bottom: 1px solid #000;
-		}
-
-		footer {
-			text-align: center;
-			padding: 1rem;
-		}
-	</style>
-</head>
-
-<body>
-	<header class="header">
-		<nav>
-			<ul class="nav">
-				<li><a href="#section1">Section 1</a></li>
-
-				<li><a href="#section2">Section 2</a></li>
-
-				<li><a href="#section3">Section 3</a></li>
-
-				<li><a href="#section4">Section 4</a></li>
-			</ul>
-		</nav>
-	</header>
-
-	<main>
-		<section id="section1" class="section">
-			<h1>Section 1</h1>
-		</section>
-
-		<section id="section2" class="section">
-			<h2>Section 2</h2>
-		</section>
-
-		<section id="section3" class="section">
-			<h3>Section 3</h3>
-		</section>
-
-		<section id="section4" class="section">
-			<h4>Section 4</h4>
-		</section>
-	</main>
-
-	<footer>
-		<p>&copy; 2018 Three 11 | License MIT</p>
-	</footer>
-
-	<script src="../dist/scrollspy.min.js"></script>
-
-	<script>
-		new ScrollSpy({
-			linkCurrentClass: 'current',
-			linksContainerSelector: '.nav',
-			sectionSelector: '.section',
-			headerOffset: true,
-			headerClass: '.header'
-		});
-	</script>
-</body>
-
+	<head>
+		<meta charset="UTF-8" />
+		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<meta http-equiv="X-UA-Compatible" content="ie=edge" />
+		<title>ScrollSpy Demo</title>
+
+		<style>
+			body {
+				font-family: monospace;
+				font-size: 1rem;
+				line-height: 1.25;
+				margin: 0;
+			}
+
+			header {
+				position: fixed;
+				top: 0;
+				right: 0;
+				left: 0;
+				z-index: 10;
+				background-color: #fff;
+				box-shadow: 0 0 1px rgba(0, 0, 0, 0.5);
+			}
+
+			nav ul {
+				display: flex;
+				flex-flow: row nowrap;
+				align-items: center;
+				justify-content: center;
+				padding: 0;
+				margin: 0;
+				list-style: none outside none;
+			}
+
+			nav li {
+				padding: 0 1rem;
+			}
+
+			nav a {
+				color: black;
+				padding: 1rem 0;
+				display: block;
+			}
+
+			nav a:hover {
+				text-decoration: none;
+			}
+
+			nav .current a {
+				color: red;
+			}
+
+			main {
+				padding-top: 3rem;
+			}
+
+			section {
+				text-align: center;
+				height: 75vh;
+				display: flex;
+				flex-flow: row wrap;
+				align-items: center;
+				justify-content: center;
+				border-bottom: 1px solid #000;
+			}
+
+			footer {
+				text-align: center;
+				padding: 1rem;
+			}
+		</style>
+	</head>
+
+	<body>
+		<header class="header">
+			<nav>
+				<ul class="nav">
+					<li><a href="#section1">Section 1</a></li>
+
+					<li><a href="#section2">Section 2</a></li>
+
+					<li><a href="#section3">Section 3</a></li>
+
+					<li><a href="#section4">Section 4</a></li>
+				</ul>
+			</nav>
+		</header>
+
+		<main>
+			<section id="section1" class="section">
+				<h1>Section 1</h1>
+			</section>
+
+			<section id="section2" class="section">
+				<h2>Section 2</h2>
+			</section>
+
+			<section id="section3" class="section">
+				<h3>Section 3</h3>
+			</section>
+
+			<section id="section4" class="section">
+				<h4>Section 4</h4>
+			</section>
+		</main>
+
+		<footer>
+			<p>&copy; 2018 Three 11 | License MIT</p>
+		</footer>
+
+		<script src="../dist/scrollspy.min.js"></script>
+
+		<script>
+			new ScrollSpy({
+				linkCurrentClass: 'current',
+				linksContainerSelector: '.nav',
+				sectionSelector: '.section',
+				headerOffset: true,
+				headerClass: '.header'
+			});
+		</script>
+	</body>
 </html>
diff --git a/dist/scrollspy.min.js b/dist/scrollspy.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@three11/scrollspy",
-	"version": "0.4.0",
+	"version": "1.0.0",
 	"description": "Vanilla ES2017 module for scroll spy",
 	"main": "dist/scrollspy.min.js",
 	"scripts": {
@@ -45,10 +45,10 @@
 		"@babel/cli": "7.14.3",
 		"@babel/core": "7.14.3",
 		"@babel/preset-env": "7.14.2",
-		"rollup": "2.48.0",
+		"rollup": "2.49.0",
 		"rollup-plugin-babel": "4.4.0",
 		"rollup-plugin-commonjs": "10.1.0",
 		"rollup-plugin-node-resolve": "5.2.0",
-		"rollup-plugin-uglify": "6.0.4"
+		"rollup-plugin-terser": "7.0.2"
 	}
 }
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,7 +1,7 @@
 import babel from 'rollup-plugin-babel';
 import resolve from 'rollup-plugin-node-resolve';
 import commonJS from 'rollup-plugin-commonjs';
-import { uglify } from 'rollup-plugin-uglify';
+import { terser } from 'rollup-plugin-terser';
 
 export default {
 	input: 'src/scrollspy.js',
@@ -20,6 +20,6 @@ export default {
 		commonJS({
 			include: 'node_modules/**'
 		}),
-		uglify()
+		terser()
 	]
 };
diff --git a/src/scrollspy.js b/src/scrollspy.js
@@ -109,10 +109,7 @@ export default class ScrollSpy {
 			return section.offsetTop;
 		}
 
-		return (
-			section.offsetTop -
-			document.querySelector(this.headerClass).offsetHeight
-		);
+		return section.offsetTop - document.querySelector(this.headerClass).offsetHeight;
 	}
 
 	/**
@@ -147,9 +144,7 @@ export default class ScrollSpy {
 			.querySelectorAll(`.${this.linkCurrentClass}`)
 			.forEach(item => item.classList.remove(this.linkCurrentClass));
 
-		this.links[this.currentIdx].parentNode.classList.add(
-			this.linkCurrentClass
-		);
+		this.links[this.currentIdx].parentNode.classList.add(this.linkCurrentClass);
 	}
 
 	/**