Skip to content

Commit

Permalink
Chore: eslint
Browse files Browse the repository at this point in the history
Signed-off-by: macdonst <[email protected]>
  • Loading branch information
macdonst committed Aug 26, 2024
1 parent 7e6110f commit 395b61e
Show file tree
Hide file tree
Showing 63 changed files with 149 additions and 141 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

12 changes: 12 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const arc = require('@architect/eslint-config')

module.exports = [
...arc,
{
ignores: [
'.nyc_output/',
'coverage/',
'node_modules/',
],
},
]
26 changes: 10 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"license": "Apache-2.0",
"dependencies": {
"@apidevtools/json-schema-ref-parser": "9.1.0",
"@architect/inventory": "^4.0.3",
"@architect/parser": "^6.0.3",
"@architect/sandbox": "^6.0.2",
"@architect/utils": "^4.0.3",
"@architect/inventory": "^4.0.5",
"@architect/parser": "^7.0.1",
"@architect/sandbox": "^6.0.5",
"@architect/utils": "^4.0.6",
"@colors/colors": "1.6.0",
"@enhance/create": "^4.1.2",
"enquirer": "^2.4.1",
Expand All @@ -38,24 +38,18 @@
"strip-ansi": "^6.0.1",
"tiny-json-http": "^7.5.1",
"tmp": "^0.2.3",
"ws": "^8.16.0"
"ws": "^8.18.0"
},
"devDependencies": {
"@architect/eslint-config": "^2.1.2",
"@architect/eslint-config": "^3.0.0",
"@architect/plugin-node-prune": "2.1.0-RC.0",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint": "^9.9.1",
"fs-extra": "~11.2.0",
"nyc": "^15.1.0",
"nyc": "^17.0.0",
"proxyquire": "~2.1.3",
"string-argv": "~0.3.2",
"tap-arc": "~1.2.2",
"tape": "~5.7.5"
},
"eslintConfig": {
"extends": "@architect/eslint-config",
"rules": {
"global-require": "off"
}
"tap-arc": "~1.3.2",
"tape": "~5.8.1"
}
}
2 changes: 1 addition & 1 deletion src/commands/dev/help.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ module.exports = {
example: 'npx enhance dev --port 6666',
},
],
}
},
}
2 changes: 1 addition & 1 deletion src/commands/dev/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ async function action (params) {

// TODO: output Sandbox start via printer
let ver = `Enhance dev server (${appVersion})`
let logLevel = debug ? 'debug' : undefined || verbose ? 'verbose' : undefined
let logLevel = debug ? 'debug' : verbose || undefined ? 'verbose' : undefined
let quiet = logLevel ? false : true

if (!quiet) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/add-enhance-item/errors.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let errors = {
en: {
found_file: str => `File already exists: ${str}`,
}
},
}

module.exports = function error (lang, err, meta) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/add-item/errors.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let errors = {
en: {
found_file: str => `File already exists: ${str}`,
}
},
}

module.exports = function error (lang, err, meta) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/add-item/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module.exports = async function addItem (params) {
let rawArc = mutateArc.upsert({
item: `runtime ${runtime}`,
pragma: 'aws',
raw: arc
raw: arc,
})
inventory = await _inventory({ rawArc })
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/api/handlers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let copy = {
en: {
view_docs: 'View documentation at: https://enhance.dev/docs/learn/starter-project/api',
}
},
}

let node = lang => `// ${copy[lang].view_docs}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/element/handlers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let copy = {
en: {
view_docs: 'View documentation at: https://enhance.dev/docs/learn/starter-project/elements',
}
},
}

let node = lang => `// ${copy[lang].view_docs}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/events/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ let copy = {
en: {
view_docs_js: 'View documentation at: https://arc.codes/docs/en/reference/runtime-helpers/node.js#arc.events',
view_docs_python: 'View documentation at: https://arc.codes/docs/en/reference/runtime-helpers/python#arc.events',
}
},
}

let deno = lang => `// ${copy[lang].view_docs_js}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/http/handlers.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let copy = {
hello: 'Hello, Enhancener!',
get_started: 'Get started by editing this file at:',
view_docs: 'View documentation at:',
}
},
}

function html (lang, handlerFile) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_create/page/handlers.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
let copy = {
en: {
view_docs: 'View documentation at: https://enhance.dev/docs/learn/starter-project/pages',
}
},
}

let javascript = lang => `// ${copy[lang].view_docs}
Expand Down
16 changes: 8 additions & 8 deletions src/commands/generate/_create/page/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ function addImport ({ tokens, path, name }) {
'type': 'ImportDefaultSpecifier',
'local': {
'type': 'Identifier',
'name': name
}
}
'name': name,
},
},
],
'source': {
'type': 'Literal',
'value': `./${filename}`,
'raw': `'./${filename}'`
}
'raw': `'./${filename}'`,
},
})
return tokens
}
Expand All @@ -70,16 +70,16 @@ function addElement ({ tokens, path, name }) {
'key': {
'type': 'Literal',
'value': `${tagName}`,
'raw': `'${tagName}'`
'raw': `'${tagName}'`,
},
'computed': false,
'value': {
'type': 'Identifier',
'name': name
'name': name,
},
'kind': 'init',
'method': false,
'shorthand': false
'shorthand': false,
})
return token
}
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_validate/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ let errors = {
en: {
no_project: 'No project found in this directory, please run: `npx enhance new app`',
only_app_dot_arc: 'Only app.arc files are supported',
}
},
}

module.exports = function error (lang, err) {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/_validate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ function project (params) {

module.exports = function validate (params) {
return {
project: project(params)
project: project(params),
}
}
4 changes: 2 additions & 2 deletions src/commands/generate/generators/_generate/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function addRouteSource ({ manifest, replacements = {}, writeFile, command }) {
sourceFiles.forEach(file => {
let dir = dirname(file.target).replace('<ROUTE_NAME>', routeName)
mkdirSync(dir, { recursive: true })
// eslint-disable-next-line

let source = require(`../${command}/${file.src}`)
writeFile(file.target.replace('<ROUTE_NAME>', routeName), source(replacements))
})
Expand All @@ -26,5 +26,5 @@ export default ${element.name}

module.exports = {
addElements,
addRouteSource
addRouteSource,
}
2 changes: 1 addition & 1 deletion src/commands/generate/generators/api/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function error ({ lang }) {
no_path: 'API path not found, please run with -p or --path',
invalid_path: `Invalid API path`,
api_exists: 'API already exists',
}
},
}
return Error(errors[lang][err])
}
Expand Down
8 changes: 4 additions & 4 deletions src/commands/generate/generators/api/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ module.exports = {
{
name: 'Create a new API route with path parameter',
example: `npx enhance gen api --path '/notes/$id'`,
}
]
}
},
],
},
}
}
},
}
4 changes: 2 additions & 2 deletions src/commands/generate/generators/auth/action.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = async function action (params, utils, command) {
node ./scripts/seed-users.js`
writeFile(prefsFile, prefs)
}
else if (!project.localPreferences['sandbox-startup'].includes('node ./scripts/seed-users.js')){
else if (!project.localPreferences['sandbox-startup'].includes('node ./scripts/seed-users.js')) {
prefs = prefs.replace('@sandbox-startup', `@sandbox-startup
node ./scripts/seed-users.js`)
writeFile(prefsFile, prefs)
Expand All @@ -50,7 +50,7 @@ node ./scripts/seed-users.js`)
schema,
},
command,
utils
utils,
})
}
}
2 changes: 1 addition & 1 deletion src/commands/generate/generators/auth/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = function error (params) {
let errors = {
en: {
oauth_plugin_already_installed: 'The OAuth plugin is already installed',
}
},
}
return Error(errors[lang][err])
}
Expand Down
6 changes: 3 additions & 3 deletions src/commands/generate/generators/auth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ module.exports = {
{
name: 'Basic Usage',
example: 'npx enhance generate auth',
}
]
},
],
},
}
}
},
}
6 changes: 3 additions & 3 deletions src/commands/generate/generators/auth/magic-manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ let manifest = {
{ name: 'LinkElement', package: '@enhance/form-elements', tagName: 'enhance-link' },
{ name: 'PageContainer', package: '@enhance/form-elements', tagName: 'enhance-page-container' },
{ name: 'SubmitButton', package: '@enhance/form-elements', tagName: 'enhance-submit-button' },
{ name: 'TextInput', package: '@enhance/form-elements', tagName: 'enhance-text-input' }
{ name: 'TextInput', package: '@enhance/form-elements', tagName: 'enhance-text-input' },
],
dependencies: [
'@begin/[email protected]',
'@enhance/form-elements'
'@enhance/form-elements',
],
devDependencies: []
devDependencies: [],
}

module.exports = manifest
4 changes: 2 additions & 2 deletions src/commands/generate/generators/auth/oauth-manifest.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ let manifest = {
elements: [
],
dependencies: [
'arc-plugin-oauth'
]
'arc-plugin-oauth',
],
}

module.exports = manifest
28 changes: 14 additions & 14 deletions src/commands/generate/generators/auth/users-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ let modelName = {
singular: 'user',
capSingular: 'User',
plural: 'users',
capPlural: 'Users'
capPlural: 'Users',
}
let routeName = 'users'
let schema = {
Expand All @@ -11,14 +11,14 @@ let schema = {
required: [ 'email' ],
properties: {
firstname: {
type: 'string'
type: 'string',
},
lastname: {
type: 'string'
type: 'string',
},
email: {
type: 'string',
format: 'email'
format: 'email',
},
roles: {
type: 'object',
Expand All @@ -28,28 +28,28 @@ let schema = {
enum: [
'',
'admin',
'member'
]
'member',
],
},
role2: {
type: 'string',
enum: [
'',
'admin',
'member'
]
'member',
],
},
role3: {
type: 'string',
enum: [
'',
'admin',
'member'
]
}
}
}
}
'member',
],
},
},
},
},
}

module.exports = { modelName, routeName, schema }
2 changes: 1 addition & 1 deletion src/commands/generate/generators/element/action.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function validateElementName (name) {
'font-face-uri',
'font-face-format',
'font-face-name',
'missing-glyph'
'missing-glyph',
])

let isPotentialCustomElementName = require('is-potential-custom-element-name')
Expand Down
2 changes: 1 addition & 1 deletion src/commands/generate/generators/element/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = function error (params) {
en: {
no_name: 'Element name not found, please run with -n or --name',
invalid_name: `The supplied element name is invalid and can\'t be used.\nSee: https://html.spec.whatwg.org/multipage/scripting.html#valid-custom-element-name`,
}
},
}
return Error(errors[lang][err])
}
Expand Down
Loading

0 comments on commit 395b61e

Please sign in to comment.