Skip to content

Commit 94ab7bd

Browse files
committed
chore(build): misc updates
1 parent e522186 commit 94ab7bd

File tree

13 files changed

+197
-134
lines changed

13 files changed

+197
-134
lines changed

ui/.eslintignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
docs
1+
/docs
2+
/dist
3+

ui/.eslintrc.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,15 @@ module.exports = {
77
parserOptions: {
88
parser: 'babel-eslint',
99
ecmaVersion: 2018, // Allows for the parsing of modern ECMAScript features
10-
sourceType: 'module' // Allows for the use of imports
10+
sourceType: 'module', // Allows for the use of imports
11+
ecmaFeatures: {
12+
jsx: true
13+
}
1114
},
1215

1316
env: {
14-
browser: true
17+
browser: true,
18+
es6: true
1519
},
1620

1721
// Rules order is important, please avoid shuffling them
@@ -29,9 +33,9 @@ module.exports = {
2933
'plugin:quasar/standard',
3034

3135
'standard'
32-
3336
],
3437

38+
// required to lint *.vue files
3539
plugins: [
3640
// https://eslint.vuejs.org/user-guide/#why-doesn-t-it-work-on-vue-file
3741
// required to lint *.vue files

ui/.gitignore

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Testing
2+
/test/jest/coverage
3+
4+
ui/yarn.lock
5+
ui/node_modules
6+
ui/dev/yarn.lock
7+
ui/dev/node_modules
8+
9+
demo/yarn.lock
10+
demo/node_modules
11+
12+
./dist

ui/build/build.api.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@ const path = require('path')
22
global.rootDir = path.resolve(__dirname, '..')
33
global.distDir = path.resolve(__dirname, '../dist')
44

5-
require('quasar-json-api')()
5+
require('quasar-json-api')({
6+
buildVetur: true,
7+
buildTypes: true
8+
})

ui/build/index.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
process.env.NODE_ENV = 'production'
22

33
const parallel = require('os').cpus().length > 1
4-
const runJob = parallel ? require('child_process').fork : require
5-
// const runJob = require
6-
const { join } = require('path')
4+
// const runJob = parallel ? require('child_process').fork : require
5+
// const { join } = require('path')
76
const { createFolder } = require('./utils')
87
const { green, blue } = require('chalk')
98

@@ -15,10 +14,9 @@ require('./script.clean.js')
1514
console.log(` 📦 Building ${green('v' + require('../package.json').version)}...${parallel ? blue(' [multi-threaded]') : ''}\n`)
1615

1716
createFolder('dist')
18-
createFolder('dist/icon-set')
19-
createFolder('dist/api')
20-
createFolder('dist/vetur')
2117

22-
runJob(join(__dirname, './icons/build.all.js'))
23-
runJob(join(__dirname, './script.javascript.js'))
24-
runJob(join(__dirname, './script.css.js'))
18+
require('./build.api.js')
19+
require('./script.javascript')
20+
require('./script.css')
21+
// runJob(join(__dirname, './script.javascript.js'))
22+
// runJob(join(__dirname, './script.css.js'))

ui/build/script.app-ext.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ module.exports.syncAppExt = function (both = true) {
2727

2828
// read app-ext package.json
2929
const appExtFile = resolvePath('app-extension/package.json')
30-
let appExtJson = require(appExtFile),
31-
finished = false
30+
const appExtJson = require(appExtFile)
31+
let finished = false
3232

3333
// sync version numbers
3434
if (both === true) {
@@ -56,5 +56,5 @@ module.exports.syncAppExt = function (both = true) {
5656
return
5757
}
5858

59-
console.error(` App Extension version and dependency NOT synced.\n`)
59+
console.error(' App Extension version and dependency NOT synced.\n')
6060
}

ui/build/script.clean.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ var
33
path = require('path')
44

55
rimraf.sync(path.resolve(__dirname, '../dist/*'))
6-
console.log(` 💥 Cleaned build artifacts.\n`)
6+
console.log(' 💥 Cleaned build artifacts.\n')

ui/build/script.css.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
/* eslint-disable array-bracket-spacing */
12
const path = require('path')
2-
const sass = require('node-sass')
3+
const sass = require('sass')
34
const postcss = require('postcss')
45
const cssnano = require('cssnano')
5-
const rtl = require('postcss-rtl')
6+
const rtl = require('rtlcss')
67
const autoprefixer = require('autoprefixer')
78

89
const buildConf = require('./config')
@@ -24,7 +25,7 @@ const nano = postcss([
2425

2526
Promise
2627
.all([
27-
generate('src/index.sass', `dist/index`)
28+
generate('src/index.sass', 'dist/index')
2829
])
2930
.catch(e => {
3031
console.error(e)
@@ -53,19 +54,19 @@ function generate (src, dest) {
5354
resolve(result.css)
5455
})
5556
})
56-
.then(code => buildConf.banner + code)
57-
.then(code => postCssCompiler.process(code, { from: void 0 }))
58-
.then(code => {
59-
code.warnings().forEach(warn => {
60-
console.warn(warn.toString())
57+
.then(code => buildConf.banner + code)
58+
.then(code => postCssCompiler.process(code, { from: void 0 }))
59+
.then(code => {
60+
code.warnings().forEach(warn => {
61+
console.warn(warn.toString())
62+
})
63+
return code.css
6164
})
62-
return code.css
63-
})
64-
.then(code => Promise.all([
65-
generateUMD(dest, code),
66-
postCssRtlCompiler.process(code, { from: void 0 })
67-
.then(code => generateUMD(dest, code.css, '.rtl'))
68-
]))
65+
.then(code => Promise.all([
66+
generateUMD(dest, code),
67+
postCssRtlCompiler.process(code, { from: void 0 })
68+
.then(code => generateUMD(dest, code.css, '.rtl'))
69+
]))
6970
}
7071

7172
function generateUMD (dest, code, ext = '') {

ui/build/script.javascript.js

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ const rollup = require('rollup')
55
const uglify = require('uglify-es')
66
const buble = require('@rollup/plugin-buble')
77
const json = require('@rollup/plugin-json')
8-
const cjs = require('@rollup/plugin-commonjs')
98
const { nodeResolve } = require('@rollup/plugin-node-resolve')
109

1110
const buildConf = require('./config')
@@ -20,27 +19,20 @@ const nodeResolveConfig = {
2019
preferBuiltins: false
2120
}
2221

23-
const cjsConfig = {
24-
include: [
25-
/node_modules/
26-
]
27-
}
28-
2922
const rollupPlugins = [
3023
nodeResolve(nodeResolveConfig),
3124
json(),
32-
cjs(cjsConfig),
3325
buble(bubleConfig)
3426
]
3527

3628
const builds = [
3729
{
3830
rollup: {
3931
input: {
40-
input: resolve('entry/index.esm.js')
32+
input: pathResolve('entry/index.esm.js')
4133
},
4234
output: {
43-
file: resolve('../dist/index.esm.js'),
35+
file: pathResolve('../dist/index.esm.js'),
4436
format: 'es'
4537
}
4638
},
@@ -52,10 +44,10 @@ const builds = [
5244
{
5345
rollup: {
5446
input: {
55-
input: resolve('entry/index.common.js')
47+
input: pathResolve('entry/index.common.js')
5648
},
5749
output: {
58-
file: resolve('../dist/index.common.js'),
50+
file: pathResolve('../dist/index.common.js'),
5951
format: 'cjs',
6052
exports: 'auto'
6153
}
@@ -68,11 +60,11 @@ const builds = [
6860
{
6961
rollup: {
7062
input: {
71-
input: resolve('entry/index.umd.js')
63+
input: pathResolve('entry/index.umd.js')
7264
},
7365
output: {
7466
name: 'QIconPicker',
75-
file: resolve('../dist/index.umd.js'),
67+
file: pathResolve('../dist/index.umd.js'),
7668
format: 'umd'
7769
}
7870
},
@@ -88,24 +80,21 @@ const builds = [
8880
addAssets(builds, 'icon-set', 'iconSet')
8981

9082
build(builds)
91-
.then(() => {
92-
require('./build.api')
93-
})
9483

9584
/**
9685
* Helpers
9786
*/
9887

99-
function resolve (_path) {
88+
function pathResolve (_path) {
10089
return path.resolve(__dirname, _path)
10190
}
10291

10392
// eslint-disable-next-line no-unused-vars
10493
function addAssets (builds, type, injectName) {
10594
const
106-
files = fs.readdirSync(resolve('../../ui/src/components/' + type)),
95+
files = fs.readdirSync(pathResolve('../../ui/src/components/' + type)),
10796
plugins = [buble(bubleConfig)],
108-
outputDir = resolve(`../dist/${type}`)
97+
outputDir = pathResolve(`../dist/${type}`)
10998

11099
fse.mkdirp(outputDir)
111100

@@ -116,11 +105,11 @@ function addAssets (builds, type, injectName) {
116105
builds.push({
117106
rollup: {
118107
input: {
119-
input: resolve(`../src/components/${type}/${file}`),
108+
input: pathResolve(`../src/components/${type}/${file}`),
120109
plugins
121110
},
122111
output: {
123-
file: addExtension(resolve(`../dist/${type}/${file}`), 'umd'),
112+
file: addExtension(pathResolve(`../dist/${type}/${file}`), 'umd'),
124113
format: 'umd',
125114
name: `QIconPicker.${injectName}.${name}`
126115
}
@@ -200,7 +189,7 @@ function buildEntry (config) {
200189
}
201190

202191
function injectVueRequirement (code) {
203-
// eslint-disable-next-line
192+
// eslint-disable-next-line quotes
204193
const index = code.indexOf(`Vue = Vue && Vue.hasOwnProperty('default') ? Vue['default'] : Vue`)
205194

206195
if (index === -1) {

0 commit comments

Comments
 (0)