Dial fully for lando update (#29)

* Dial fully for `lando update` * Update to node 18 * Manual yarn deprecation tasks. * Restructure builder directory structure.
lando · Dec 8, 2023 · 8d517d9 · 8d517d9
1 parent aa8b554
commit 8d517d9
Show file tree

Hide file tree

Showing 17 changed files with 9,247 additions and 4,454 deletions.
diff --git a/.github/workflows/pr-docs-tests.yml b/.github/workflows/pr-docs-tests.yml
@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -20,12 +20,12 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run tests
       - name: Run linter
-        run: yarn docs:lint
+        run: npm run docs:lint
       - name: Test build
-        run: yarn docs:build
+        run: npm run docs:build
diff --git a/.github/workflows/pr-linter.yml b/.github/workflows/pr-linter.yml
@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -20,10 +20,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run the linter
       - name: Run code linter
-        run: yarn lint
+        run: npm run lint
diff --git a/.github/workflows/pr-python-tests.yml b/.github/workflows/pr-python-tests.yml
@@ -16,32 +16,35 @@ jobs:
           - examples/3.x
           - examples/custom
         lando-version:
-          - 3-dev
+          - 3-dev-slim
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
+      - name: Bundle Deps
+        uses: lando/prepare-release-action@v3
+        with:
+          lando-plugin: true
+          version: dev
+          sync: false
       - name: Setup lando ${{ matrix.lando-version }}
         uses: lando/setup-lando@v2
         with:
           lando-version: ${{ matrix.lando-version }}
           config: |
-            plugins.@lando/wordpress=/home/runner/work/python/python
+            setup.skipCommonPlugins=true
+            setup.plugins.@lando/python=/home/runner/work/python/python
           telemetry: false
-      - name: Verify Lando works and we are dogfooding this plugin for tests
-        run: |
-          lando version
-          lando config --path plugins | grep python | grep /home/runner/work/python/python || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:

diff --git a/.github/workflows/pr-unit-tests.yml b/.github/workflows/pr-unit-tests.yml
@@ -13,7 +13,7 @@ jobs:
           - ubuntu-22.04
           - macos-12
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -22,10 +22,10 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Run unit tests
       - name: Run unit tests
-        run: yarn test:unit
+        run: npm run test:unit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -27,19 +27,19 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: https://registry.npmjs.org
-          cache: yarn
-      - name: Install Yarn dependencies
-        run: yarn install --prefer-offline --frozen-lockfile
+          cache: npm
+      - name: Install NPM dependencies
+        run: npm clean-install --prefer-offline --frozen-lockfile
 
       # Let's do tests rq just to make sure we dont push something that is fundamentally broken
       - name: Lint code
-        run: yarn lint
+        run: npm run lint
       - name: Run unit tests
-        run: yarn test:unit
+        run: npm run test:unit
 
       # Prepare release.
       - name: Prepare release
-        uses: lando/prepare-release-action@v2
+        uses: lando/prepare-release-action@v3
         with:
           lando-plugin: true
 

diff --git a/.gitignore b/.gitignore
@@ -39,4 +39,4 @@ coverage/
 _site
 docs/.vuepress/.cache
 docs/.vuepress/.temp
-docs/.vuepress/dist
+docs/.vuepress/distyarn.lock
diff --git a/.lando.yml b/.lando.yml
@@ -1,14 +1,14 @@
 name: lando-python-plugin
 services:
   node:
-    type: node:14
+    type: node:18
     build:
-      - yarn install
+      - npm install
     scanner: false
     ssl: false
     sslExpose: false
 tooling:
   node:
     service: node
-  yarn:
+  npm:
     service: node
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-16
+18
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v1.0.0 - [December 7, 2023](https://github.com/lando/python/releases/tag/v1.0.0)
+    * Dialed fully for `lando update`
+
 ## v0.8.0 - [July 3, 2023](https://github.com/lando/python/releases/tag/v0.8.0)
   * Removed bundle-dependencies and version-bump-prompt from plugin.
   * Updated package to use prepare-release-action.

diff --git a/services/python/builder.js → builders/python.js b/services/python/builder.js → builders/python.js
diff --git a/docs/.vuepress/public/.!81411!favicon.ico b/docs/.vuepress/public/.!81411!favicon.ico
diff --git a/docs/development.md b/docs/development.md
@@ -14,10 +14,8 @@ At the very least you will need to have the following installed:
 * [Lando 3.5.0+](https://docs.lando.dev/basics/installation.html), preferably installed [from source](https://docs.lando.dev/basics/installation.html#from-source).
 * [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
 
-While not a hard requirement it's also probably a good idea to install both `node` 14 and `yarn`
-
-* [Node 14](https://nodejs.org/dist/latest-v14.x/)
-* [Yarn](https://classic.yarnpkg.com/lang/en/docs/install)
+While not a hard requirement it's also probably a good idea to install `node` 18
+* [Node 18](https://nodejs.org/dist/latest-v18.x/)
 
 ## Installation
 
@@ -28,8 +26,8 @@ git clone https://github.com/lando/python.git && cd python
 # Install dependencies with lando
 lando start
 
-# Or install them with yarn
-yarn
+# Or install them with npm
+npm install
 ```
 
 ## Working
@@ -60,10 +58,10 @@ If you want to help with contributing documentation here are some useful command
 
 ```bash
 # launch local docs site
-yarn docs:dev
+npm run docs:dev
 
 # build docs locally
-yarn docs:build
+npm run docs:build
 ```
 
 If you are more interested in the internals of the docs they use [VuePress2](https://v2.vuepress.vuejs.org/) and our [Special theme](https://vuepress-theme-default-plus.lando.dev).
@@ -88,7 +86,7 @@ And then you can run the tests with the below.
 
 ```bash
 # Run unit tests
-yarn test:unit
+npm run test:unit
 ```
 
 ### Leia Tests
@@ -115,21 +113,21 @@ Destroy tests
 lando destroy -y
 ```
 
-Note that the headers here are important and are defined in our `yarn generate:tests` script. The _Start up tests_ header specifies things that should run before the main series of tests. _Verification commands_ is the main body of tests and is required. _Destroy tests_ specifies any needed clean up commands to run.
+Note that the headers here are important and are defined in our `npm run generate:tests` script. The _Start up tests_ header specifies things that should run before the main series of tests. _Verification commands_ is the main body of tests and is required. _Destroy tests_ specifies any needed clean up commands to run.
 
 If you check out the various READMEs in our [examples](https://github.com/lando/python/tree/main/examples) you will notice that they are all Leia tests.
 
 Before running all or some of the tests you will need to generate them.
 
 ```bash
 # Generate tests
-yarn generate:tests
+npm run generate:tests
 
 # Run ALL the tests, this will likely take a long time
-yarn test:leia
+npm run test:leia
 
 # Run the tests for a single example
-yarn leia examples/mariadb-10.2/README.md -c 'Destroy tests'
+npm run leia examples/mariadb-10.2/README.md -c 'Destroy tests'
 ```
 
 If you've created new testable examples then you will also need to let GitHub Actions know so they can run on pull requests.
@@ -145,7 +143,7 @@ jobs:
       matrix:
         leia-tests:
             # This should be the filename, without .leia.js extension in the test directory
-            # NOTE that you will need to run yarn generate:tests to see these
+            # NOTE that you will need to run npm run generate:tests to see these
           - test: platform-sh-maria-db-10-1-example
             # This should be the directory that the test was generated from
             source: examples/mariadb-10.2
@@ -165,9 +163,9 @@ Also note that if you create a "pre-release" it will tag the `npm` package with
 
 ```bash
 # Will pull the most recent GitHub release
-yarn add @lando/python
+npm install @lando/python
 # Will pull the most recent GitHub pre-release
-yarn add @lando/python@edge
+npm install @lando/python@edge
 ```
 
 ## Contribution

diff --git a/docs/index.md b/docs/index.md
@@ -58,31 +58,37 @@ This plugin is included with Lando by default. That means if you have Lando vers
 However if you would like to manually install the plugin, update it to the bleeding edge or install a particular version then use the below. Note that this installation method requires Lando `3.5.0+`.
 
 :::: code-group
+::: code-group-item LANDO 3.21+
+```bash:no-line-numbers
+lando plugin-add @lando/python
+```
+:::
+::: code-group-item HYPERDRIVE
+```bash:no-line-numbers
+# @TODO
+# @NOTE: This doesn't actaully work yet
+hyperdrive install @lando/python
+```
+:::
 ::: code-group-item DOCKER
 ```bash:no-line-numbers
 # Ensure you have a global plugins directory
 mkdir -p ~/.lando/plugins
 
 # Install plugin
-# NOTE: Modify the "yarn add @lando/python" line to install a particular version eg
-# yarn add @lando/python@0.5.2
-docker run --rm -it -v ${HOME}/.lando/plugins:/plugins -w /tmp node:14-alpine sh -c \
-  "yarn init -y \
-  && yarn add @lando/python --production --flat --no-default-rc --no-lockfile --link-duplicates \
-  && yarn install --production --cwd /tmp/node_modules/@lando/python \
+# NOTE: Modify the "npm install @lando/python" line to install a particular version eg
+# npm install @lando/python@0.5.2
+docker run --rm -it -v ${HOME}/.lando/plugins:/plugins -w /tmp node:18-alpine sh -c \
+  "npm init -y \
+  && npm install @lando/python --production --flat --no-default-rc --no-lockfile --link-duplicates \
+  && npm install --production --cwd /tmp/node_modules/@lando/python \
   && mkdir -p /plugins/@lando \
   && mv --force /tmp/node_modules/@lando/python /plugins/@lando/python"
 
 # Rebuild the plugin cache
 lando --clear
 ```
 :::
-::: code-group-item HYPERDRIVE
-```bash:no-line-numbers
-# @TODO
-# @NOTE: This doesn't actaully work yet
-hyperdrive install @lando/python
-```
 ::::
 
 You should be able to verify the plugin is installed by running `lando config --path plugins` and checking for `@lando/python`. This command will also show you _where_ the plugin is being loaded from.
diff --git a/netlify.toml b/netlify.toml
@@ -1,7 +1,7 @@
 [build]
   base = "./"
   publish = "docs/.vuepress/dist"
-  command = "yarn docs:build"
+  command = "npm run docs:build"
 
 # Sets our asset optimization
 [build.processing.css]