@mpxjs/cli 3.3.3 → 3.4.0

package/__tests__/preset.spec.js

@@ -228,3 +228,77 @@ test('test-e2e', async () => {
   const pkg = require(path.resolve(cwd, name, 'package.json'))
   expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-e2e-test')
 })
+
+test('test-unocss', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-unocss'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      cross: true,
+      needUtilityFirstCSS: true,
+      plugins: {},
+      useConfigFiles: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-utility-first-css')
+})
+
+test('test-typescript', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-typescript'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      cross: true,
+      needTs: true,
+      plugins: {},
+      useConfigFiles: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-typescript')
+})
+test('test-ssr', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-ssr'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      cross: true,
+      needSSR: true,
+      plugins: {},
+      useConfigFiles: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-ssr')
+})

package/lib/create.js

@@ -48,6 +48,21 @@ async function resolvePrompts () {
   return inquirer.prompt(prompts).then((answers) => answers)
 }
 
+async function mergePreset (preset, options) {
+  if (options.preset) {
+    const remotePreset = await resolvePreset(options)
+    merge(preset, remotePreset)
+  } else if (options.inlinePreset) {
+    try {
+      const inlinePreset = JSON.parse(options.inlinePreset)
+      merge(preset, inlinePreset)
+    } catch (error) {
+      error(`CLI inline preset is not valid JSON: ${options.inlinePreset}`)
+      exit(1)
+    }
+  }
+  return preset
+}
 /**
  * 从vue-cli clone 下来，方便处理creator的创建以及生命周期管理
  * @param {*} projectName
@@ -58,18 +73,9 @@ async function resolvePrompts () {
 async function create (projectName, options, preset = null) {
   // resolve preset
   if (!preset) {
-    if (options.preset) {
-      preset = await resolvePreset(options)
-    } else if (options.inlinePreset) {
-      try {
-        preset = JSON.parse(options.inlinePreset)
-      } catch (error) {
-        error(`CLI inline preset is not valid JSON: ${options.inlinePreset}`)
-        exit(1)
-      }
-    } else {
-      preset = await resolvePrompts()
-    }
+    // 默认回答
+    preset = await resolvePrompts()
+    await mergePreset(preset, options)
   }
   // css preprocessor
   preset.cssPreprocessor = 'stylus'
@@ -165,6 +171,7 @@ async function create (projectName, options, preset = null) {
       isPlugin: preset.isPlugin,
       cloudFunc: preset.cloudFunc,
       cross: preset.cross,
+      needSSR: preset.needSSR,
       name
     })
   })

package/lib/prompts.js

@@ -16,6 +16,20 @@ module.exports = [
     type: 'confirm',
     default: true
   },
+  {
+    name: 'needSSR',
+    when: ({ srcMode }) => srcMode === 'wx',
+    message: '是否需要 web ssr',
+    type: 'confirm',
+    default: false,
+    preset: {
+      plugins: {
+        [`${prefix}-ssr`]: {
+          version: '^2.0.0'
+        }
+      }
+    }
+  },
   {
     name: 'cloudFunc',
     when: ({ srcMode, cross }) => srcMode === 'wx' && cross === false,
@@ -58,6 +72,20 @@ module.exports = [
       }
     }
   },
+
+  {
+    name: 'needUtilityFirstCSS',
+    type: 'confirm',
+    message: '是否需要使用原子类',
+    default: false,
+    preset: {
+      plugins: {
+        [`${prefix}-utility-first-css`]: {
+          version: '^2.0.0'
+        }
+      }
+    }
+  },
   {
     name: 'needUnitTest',
     message: '是否需要单元测试',

package/package.json

@@ -29,5 +29,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "version": "3.3.3"
+  "version": "3.4.0"
 }