chore: update @oclif/core to v4 and eslint to v9 with neostandard

eslint.config.js

@@ -0,0 +1,63 @@
+const config = require('@adobe/eslint-config-aio-lib-config')
+
+module.exports = [
+  ...config,
+  {
+    languageOptions: {
+      globals: {
+        NoErrorThrownError: true,
+        getErrorForCallThatShouldThrowAnError: true,
+        fixturePath: true,
+        fixtureFile: true,
+        fixtureJson: true,
+        fixtureHjson: true,
+        fixtureYaml: true,
+        fakeFileSystem: true,
+        setFetchMock: true,
+        createOclifMockConfig: true,
+        loadFixtureApp: true,
+        defaultAppHostName: true,
+        defaultTvmUrl: true,
+        defaultOwApihost: true,
+        fakeS3Bucket: true,
+        fakeOrgId: true,
+        fakeConfig: true,
+        aioLegacyAppConfig: true,
+        fakeS3Creds: true,
+        extraConfig: true,
+        fakeTVMResponse: true
+      }
+    },
+    settings: {
+      jsdoc: {
+        ignorePrivate: true
+      }
+    },
+    rules: {
+      'jsdoc/no-defaults': 0,
+      'jsdoc/tag-lines': [
+        'error',
+        'never',
+        {
+          startLines: null
+        }
+      ]
+    }
+  },
+  {
+    files: ['test/**/*.js'],
+    languageOptions: {
+      globals: {
+        jest: true,
+        describe: true,
+        test: true,
+        it: true,
+        expect: true,
+        beforeEach: true,
+        afterEach: true,
+        beforeAll: true,
+        afterAll: true
+      }
+    }
+  }
+]

package.json

@@ -19,7 +19,7 @@
     "@adobe/generator-aio-app": "^9",
     "@adobe/generator-app-common-lib": "^3",
     "@adobe/inquirer-table-checkbox": "^2",
-    "@oclif/core": "^2.11.6",
+    "@oclif/core": "^4.9.0",
     "@octokit/rest": "^19.0.11",
     "@parcel/core": "^2.7.0",
     "@parcel/reporter-cli": "^2.7.0",
@@ -51,19 +51,14 @@
   },
   "devDependencies": {
     "@adobe/aio-lib-test-proxy": "^2",
-    "@adobe/eslint-config-aio-lib-config": "^4.0.0",
+    "@adobe/eslint-config-aio-lib-config": "^5.0.0",
     "@types/jest": "^29",
     "babel-runtime": "^6.26.0",
     "core-js": "^3",
     "eol": "^0.9.1",
-    "eslint": "^8.57.1",
-    "eslint-config-standard": "^17.1.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jest": "^27.9.0",
+    "eslint": "^9",
     "eslint-plugin-jsdoc": "^48.11.0",
-    "eslint-plugin-n": "^15.7.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.6.0",
+    "neostandard": "^0",
     "jest": "^29.5.0",
     "nock": "^13.2.9",
     "oclif": "^4.17.13",

src/commands/app/install.js

@@ -22,7 +22,6 @@ const jsYaml = require('js-yaml')
 const { USER_CONFIG_FILE, DEPLOY_CONFIG_FILE, PACKAGE_LOCK_FILE } = require('../../lib/defaults')
 const ora = require('ora')
 
-// eslint-disable-next-line node/no-missing-require
 const libConfig = require('@adobe/aio-cli-lib-app-config')
 
 class InstallCommand extends BaseCommand {

src/commands/app/pack.js

@@ -22,7 +22,6 @@ const { getObjectValue } = require('../../lib/app-helper')
 const ora = require('ora')
 const junk = require('junk')
 
-// eslint-disable-next-line node/no-missing-require
 const libConfig = require('@adobe/aio-cli-lib-app-config')
 
 const DIST_FOLDER = 'dist'

src/lib/cleanup.js

@@ -40,11 +40,11 @@ class Cleanup {
       try {
         await this.run()
         aioLogger.info('exiting!')
-        process.exit(0) // eslint-disable-line no-process-exit
+        process.exit(0)
       } catch (e) {
         aioLogger.error('unexpected error while cleaning up!')
         aioLogger.error(e)
-        process.exit(1) // eslint-disable-line no-process-exit
+        process.exit(1)
       }
     })
   }

src/lib/install-helper.js

@@ -20,7 +20,6 @@ const ajvAddFormats = require('ajv-formats')
  * @returns {object} with keys valid (boolean) and errors (object). errors is null if no errors
  */
 function validateJsonWithSchema (fileJson, schemaName) {
-  /* eslint-disable-next-line node/no-unpublished-require */
   const schemas = require('../../schema/index')
   const ajv = new Ajv({
     allErrors: true,

src/lib/run-dev.js

@@ -9,7 +9,6 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-/* eslint-disable no-template-curly-in-string */
 const aioLogger = require('@adobe/aio-lib-core-logging')('@adobe/aio-cli-plugin-app:runDev', { provider: 'debug' })
 const rtLib = require('@adobe/aio-lib-runtime')
 const rtLibUtils = rtLib.utils

test/BaseCommand.test.js

@@ -282,21 +282,23 @@ describe('getLibConsoleCLI', () => {
 
 test('init', async () => {
   const cmd = new TheCommand([])
-  cmd.config = {}
+  cmd.config = global.createOclifMockConfig()
   await cmd.init()
   expect(cmd.prompt).toBe(mockExtensionPrompt)
   expect(inquirer.createPromptModule).toHaveBeenCalledWith({ output: process.stderr })
 })
 
 test('catch', async () => {
   const cmd = new TheCommand([])
+  cmd.config = global.createOclifMockConfig()
   cmd.error = jest.fn()
   await cmd.catch(new Error('fake error'))
   expect(cmd.error).toHaveBeenCalledWith('fake error')
 })
 
 test('will change error message when aio app outside of the application root', async () => {
   const cmd = new TheCommand([])
+  cmd.config = global.createOclifMockConfig()
   cmd.error = jest.fn()
   await cmd.catch(new Error('ENOENT: no such file or directory, open \'package.json\''))
 
@@ -308,6 +310,7 @@ test('will change error message when aio app outside of the application root', a
 
 test('will change error message when aio app outside of the application root (--verbose)', async () => {
   const cmd = new TheCommand(['--verbose'])
+  cmd.config = global.createOclifMockConfig()
   cmd.error = jest.fn()
   await cmd.catch(new Error('ENOENT: no such file or directory, open \'package.json\''))
 
@@ -319,6 +322,7 @@ test('will change error message when aio app outside of the application root (--
 
 test('will handle errors without stack traces when using --verbose flag', async () => {
   const cmd = new TheCommand(['--verbose'])
+  cmd.config = global.createOclifMockConfig()
   cmd.error = jest.fn()
   const errorWithoutStack = new Error('fake error')
   delete errorWithoutStack.stack
@@ -329,6 +333,7 @@ test('will handle errors without stack traces when using --verbose flag', async
 
 test('will handle errors without stack traces when not using --verbose flag', async () => {
   const cmd = new TheCommand([])
+  cmd.config = global.createOclifMockConfig()
   cmd.error = jest.fn()
   const errorWithoutStack = new Error('fake error')
   delete errorWithoutStack.stack

test/TemplatesCommand.test.js

@@ -97,7 +97,7 @@ beforeEach(() => {
   command = new TheCommand()
   command.config = {
     runCommand: jest.fn(),
-    runHook: jest.fn()
+    runHook: jest.fn().mockResolvedValue({ successes: [] })
   }
 
   inquirer.registerPrompt.mockReset()

test/commands/app/add/action.test.js

@@ -59,7 +59,7 @@ beforeEach(() => {
   command.getLibConsoleCLI.mockResolvedValue({
     getEnabledServicesForOrg: mockGetEnabledServicesForOrg
   })
-  command.config = { bin: 'aio' }
+  command.config = global.createOclifMockConfig({ bin: 'aio' })
 
   command.selectTemplates = jest.fn()
   command.selectTemplates.mockResolvedValue([])

test/commands/app/add/event.test.js

@@ -22,6 +22,7 @@ const createAppConfig = (aioConfig = {}, appFixtureName = 'legacy-app') => {
 let command
 beforeEach(() => {
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.getAppExtConfigs = jest.fn()
   command.getAppExtConfigs.mockResolvedValue(createAppConfig(command.appConfig))
   command.getFullConfig = jest.fn()

test/commands/app/add/extension.test.js

@@ -41,9 +41,9 @@ beforeEach(() => {
   command.getFullConfig.mockResolvedValue(createFullConfig({}))
   command.getConfigFileForKey = jest.fn()
   command.getConfigFileForKey.mockResolvedValue({})
-  command.config = {
+  command.config = global.createOclifMockConfig({
     runCommand: jest.fn()
-  }
+  })
 
   command.selectTemplates = jest.fn()
   command.selectTemplates.mockResolvedValue([])

test/commands/app/add/index.test.js

@@ -46,7 +46,7 @@ describe('instance methods', () => {
 
     test('returns help file for app:add command', () => {
       const spy = jest.spyOn(Help.prototype, 'showHelp').mockReturnValue(true)
-      command.config = {}
+      command.config = global.createOclifMockConfig()
       return command.run().then(() => {
         expect(spy).toHaveBeenCalledWith(['app:add', '--help'])
       })

test/commands/app/add/web-assets.test.js

@@ -28,6 +28,7 @@ const createAppConfig = (aioConfig = {}, appFixtureName = 'legacy-app') => {
 let command
 beforeEach(() => {
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.getAppExtConfigs = jest.fn()
   command.getAppExtConfigs.mockResolvedValue(createAppConfig(command.appConfig))
   command.getFullConfig = jest.fn()

test/commands/app/build.test.js

@@ -202,6 +202,7 @@ describe('run', () => {
   beforeEach(() => {
     spinner = ora()
     command = new TheCommand([])
+    command.config = global.createOclifMockConfig()
     command.error = jest.fn()
     command.log = jest.fn()
     command.getAppExtConfigs = jest.fn()

test/commands/app/config/get/index.test.js

@@ -15,7 +15,7 @@ const { Help } = require('@oclif/core')
 
 test('returns help file for app:config:get command', () => {
   const command = new TheCommand([])
-  command.config = {}
+  command.config = global.createOclifMockConfig()
   const spy = jest.spyOn(Help.prototype, 'showHelp').mockReturnValue(true)
   return command.run().then(() => {
     expect(spy).toHaveBeenCalledWith(['app:config:get', '--help'])

test/commands/app/config/get/log-forwarding.test.js

@@ -25,6 +25,7 @@ jest.mock('../../../../../src/lib/log-forwarding', () => {
 let command, lf
 beforeEach(async () => {
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.appConfig = {
     aio: {
       runtime: {

test/commands/app/config/get/log-forwarding/errors.test.js

@@ -24,6 +24,7 @@ jest.mock('@adobe/aio-lib-runtime', () => ({
 let command, logForwarding
 beforeEach(async () => {
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.appConfig = {
     aio: {
       runtime: {

test/commands/app/config/index.test.js

@@ -15,7 +15,7 @@ const { Help } = require('@oclif/core')
 
 test('returns help file for app:config command', () => {
   const command = new TheCommand([])
-  command.config = {}
+  command.config = global.createOclifMockConfig()
   const spy = jest.spyOn(Help.prototype, 'showHelp').mockReturnValue(true)
   return command.run().then(() => {
     expect(spy).toHaveBeenCalledWith(['app:config', '--help'])

test/commands/app/config/set/index.test.js

@@ -15,7 +15,7 @@ const { Help } = require('@oclif/core')
 
 test('returns help file for app:config:set command', () => {
   const command = new TheCommand([])
-  command.config = {}
+  command.config = global.createOclifMockConfig()
   const spy = jest.spyOn(Help.prototype, 'showHelp').mockReturnValue(true)
   return command.run().then(() => {
     expect(spy).toHaveBeenCalledWith(['app:config:set', '--help'])

test/commands/app/config/set/log-forwarding.test.js

@@ -30,6 +30,7 @@ beforeEach(async () => {
   authHelper.setRuntimeApiHostAndAuthHandler.mockClear()
 
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.appConfig = {
     aio: {
       runtime: {

test/commands/app/delete/action.test.js

@@ -85,6 +85,7 @@ beforeEach(() => {
   fs.removeSync.mockClear()
 
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.log = jest.fn()
   command.appConfig = cloneDeep(mockConfigData)
   command.buildOneExt = jest.fn()
@@ -101,6 +102,7 @@ describe('command interface, flags', () => {
 
   test('--yes without <action-name>', async () => {
     const command = new TheCommand(['--yes'])
+    command.config = global.createOclifMockConfig()
     expect(typeof command.run).toBe('function')
     await expect(command.run()).rejects.toThrow('<action-name> must also be provided')
   })

test/commands/app/delete/ci.test.js

@@ -23,6 +23,7 @@ beforeEach(() => {
   fs.removeSync.mockClear()
   fs.existsSync.mockClear()
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
   command.prompt = jest.fn()
 })
 

test/commands/app/delete/extension.test.js

@@ -39,6 +39,7 @@ let command
 
 beforeEach(() => {
   command = new TheCommand([])
+  command.config = global.createOclifMockConfig()
 
   command.getAppExtConfigs = jest.fn()
   command.getAppExtConfigs.mockResolvedValue(createAppConfig(command.appConfig))

test/commands/app/delete/index.test.js

@@ -46,7 +46,7 @@ describe('instance methods', () => {
 
     test('returns help file for app:delete command', () => {
       const spy = jest.spyOn(Help.prototype, 'showHelp').mockReturnValue(true)
-      command.config = {}
+      command.config = global.createOclifMockConfig()
       return command.run().then(() => {
         expect(spy).toHaveBeenCalledWith(['app:delete', '--help'])
       })

test/commands/app/delete/web-assets.test.js

@@ -37,6 +37,7 @@ describe('bad flags', () => {
   let command
   beforeEach(() => {
     command = new TheCommand([])
+    command.config = global.createOclifMockConfig()
   })
   test('unknown', async () => {
     command.argv = ['--wtf']
@@ -68,6 +69,7 @@ describe('bad user selections', () => {
   let command
   beforeEach(() => {
     command = new TheCommand([])
+    command.config = global.createOclifMockConfig()
     command.getAppExtConfigs = jest.fn()
     command.appConfig = cloneDeep(mockConfigData)
     fs.removeSync.mockClear()