isolate update 2 (#26)

* Dial fully for `lando update`

* Update to node 18

* Fix some script-generated issues.

* First stab at new directory structure and adding in lamp-y builders

* Feed linter.

* Try clearing lando.

* Get rid of erroneous builder.js/init.

* Set confsrc.

* Update dependencies.

* Correct path to local joomla.

.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

.github/workflows/pr-joomla-tests.yml

@@ -11,15 +11,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        leia-test:
-          - examples/joomla
-          - examples/joomla-mysql8
         lando-version:
-          - 3-dev
+          - 3-dev-slim
         os:
           - ubuntu-22.04
         node-version:
-          - '16'
+          - '18'
+        leia-test:
+          - examples/joomla
+          - examples/joomla-mysql8
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -28,21 +29,23 @@ 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
+      - name: Bundle Deps
+        uses: lando/prepare-release-action@v2
+        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/joomla=/home/runner/work/joomla/joomla
+            setup.skipCommonPlugins=true
+            setup.plugins.@lando/joomla=/home/runner/work/joomla/joomla
           telemetry: false
-      - name: Verify Lando works and we are dogfooding this plugin for tests
-        run: |
-          lando --clear
-          lando version
-          lando config --path plugins | grep joomla | grep /home/runner/work/joomla/joomla || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
       - name: Run Leia Tests
         uses: lando/run-leia-action@v2
         with:

.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

.github/workflows/pr-unit-tests.yml

@@ -14,7 +14,7 @@ jobs:
           - ubuntu-22.04
           - macos-12
         node-version:
-          - '16'
+          - '18'
     steps:
       # Install deps and cache
       - name: Checkout code
@@ -23,10 +23,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

.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
 

.gitignore

@@ -39,4 +39,7 @@ coverage/
 _site
 docs/.vuepress/.cache
 docs/.vuepress/.temp
-docs/.vuepress/dist
+docs/.vuepress/dist
+
+# YARN
+yarn.lock

.lando.yml

@@ -1,14 +1,14 @@
 name: lando-joomla-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

.node-version

@@ -1 +1 @@
-16
+18

CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.0 - [December 7, 2023](https://github.com/lando/joomla/releases/tag/v1.0.0)
+    * Dialed fully for `lando update`
+
 ## v0.9.0 - [July 3, 2023](https://github.com/lando/joomla/releases/tag/v0.9.0)
   * Removed bundle-dependencies and version-bump-prompt from plugin.
   * Updated package to use prepare-release-action.

builders/joomla-mariadb.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const _ = require('lodash');
+const LandoMariadb = require('./../node_modules/@lando/mariadb/builders/mariadb.js');
+
+// Builder
+module.exports = {
+  name: 'joomla-mariadb',
+  parent: '_service',
+  builder: (parent, config) => class JoomlaMariadb extends LandoMariadb.builder(parent, LandoMariadb.config) {
+    constructor(id, options = {}) {
+      super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
+    };
+  },
+};

builders/joomla-mysql.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const _ = require('lodash');
+const LandoMysql = require('./../node_modules/@lando/mysql/builders/mysql.js');
+
+// Builder
+module.exports = {
+  name: 'joomla-mysql',
+  parent: '_service',
+  builder: (parent, config) => class JoomlaMysql extends LandoMysql.builder(parent, LandoMysql.config) {
+    constructor(id, options = {}) {
+      super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
+    };
+  },
+};

builders/joomla-nginx.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const _ = require('lodash');
+const PhpNginx = require('@lando/php/builders/php-nginx.js');
+
+// Builder
+module.exports = {
+  name: 'joomla-nginx',
+  parent: '_webserver',
+  config: {
+    version: '1.25',
+  },
+  builder: (parent, config) => class JoomlaNginx extends PhpNginx.builder(parent, PhpNginx.config) {
+    constructor(id, options = {}) {
+      super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
+    };
+  },
+};

builders/joomla-php.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const _ = require('lodash');
+const fs = require('fs');
+const path = require('path');
+const landoPhpPath = path.join(__dirname, '../node_modules/@lando/php');
+const LandoPhp = require(`${landoPhpPath}/builders/php.js`);
+
+const loadScripts = options => {
+  const lando = _.get(options, '_app._lando');
+  // Move the script to the confDir and make executable.
+  if (fs.existsSync(path.join(landoPhpPath, 'scripts'))) {
+    const confDir = path.join(lando.config.userConfRoot, 'scripts');
+    const dest = lando.utils.moveConfig(path.join(landoPhpPath, 'scripts'), confDir);
+    lando.utils.makeExecutable(fs.readdirSync(dest), dest);
+    lando.log.debug('automoved scripts from %s to %s and set to mode 755',
+      path.join(landoPhpPath, 'scripts'), confDir);
+  }
+};
+
+// Builder
+module.exports = {
+  name: 'joomla-php',
+  parent: '_appserver',
+  builder: (parent, config) => class JoomlaPhp extends LandoPhp.builder(parent, LandoPhp.config) {
+    constructor(id, options = {}, factory) {
+      loadScripts(options);
+      options.nginxServiceType = 'joomla-nginx';
+      super(id, _.merge({}, config, options), factory);
+    };
+  },
+};

builders/joomla-postgres.js

@@ -0,0 +1,15 @@
+'use strict';
+
+const _ = require('lodash');
+const LandoPostgres = require('./../node_modules/@lando/postgres/builders/postgres.js');
+
+// Builder
+module.exports = {
+  name: 'joomla-postgres',
+  parent: '_service',
+  builder: (parent, config) => class JoomlaPostgres extends LandoPostgres.builder(parent, LandoPostgres.config) {
+    constructor(id, options = {}) {
+      super(id, _.merge({}, config, options), {services: _.set({}, options.name)});
+    };
+  },
+};