Merge branch 'main' into solr-9-support

CHANGELOG.md

@@ -1,4 +1,15 @@
-## IN DEVELOPMENT
+## v0.8.0 - [July 3, 2023](https://github.com/lando/solr/releases/tag/v0.8.0)
+  * Removed bundle-dependencies and version-bump-prompt from plugin.
+  * Updated package to use prepare-release-action.
+  * Updated documentation to reflect new release process.
+
+## v0.7.0 - [December 12, 2022](https://github.com/lando/solr/releases/tag/v0.7.0)
+  * Added bundle-dependencies to release process.
+  * Fixed bug in plugin dogfooding test.
+
+## v0.6.0 - [September 7, 2022](https://github.com/lando/solr/releases/tag/v0.6.0)
+
+* HYPERDRIVED
 
 ## v0.5.0 - [November 9, 2021](https://github.com/lando/solr/releases/tag/v0.5.0)
 

docs/.vuepress/config.js

@@ -1,6 +1,7 @@
-const customTheme = require('@lando/vuepress-theme-default-plus');
+import {defineUserConfig} from '@vuepress/cli';
+import {defaultThemePlus} from '@lando/vuepress-theme-default-plus';
 
-module.exports = {
+export default defineUserConfig({
   lang: 'en-US',
   title: 'Lando',
   description: 'Lando Solr Plugin Documentation',
@@ -13,7 +14,7 @@ module.exports = {
     ['link', {rel: 'preconnect', href: '//fonts.gstatic.com', crossorigin: true}],
     ['link', {rel: 'stylesheet', href: '//fonts.googleapis.com/css2?family=Lexend:wght@500&display=swap'}],
   ],
-  theme: customTheme({
+  theme: defaultThemePlus({
     landoDocs: true,
     logo: '/images/icon.svg',
     docsDir: 'docs',
@@ -36,4 +37,4 @@ module.exports = {
       '/development.html',
     ],
   }),
-};
+});

docs/config.md

@@ -5,9 +5,9 @@ description: Learn how to configure the Lando Solr service.
 
 # Configuration
 
-Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://doc.lando.dev/config/services.html) to get a good handle on how the magicks work.
+Here are the configuration options, set to the default values, for this service. If you are unsure about where this goes or what this means, we *highly recommend* scanning the [services documentation](https://docs.lando.dev/config/services.html) to get a good handle on how the magicks work.
 
-Also note that options, in addition to the [build steps](https://doc.lando.dev/config/services.html#build-steps) and [overrides](https://doc.lando.dev/config/services.html#overrides) that are available to every service, are shown below:
+Also note that options, in addition to the [build steps](https://docs.lando.dev/config/services.html#build-steps) and [overrides](https://docs.lando.dev/config/services.html#overrides) that are available to every service, are shown below:
 
 ```yaml
 services:
@@ -23,7 +23,7 @@ services:
 
 `portforward` will allow you to access this service externally by assigning a port directly on your host's `localhost`. Note that `portforward` can be set to either `true` or a specific `port` but we *highly recommend* you set it to `true` unless you have pretty good knowledge of how port assignment works or you have a **very** compelling reason for needing a locked down port.
 
-`portforward: true` will prevent inevitable port collisions and provide greater reliability and stability across Lando apps. That said, one downside of `portforward: true` is that Docker will assign a different port every time you restart your application. You can read more about accessing services externally [over here](https://doc.lando.dev/guides/external-access.html).
+`portforward: true` will prevent inevitable port collisions and provide greater reliability and stability across Lando apps. That said, one downside of `portforward: true` is that Docker will assign a different port every time you restart your application. You can read more about accessing services externally [over here](https://docs.lando.dev/guides/external-access.html).
 
 `tl;dr`
 
@@ -102,4 +102,4 @@ services:
 
 ## Getting information
 
-You can get connection and credential information about your solr instance by running [`lando info`](https://doc.lando.dev/cli/info.html). It may also be worth checking out our [accessing services externally guide](https://doc.lando.dev/guides/external-access.html).
+You can get connection and credential information about your solr instance by running [`lando info`](https://docs.lando.dev/cli/info.html). It may also be worth checking out our [accessing services externally guide](https://docs.lando.dev/guides/external-access.html).

docs/development.md

@@ -157,6 +157,19 @@ Now open a pull request and the new tests should run!
 
 For a deeper dive on Leia you can go [here](https://github.com/lando/leia).
 
+## Releasing
+
+To deploy and publish a new version of the package to the `npm` registry you need only [create a release on GitHub](https://docs.github.com/en/repositories/releasing-projects-on-github/managing-releases-in-a-repository). The GitHub release will automatically [prepare the release](https://github.com/lando/prepare-release-action) and deploy it to NPM, so make sure to use the correct semantic version for the release title (ex: \`v0.8.0\`).
+
+Also note that if you create a "pre-release" it will tag the `npm` package with `edge` instead of the default `latest` tag. Also note that while you can toggle the pre-release checkbox after the initial release creation this will not trigger a new release and/or promote the release from `edge` to `latest`. If you want to deploy to `latest` then create a new release without pre-released checked.
+
+```bash
+# Will pull the most recent GitHub release
+yarn add @lando/solr
+# Will pull the most recent GitHub pre-release
+yarn add @lando/solr@edge
+```
+
 ## Contribution
 
 If you want to contribute code then just follow [this flow](https://guides.github.com/introduction/flow/).

docs/index.md

@@ -36,7 +36,7 @@ services:
 *   **[7](https://hub.docker.com/r/_/solr/)** **(default)**
 *   [7.7](https://hub.docker.com/r/_/solr/)
 *   [7.6](https://hub.docker.com/r/_/solr/)
-*   [custom](https://doc.lando.dev/config/services.html#advanced)
+*   [custom](https://docs.lando.dev/config/services.html#advanced)
 
 ## Legacy versions
 

package.json

@@ -1,20 +1,25 @@
 {
   "name": "@lando/solr",
   "description": "A Lando plugin that provides a tight integration with Solr.",
-  "version": "0.5.0",
-  "author": "John Ouellet @labboy0276",
+  "version": "0.8.0",
+  "author": "Mike Pirog @pirog",
   "license": "GPL-3.0",
   "repository": "lando/solr",
   "bugs": "https://github.com/lando/solr/issues/new/choose",
   "homepage": "https://github.com/lando/solr",
   "keywords": [
     "lando",
     "lando-plugin",
+    "lando-service",
     "solr"
   ],
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
+  "bundledDependencies": [
+    "lodash"
+  ],
+  "lando": {},
   "main": "index.js",
   "nyc": {
     "include": [
@@ -35,27 +40,24 @@
     "docs:build": "vuepress build docs",
     "docs:lint": "eslint -c docs/.eslintrc.json --quiet docs/.vuepress",
     "lint": "eslint --quiet . && yarn docs:lint",
-    "release": "bump --prompt --tag --all --push",
     "test:unit": "nyc --reporter=html --reporter=text mocha --timeout 5000 test/**/*.spec.js",
     "test:leia": "yarn leia \"examples/**/README.md\" -c 'Destroy tests' --stdin",
     "test": "yarn lint && yarn test:unit"
   },
   "dependencies": {
-    "js-yaml": "^3.4.6",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
-    "@lando/leia": "^0.6.4",
-    "@lando/vuepress-theme-default-plus": "1.0.0-beta.34",
+    "@lando/leia": "^0.6.5",
+    "@lando/vuepress-theme-default-plus": "1.0.0-beta.49",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",
     "eslint-config-google": "^0.9.1",
     "eslint-plugin-vue": "^8.0.3",
     "mocha": "^9.1.2",
     "nyc": "^15.1.0",
-    "version-bump-prompt": "^4.2.1",
-    "vuepress": "^2.0.0-beta.43"
+    "vuepress": "2.0.0-beta.53"
   }
 }