From e0af1ea804c954bd7c2442c4c5854d8ea0777517 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Tue, 30 Apr 2024 15:40:59 +0300 Subject: [PATCH 1/5] feat: update for Quasar v2.16+ specs --- generator/index.js | 2 +- lib/loader.js.transform-quasar-imports.js | 10 +++++++++- lib/loader.vue.auto-import-quasar.js | 10 +++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/generator/index.js b/generator/index.js index 587731a..ca54d61 100644 --- a/generator/index.js +++ b/generator/index.js @@ -33,7 +33,7 @@ module.exports = (api, opts) => { hasTS = fs.existsSync(tsPath) const dependencies = { - quasar: '^2.0.0', + quasar: '^2.16.0', '@quasar/extras': '^1.0.0' } diff --git a/lib/loader.js.transform-quasar-imports.js b/lib/loader.js.transform-quasar-imports.js index 153334d..a279c0f 100644 --- a/lib/loader.js.transform-quasar-imports.js +++ b/lib/loader.js.transform-quasar-imports.js @@ -1,8 +1,16 @@ const getDevlandFile = require('./get-devland-file') -const importTransformation = getDevlandFile('quasar/dist/transforms/import-transformation.js') +const importMap = getDevlandFile('quasar/dist/transforms/import-map.json') const regex = /import\s*\{([\w,\s]+)\}\s*from\s*['"]{1}quasar['"]{1}/g +function importTransformation (importName) { + const file = importMap[ importName ] + if (file === void 0) { + throw new Error('Unknown import from Quasar: ' + importName) + } + return 'quasar/' + file +} + module.exports = function (content, map) { const newContent = content.replace( regex, diff --git a/lib/loader.vue.auto-import-quasar.js b/lib/loader.vue.auto-import-quasar.js index 2e28800..fdb8225 100644 --- a/lib/loader.vue.auto-import-quasar.js +++ b/lib/loader.vue.auto-import-quasar.js @@ -4,8 +4,16 @@ const stringifyRequest = require('loader-utils/lib/stringifyRequest') const getDevlandFile = require('./get-devland-file') const autoImportData = getDevlandFile('quasar/dist/transforms/auto-import.json') -const importTransformation = getDevlandFile('quasar/dist/transforms/import-transformation.js') const autoImportRuntimePath = require.resolve('./runtime.auto-import.js') +const importMap = getDevlandFile('quasar/dist/transforms/import-map.json') + +function importTransformation (importName) { + const file = importMap[ importName ] + if (file === void 0) { + throw new Error('Unknown import from Quasar: ' + importName) + } + return 'quasar/' + file +} const compRegex = { 'kebab': new RegExp(autoImportData.regex.kebabComponents || autoImportData.regex.components, 'g'), From 6c8bd32cc42396894424d09729f720bac81c638d Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Mon, 6 May 2024 18:47:23 +0300 Subject: [PATCH 2/5] chore: Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8208f2b..e372914 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-cli-plugin-quasar", - "version": "5.0.2", + "version": "5.1.0", "description": "Quasar Framework v2 plugin for Vue CLI v5", "main": "index.js", "scripts": { From 84bf70c9883437c265c43f69b64e550137fe5c09 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Tue, 17 Sep 2024 13:17:49 +0300 Subject: [PATCH 3/5] feat: upgrade deps to be installed on host --- generator/index.js | 6 +++--- index.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/generator/index.js b/generator/index.js index ca54d61..7cede62 100644 --- a/generator/index.js +++ b/generator/index.js @@ -44,13 +44,13 @@ module.exports = (api, opts) => { if (['sass', 'scss'].includes(opts.quasar.cssPreprocessor)) { Object.assign(deps.devDependencies, { - 'sass': '1.32.12', - 'sass-loader': '^12.0.0' + 'sass': '^1.78.0', + 'sass-loader': '^14.2.1' }) } if (opts.quasar.rtlSupport) { - deps.devDependencies['postcss-rtl'] = '^3.5.3' + deps.devDependencies['postcss-rtl'] = '^5.4.0' } api.extendPackage(deps) diff --git a/index.js b/index.js index 94c00db..cec31bf 100644 --- a/index.js +++ b/index.js @@ -68,7 +68,8 @@ module.exports = (api, options) => { __QUASAR_SSR__: false, __QUASAR_SSR_SERVER__: false, __QUASAR_SSR_CLIENT__: false, - __QUASAR_SSR_PWA__: false + __QUASAR_SSR_PWA__: false, + __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false }]) chain.performance.maxEntrypointSize(512000) From 2c9d700ba51d535fb5304a09378b64f9f91fc430 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Tue, 17 Sep 2024 13:18:26 +0300 Subject: [PATCH 4/5] chore: Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e372914..bb204a3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-cli-plugin-quasar", - "version": "5.1.0", + "version": "5.1.1", "description": "Quasar Framework v2 plugin for Vue CLI v5", "main": "index.js", "scripts": { From f62679571cd5f59f4d3f287eb25f4082288bcd95 Mon Sep 17 00:00:00 2001 From: Razvan Stoenescu Date: Tue, 17 Sep 2024 13:21:14 +0300 Subject: [PATCH 5/5] fix: correctly specify postcss-rtlcss instead of postcss-rtl --- generator/index.js | 2 +- generator/templates/rtl/_postcssrc.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generator/index.js b/generator/index.js index 7cede62..f97b1d3 100644 --- a/generator/index.js +++ b/generator/index.js @@ -50,7 +50,7 @@ module.exports = (api, opts) => { } if (opts.quasar.rtlSupport) { - deps.devDependencies['postcss-rtl'] = '^5.4.0' + deps.devDependencies['postcss-rtlcss'] = '^5.4.0' } api.extendPackage(deps) diff --git a/generator/templates/rtl/_postcssrc.js b/generator/templates/rtl/_postcssrc.js index 4759ab9..818be30 100644 --- a/generator/templates/rtl/_postcssrc.js +++ b/generator/templates/rtl/_postcssrc.js @@ -4,7 +4,7 @@ const plugins = [ if (process.env.QUASAR_RTL) { plugins.push( - require('postcss-rtl')({}) + require('postcss-rtlcss')({}) ) } diff --git a/package.json b/package.json index bb204a3..d63c3b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-cli-plugin-quasar", - "version": "5.1.1", + "version": "5.1.2", "description": "Quasar Framework v2 plugin for Vue CLI v5", "main": "index.js", "scripts": {