Merge pull request #82 from oslabs-beta/dev

Dev to Master

Author: charlesgutwirth

README.md

@@ -20,16 +20,21 @@
   </p>
     <!-- BADGES -->
   <p align="center">
-    <!-- FORKS -->
-    <a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling"></a>
+    <!-- VSCode Version -->
+    <a href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling"><img alt="Visual Studio Marketplace Version" src="https://img.shields.io/visual-studio-marketplace/v/team-sapling.sapling?label=Version"></a>
+    <!-- VSCode Installs -->
+    <a href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling"><img alt="Visual Studio Marketplace Installs" src="https://img.shields.io/visual-studio-marketplace/i/team-sapling.sapling?label=Installs&logo=visualstudiocode"></a>
     <!-- STARS -->
-    <a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a>
+    <a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling?label=Stars&logo=github"></a>
+    <!-- FORKS -->
+    <a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling?label=Forks&logo=github"></a>
     <!-- GITHUB RELEASE VERSION -->
     <!-- <a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a> -->
+    <br>
     <!-- BUILD STATUS -->
     <a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
     <a href="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml"><img alt="dev CI workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml/badge.svg"></a>
-    <img alt="GitHub deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=website%20build&logo=vercel">
+    <img alt="Vercel Web deployments" src="https://img.shields.io/github/deployments/oslabs-beta/sapling/production?label=build&logo=vercel">
     <!-- LICENSE -->
     <!-- <a href="https://github.com/oslabs-beta/sapling/blob/master/LICENSE"><img alt="GitHub" src="https://img.shields.io/github/license/oslabs-beta/sapling"></a> -->
     <!-- CONTRIBUTIONS -->
@@ -245,3 +250,4 @@ Distributed under the MIT License. See [`LICENSE`](https://github.com/oslabs-bet
 * Tooltips with [Tippy](https://www.npmjs.com/package/@tippy.js/react)
 * [Best README Template](https://github.com/othneildrew/Best-README-Template)
 * Sapling Logo from [Freepik](https://www.freepik.com/vectors/tree)
+* Readme badges from [shields.io](https://shields.io/)

sapling/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to the "sapling" extension will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [1.1.0] - 2021-10-7
+
+### Added
+- Beta support for Next.js applications - 'page' files can be parsed to show component hierarchy when using create-next-app
+- Basic test case for Next.js compatibility included
+
 ## [1.0.0] - [Initial Release] - 2021-10-5
 
 ### Added

sapling/README.md

@@ -22,12 +22,17 @@
   </p>
     <!-- BADGES -->
   <p align="center">
-    <!-- FORKS -->
-    <!-- <a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling"></a> -->
+     <!-- VSCode Version -->
+    <a href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling"><img alt="Visual Studio Marketplace Version" src="https://img.shields.io/visual-studio-marketplace/v/team-sapling.sapling?label=Version"></a>
+    <!-- VSCode Installs -->
+    <a href="https://marketplace.visualstudio.com/items?itemName=team-sapling.sapling"><img alt="Visual Studio Marketplace Installs" src="https://img.shields.io/visual-studio-marketplace/i/team-sapling.sapling?label=Installs&logo=visualstudiocode"></a>
     <!-- STARS -->
-    <!-- <a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling"></a> -->
+    <a href="https://github.com/oslabs-beta/sapling/stargazers"><img alt="GitHub Repo stars" src="https://img.shields.io/github/stars/oslabs-beta/sapling?label=Stars&logo=github"></a>
+    <!-- FORKS -->
+    <a href="https://github.com/oslabs-beta/sapling/network/members"><img alt="GitHub forks" src="https://img.shields.io/github/forks/oslabs-beta/sapling?label=Forks&logo=github"></a>
     <!-- GITHUB RELEASE VERSION -->
     <!-- <a href="https://github.com/oslabs-beta/sapling/releases"><img alt="GitHub release (latest by date including pre-releases)" src="https://img.shields.io/github/v/release/oslabs-beta/sapling?include_prereleases"></a> -->
+    <br>
     <!-- BUILD STATUS -->
     <!-- <a href="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml"><img alt="master CI/CD workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/master.yml/badge.svg"></a>
     <a href="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml"><img alt="dev CI workflow status" src="https://github.com/oslabs-beta/sapling/actions/workflows/dev.yml/badge.svg"></a>
@@ -244,4 +249,5 @@ Distributed under the MIT License. See [`LICENSE`](https://github.com/oslabs-bet
 * Icons from [Font Awesome](https://fontawesome.com)
 * Tooltips with [Tippy](https://www.npmjs.com/package/@tippy.js/react)
 * [Best README Template](https://github.com/othneildrew/Best-README-Template)
-* Sapling Logo from [Freepik](https://www.freepik.com/vectors/tree)
+* Sapling Logo from [Freepik](https://www.freepik.com/vectors/tree)
+* Readme badges from [shields.io](https://shields.io/)

sapling/package.json

@@ -74,7 +74,7 @@
 		"watch": "npm-run-all -p watch:*",
     "watch:extension": "webpack --watch",
 		"watch:sidebar": "webpack --watch --config ./src/webviews/webpack.views.config.js",
-		"package": "webpack --mode production --devtool hidden-source-map && webpack ----config ./src/webviews/webpack.views.config.js --devtool hidden-source-map",
+		"package": "webpack --mode production --devtool hidden-source-map && webpack --config ./src/webviews/webpack.views.config.js --devtool hidden-source-map",
 		"test-compile": "tsc -p ./",
 		"test-watch": "tsc -watch -p ./",
 		"pretest": "npm run test-compile && npm run lint",