Skip to content

Commit ae4005d

Browse files
committed
feat(app-webpack): linting
1 parent 48a4321 commit ae4005d

File tree

25 files changed

+115
-104
lines changed

25 files changed

+115
-104
lines changed

app-vite/lib/cmd/help.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ console.log(
88
if (process.env.QUASAR_CLI_VERSION) {
99
console.log(' Running @quasar/cli v' + process.env.QUASAR_CLI_VERSION)
1010
}
11-
console.log(' Running @quasar/app-vite v' + require('../package.json').version)
11+
console.log(' Running @quasar/app-vite v' + require('../../package.json').version)
1212

1313
console.log(`
1414
Example usage

app-vite/templates/entry/app.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@ import vueDevtools from '@vue/devtools'
1616
<% } %>
1717

1818
import { Quasar } from 'quasar'
19+
import { markRaw } from 'vue'
1920
import <%= metaConf.needsAppMountHook === true ? 'AppComponent' : 'RootComponent' %> from 'app/<%= sourceFiles.rootComponent %>'
2021

21-
<% if (store) { %>
22-
import createStore from 'app/<%= sourceFiles.store %>'
23-
import { markRaw } from 'vue'
24-
<% } %>
22+
<% if (store) { %>import createStore from 'app/<%= sourceFiles.store %>'<% } %>
2523
import createRouter from 'app/<%= sourceFiles.router %>'
2624

2725
<% if (ctx.mode.capacitor) { %>

app-webpack/.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
templates/

app-webpack/.eslintrc.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module.exports = {
2+
root: true,
3+
4+
parserOptions: {
5+
ecmaVersion: 2022,
6+
},
7+
8+
env: {
9+
node: true,
10+
},
11+
12+
extends: [
13+
'eslint:recommended',
14+
'plugin:node/recommended'
15+
],
16+
17+
rules: {
18+
'no-empty': 'off',
19+
'no-useless-escape': 'off',
20+
'no-unused-vars': ['error', { ignoreRestSiblings: true, argsIgnorePattern: '^_' }],
21+
22+
'no-process-exit': 'off',
23+
}
24+
}

app-webpack/bin/quasar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ if (cmd) {
6161
const exit = process.exit
6262
process.exit = (code, reason) => {
6363
if (reason === 'ext-missing') {
64-
require('./quasar-help')
64+
require('../lib/cmd/help')
6565
exit(0)
6666
}
6767
else {
@@ -77,4 +77,4 @@ else {
7777
cmd = 'help'
7878
}
7979

80-
require(`./quasar-${cmd}`)
80+
require(`../lib/cmd/${cmd}`)

app-webpack/bin/quasar-build renamed to app-webpack/lib/cmd/build.js

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env node
21

32
if (process.env.NODE_ENV === void 0) {
43
process.env.NODE_ENV = 'production'
@@ -90,25 +89,25 @@ if (argv.help) {
9089
process.exit(0)
9190
}
9291

93-
const ensureArgv = require('../lib/helpers/ensure-argv')
92+
const ensureArgv = require('../helpers/ensure-argv')
9493
ensureArgv(argv, 'build')
9594

96-
const ensureVueDeps = require('../lib/helpers/ensure-vue-deps')
95+
const ensureVueDeps = require('../helpers/ensure-vue-deps')
9796
ensureVueDeps()
9897

9998
console.log(
10099
require('fs').readFileSync(
101-
require('path').join(__dirname, '../assets/logo.art'),
100+
require('path').join(__dirname, '../../assets/logo.art'),
102101
'utf8'
103102
)
104103
)
105104

106-
const banner = require('../lib/helpers/banner')
105+
const banner = require('../helpers/banner')
107106
banner(argv, 'build')
108107

109-
const { log, fatal } = require('../lib/helpers/logger')
110-
const { printWebpackErrors } = require('../lib/helpers/print-webpack-issue')
111-
const { webpackNames, splitWebpackConfig } = require('../lib/webpack/symbols')
108+
const { log, fatal } = require('../helpers/logger')
109+
const { printWebpackErrors } = require('../helpers/print-webpack-issue')
110+
const { webpackNames, splitWebpackConfig } = require('../webpack/symbols')
112111

113112
const path = require('path')
114113
const webpack = require('webpack')
@@ -132,10 +131,10 @@ function finalizeBuild (mode, ctx, quasarConfFile) {
132131
let Runner
133132

134133
if (['cordova', 'capacitor'].includes(mode)) {
135-
Runner = require('../lib/' + mode)
134+
Runner = require('../' + mode)
136135
}
137136
else if (argv['skip-pkg'] !== true && mode === 'electron') {
138-
Runner = require('../lib/electron')
137+
Runner = require('../electron')
139138
}
140139

141140
if (Runner !== void 0) {
@@ -148,16 +147,16 @@ function finalizeBuild (mode, ctx, quasarConfFile) {
148147

149148
async function build () {
150149
if (argv.mode !== 'spa') {
151-
const installMissing = require('../lib/mode/install-missing')
150+
const installMissing = require('../mode/install-missing')
152151
await installMissing(argv.mode, argv.target)
153152
}
154153

155-
const QuasarConfFile = require('../lib/quasar-conf-file')
156-
const Generator = require('../lib/generator')
157-
const artifacts = require('../lib/artifacts')
158-
const getQuasarCtx = require('../lib/helpers/get-quasar-ctx')
159-
const extensionRunner = require('../lib/app-extension/extensions-runner')
160-
const regenerateTypesFeatureFlags = require('../lib/helpers/types-feature-flags')
154+
const QuasarConfFile = require('../quasar-conf-file')
155+
const Generator = require('../generator')
156+
const artifacts = require('../artifacts')
157+
const getQuasarCtx = require('../helpers/get-quasar-ctx')
158+
const extensionRunner = require('../app-extension/extensions-runner')
159+
const regenerateTypesFeatureFlags = require('../helpers/types-feature-flags')
161160

162161
const ctx = getQuasarCtx({
163162
mode: argv.mode,
@@ -210,7 +209,7 @@ async function build () {
210209
// can only know it after parsing the quasar.config.js file
211210
if (quasarConfFile.ctx.mode.pwa === true) {
212211
// need to build the custom service worker before renderer
213-
Runner = require('../lib/pwa')
212+
const Runner = require('../pwa')
214213
Runner.init(ctx)
215214
await Runner.build(quasarConfFile, argv)
216215
}
@@ -242,7 +241,7 @@ async function build () {
242241
fatal(`for "${webpackData.name[index]}" with ${summary}. Please check the log above.`, 'COMPILATION FAILED')
243242
})
244243

245-
const printWebpackStats = require('../lib/helpers/print-webpack-stats')
244+
const printWebpackStats = require('../helpers/print-webpack-stats')
246245

247246
console.log()
248247
statsArray.forEach((stats, index) => {

app-webpack/bin/quasar-clean renamed to app-webpack/lib/cmd/clean.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
#!/usr/bin/env node
21

32
const parseArgs = require('minimist')
43

5-
const { log } = require('../lib/helpers/logger')
4+
const { log } = require('../helpers/logger')
65

76
const argv = parseArgs(process.argv.slice(2), {
87
alias: {
@@ -23,7 +22,7 @@ if (argv.help) {
2322
process.exit(0)
2423
}
2524

26-
const Artifacts = require('../lib/artifacts')
25+
const Artifacts = require('../artifacts')
2726
Artifacts.cleanAll()
2827

2928
console.log()

app-webpack/bin/quasar-describe renamed to app-webpack/lib/cmd/describe.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
#!/usr/bin/env node
21

32
const parseArgs = require('minimist')
43
const chalk = require('chalk')
54

6-
const getApi = require('../lib/helpers/get-api')
7-
const { fatal } = require('../lib/helpers/logger')
5+
const getApi = require('../helpers/get-api')
6+
const { fatal } = require('../helpers/logger')
87

98
const partArgs = {
109
p: 'props',
@@ -251,7 +250,7 @@ function printSlots ({ slots }) {
251250
}
252251
}
253252

254-
function printEvents ({ events, behavior = {} }) {
253+
function printEvents ({ events }) {
255254
const keys = Object.keys(events || {})
256255

257256
console.log('\n ' + chalk.underline('Events'))
@@ -466,7 +465,7 @@ async function run () {
466465

467466
if (apiParts.docs) {
468467
if (api.meta && api.meta.docsUrl) {
469-
const openBrowser = require('../lib/helpers/open-browser')
468+
const openBrowser = require('../helpers/open-browser')
470469
openBrowser({ url: api.meta.docsUrl, wait: false })
471470
}
472471
else {
@@ -495,11 +494,10 @@ async function run () {
495494
}
496495

497496
function listElements () {
498-
const getDevlandFile = require('../lib/helpers/get-devland-file')
497+
const getDevlandFile = require('../helpers/get-devland-file')
499498
let api = getDevlandFile('quasar/dist/transforms/api-list.json')
500499

501500
if (api === void 0) {
502-
console.log(e)
503501
fatal(` Could not retrieve list...`)
504502
}
505503

app-webpack/bin/quasar-dev renamed to app-webpack/lib/cmd/dev.js

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
#!/usr/bin/env node
21

32
if (process.env.NODE_ENV === void 0) {
43
process.env.NODE_ENV = 'development'
54
}
65

76
const parseArgs = require('minimist')
87

9-
const { log, warn, fatal } = require('../lib/helpers/logger')
8+
const { log, warn, fatal } = require('../helpers/logger')
109

1110
const argv = parseArgs(process.argv.slice(2), {
1211
alias: {
@@ -77,23 +76,23 @@ if (argv.help) {
7776
process.exit(0)
7877
}
7978

80-
const ensureArgv = require('../lib/helpers/ensure-argv')
79+
const ensureArgv = require('../helpers/ensure-argv')
8180
ensureArgv(argv, 'dev')
8281

83-
const ensureVueDeps = require('../lib/helpers/ensure-vue-deps')
82+
const ensureVueDeps = require('../helpers/ensure-vue-deps')
8483
ensureVueDeps()
8584

8685
console.log(
8786
require('fs').readFileSync(
88-
require('path').join(__dirname, '../assets/logo.art'),
87+
require('path').join(__dirname, '../../assets/logo.art'),
8988
'utf8'
9089
)
9190
)
9291

93-
const banner = require('../lib/helpers/banner')
92+
const banner = require('../helpers/banner')
9493
banner(argv, 'dev')
9594

96-
const findPort = require('../lib/helpers/net').findClosestOpenPort
95+
const findPort = require('../helpers/net').findClosestOpenPort
9796

9897
async function parseAddress ({ host, port }) {
9998
if (this.chosenHost) {
@@ -103,7 +102,7 @@ async function parseAddress ({ host, port }) {
103102
['cordova', 'capacitor'].includes(argv.mode) &&
104103
(!host || ['0.0.0.0', 'localhost', '127.0.0.1', '::1'].includes(host.toLowerCase()))
105104
) {
106-
const getExternalIP = require('../lib/helpers/get-external-ip')
105+
const getExternalIP = require('../helpers/get-external-ip')
107106
host = await getExternalIP()
108107
this.chosenHost = host
109108
}
@@ -146,8 +145,8 @@ async function parseAddress ({ host, port }) {
146145
}
147146

148147
function startVueDevtools () {
149-
const { spawn } = require('../lib/helpers/spawn')
150-
const getPackagePath = require('../lib/helpers/get-package-path')
148+
const { spawn } = require('../helpers/spawn')
149+
const getPackagePath = require('../helpers/get-package-path')
151150

152151
let vueDevtoolsBin = getPackagePath('@vue/devtools/bin.js')
153152

@@ -161,7 +160,7 @@ function startVueDevtools () {
161160
return
162161
}
163162

164-
const nodePackager = require('../lib/helpers/node-packager')
163+
const nodePackager = require('../helpers/node-packager')
165164

166165
nodePackager.installPackage('@vue/devtools', { isDev: true })
167166

@@ -176,18 +175,18 @@ function startVueDevtools () {
176175

177176
async function goLive () {
178177
if (argv.mode !== 'spa') {
179-
const installMissing = require('../lib/mode/install-missing')
178+
const installMissing = require('../mode/install-missing')
180179
await installMissing(argv.mode, argv.target)
181180
}
182181

183182
const DevServer = argv.mode === 'ssr'
184-
? require('../lib/dev-server-ssr')
185-
: require('../lib/dev-server-regular')
186-
const QuasarConfFile = require('../lib/quasar-conf-file')
187-
const Generator = require('../lib/generator')
188-
const getQuasarCtx = require('../lib/helpers/get-quasar-ctx')
189-
const extensionRunner = require('../lib/app-extension/extensions-runner')
190-
const regenerateTypesFeatureFlags = require('../lib/helpers/types-feature-flags')
183+
? require('../dev-server-ssr')
184+
: require('../dev-server-regular')
185+
const QuasarConfFile = require('../quasar-conf-file')
186+
const Generator = require('../generator')
187+
const getQuasarCtx = require('../helpers/get-quasar-ctx')
188+
const extensionRunner = require('../app-extension/extensions-runner')
189+
const regenerateTypesFeatureFlags = require('../helpers/types-feature-flags')
191190

192191
const ctx = getQuasarCtx({
193192
mode: argv.mode,
@@ -246,7 +245,7 @@ async function goLive () {
246245
let runMode
247246

248247
if (['cordova', 'capacitor', 'electron', 'bex', 'pwa', 'ssr'].includes(argv.mode)) {
249-
const ModeRunner = require('../lib/' + (argv.mode === 'ssr' ? 'pwa' : argv.mode))
248+
const ModeRunner = require('../' + (argv.mode === 'ssr' ? 'pwa' : argv.mode))
250249
ModeRunner.init(ctx)
251250
runMode = () => ModeRunner.run(quasarConfFile, argv)
252251
}

app-webpack/bin/quasar-ext renamed to app-webpack/lib/cmd/ext.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#!/usr/bin/env node
21

32
const parseArgs = require('minimist')
43

@@ -43,7 +42,7 @@ if (argv.help) {
4342
process.exit(0)
4443
}
4544

46-
const { warn } = require('../lib/helpers/logger')
45+
const { warn } = require('../helpers/logger')
4746

4847
if (argv._.length !== 0 && argv._.length !== 2) {
4948
console.log()
@@ -53,7 +52,7 @@ if (argv._.length !== 0 && argv._.length !== 2) {
5352
}
5453

5554
async function run (action, name) {
56-
const Extension = require('../lib/app-extension/Extension')
55+
const Extension = require('../app-extension/Extension')
5756
const extension = new Extension(name)
5857

5958
await extension[
@@ -64,7 +63,7 @@ async function run (action, name) {
6463
}
6564

6665
if (argv._.length === 0) {
67-
const extensionJson = require('../lib/app-extension/extension-json')
66+
const extensionJson = require('../app-extension/extension-json')
6867
extensionJson.list()
6968
}
7069
else {

0 commit comments

Comments
 (0)