feat(build): add compatibility for future version 2.1 of "@quasar/app"

freddy38510 · Sep 10, 2020 · afd9e25 · afd9e25
1 parent 5cc76c4
commit afd9e25
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -58,6 +58,7 @@
     "pify": "5.0.0",
     "route-cache": "0.4.5",
     "selfsigned": "1.10.7",
+    "semver": "7.3.2",
     "upath": "1.2.0",
     "webpack-merge": "5.1.4",
     "workbox-build": "5.1.4"

diff --git a/src/bin/ssg-generate.js b/src/bin/ssg-generate.js
@@ -9,6 +9,7 @@ const parseArgs = require('minimist')
 const appRequire = require('./../helpers/app-require')
 const { fatal } = require('./../helpers/logger')
 const ensureBuild = require('../build/ensureBuild')
+const semverGte = require('semver/functions/gte')
 
 const argv = parseArgs(process.argv.slice(2), {
   alias: {
@@ -36,7 +37,8 @@ if (argv.help) {
 }
 
 module.exports = async function run (api) {
-  const QuasarConfig = appRequire('@quasar/app/lib/quasar-config', api.appDir)
+  const isVersionUp = semverGte(api.getPackageVersion('@quasar/app'), '2.1.0')
+  const QuasarConfig = appRequire(isVersionUp ? '@quasar/app/lib/quasar-conf-file' : '@quasar/app/lib/quasar-config', api.appDir)
   const getQuasarCtx = appRequire('@quasar/app/lib/helpers/get-quasar-ctx', api.appDir)
   const extensionRunner = appRequire('@quasar/app/lib/app-extension/extensions-runner', api.appDir)
 
@@ -65,5 +67,5 @@ module.exports = async function run (api) {
 
   await ensureBuild(api, quasarConfig, ctx, extensionRunner, argv['force-build'])
 
-  await require('./../generate')(api, quasarConfig.getBuildConfig())
+  await require('./../generate')(api, isVersionUp ? quasarConfig.quasarConf : quasarConfig.getBuildConfig())
 }
diff --git a/src/build/ensureBuild.js b/src/build/ensureBuild.js
@@ -5,9 +5,11 @@ const upath = require('upath')
 const build = require('./')
 const { log } = require('./../helpers/logger')
 const { snapshot, compareSnapshots } = require('./snapshot')
+const semverGte = require('semver/functions/gte')
 
 module.exports = async function ensureBuild (api, quasarConfig, ctx, extensionRunner, forceBuild = false) {
-  const quasarConf = quasarConfig.getBuildConfig()
+  const isVersionUp = semverGte(api.getPackageVersion('@quasar/app'), '2.1.0')
+  const quasarConf = isVersionUp ? quasarConfig.quasarConf : quasarConfig.getBuildConfig()
   const options = quasarConf.ssg
 
   if (options.cache === false || forceBuild) {

diff --git a/src/build/index.js b/src/build/index.js
@@ -4,6 +4,7 @@ const pify = require('pify')
 const appRequire = require('../helpers/app-require')
 const banner = require('./../helpers/banner').build
 const { log, warn } = require('./../helpers/logger')
+const semverGte = require('semver/functions/gte')
 
 function splitConfig (webpackConfig) {
   return [
@@ -35,8 +36,11 @@ module.exports = async function build (api, quasarConfig, ctx, extensionRunner)
   const regenerateTypesFeatureFlags = appRequire('@quasar/app/lib/helpers/types-feature-flags', api.appDir)
 
   const generator = new Generator(quasarConfig)
-  const webpackConfig = quasarConfig.getWebpackConfig()
-  const buildConfig = quasarConfig.getBuildConfig()
+
+  const isVersionUp = semverGte(api.getPackageVersion('@quasar/app'), '2.1.0')
+
+  const webpackConfig = isVersionUp ? quasarConfig.quasarConf : quasarConfig.getWebpackConfig()
+  const buildConfig = isVersionUp ? quasarConfig.webpackConf : quasarConfig.getBuildConfig()
 
   regenerateTypesFeatureFlags(buildConfig)