diff --git a/generator/index.js b/generator/index.js index 587731a..f97b1d3 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' } @@ -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-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/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) 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'), diff --git a/package.json b/package.json index 8208f2b..d63c3b2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-cli-plugin-quasar", - "version": "5.0.2", + "version": "5.1.2", "description": "Quasar Framework v2 plugin for Vue CLI v5", "main": "index.js", "scripts": {