@mpxjs/cli 3.4.1 → 3.4.3

package/__tests__/preset.spec.js

@@ -79,6 +79,31 @@ test('normal-nocross', async () => {
   expect(staticAliDir).toBe(false)
 })
 
+test('test-eslint', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-normal-eslint'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      cross: true,
+      plugins: {},
+      useConfigFiles: true,
+      needEslint: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-eslint')
+})
+
 test('test-ts', async () => {
   const cwd = path.resolve(__dirname, '../../test')
   const name = 'test-ts'
@@ -278,6 +303,7 @@ test('test-typescript', async () => {
   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'
@@ -302,3 +328,29 @@ test('test-ssr', async () => {
   const pkg = require(path.resolve(cwd, name, 'package.json'))
   expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-ssr')
 })
+
+test('test-rn', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-rn'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      needRn: true,
+      needTs: true,
+      cross: true,
+      plugins: {},
+      useConfigFiles: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx')
+})

package/__tests__/theme.spec.js

@@ -0,0 +1,31 @@
+jest.mock('inquirer')
+const path = require('path')
+const create = require('@mpxjs/cli/lib/create')
+
+test('test-theme', async () => {
+  const cwd = path.resolve(__dirname, '../../test')
+  const name = 'test-theme'
+  await create(
+    name,
+    {
+      force: true,
+      git: false,
+      cwd
+    },
+    {
+      srcMode: 'wx',
+      appid: 'test',
+      description: 'test',
+      cross: true,
+      plugins: {
+        '@mpxjs/vue-cli-plugin-mpx-theme': {
+          version: '2.1.4'
+        }
+      },
+      useConfigFiles: true
+    }
+  )
+
+  const pkg = require(path.resolve(cwd, name, 'package.json'))
+  expect(pkg.devDependencies).toHaveProperty('@mpxjs/vue-cli-plugin-mpx-theme')
+})

package/lib/create.js

@@ -17,6 +17,7 @@ const { clearConsole } = require('@vue/cli/lib/util/clearConsole')
 const merge = require('lodash.merge')
 const prompts = require('./prompts')
 const builtInPreset = require('./preset')
+const { createRnProject } = require('./createRn')
 
 async function resolvePreset (args = {}) {
   const { p, preset, c, clone } = args
@@ -81,14 +82,10 @@ async function create (projectName, options, preset = null) {
   preset.cssPreprocessor = 'stylus'
 
   // mpx cli 插件
-  preset.plugins = Object.assign(
-    {},
-    preset.plugins,
-    builtInPreset.plugins
-  )
+  preset.plugins = Object.assign({}, preset.plugins, builtInPreset.plugins)
 
   // 合并问答中的preset
-  prompts.forEach(v => {
+  prompts.forEach((v) => {
     if (preset[v.name]) {
       merge(preset, v.preset)
     }
@@ -172,6 +169,7 @@ async function create (projectName, options, preset = null) {
       cloudFunc: preset.cloudFunc,
       cross: preset.cross,
       needSSR: preset.needSSR,
+      needRn: preset.needRn,
       name
     })
   })
@@ -196,6 +194,10 @@ async function create (projectName, options, preset = null) {
     preset: undefined,
     inlinePreset: JSON.stringify(preset)
   })
+
+  if (!process.env.VUE_CLI_TEST && preset.needRn) {
+    await createRnProject(targetDir, options)
+  }
 }
 
 module.exports = function (...args) {

package/lib/createRn.js

@@ -0,0 +1,82 @@
+const { hasYarn, hasPnpm3OrLater, execa } = require('@vue/cli-shared-utils')
+const path = require('path')
+const fs = require('fs-extra')
+const { loadOptions } = require('@vue/cli/lib/options')
+const PackageManager = require('@vue/cli/lib/util/ProjectPackageManager')
+
+const RN_DEP = {
+  '@ant-design/icons-react-native': '^2.3.2',
+  '@ant-design/react-native': '^5.2.2',
+  '@d11/react-native-fast-image': '^8.6.12',
+  '@react-native-async-storage/async-storage': '^1.24.0',
+  '@react-native-clipboard/clipboard': '^1.14.2',
+  '@react-native-community/netinfo': '^11.3.2',
+  '@react-native-masked-view/masked-view': '^0.3.1',
+  '@react-native/assets-registry': '^0.75.2',
+  '@react-native/gradle-plugin': '^0.75.2',
+  '@react-navigation/elements': '^1.3.31',
+  '@react-navigation/native': '^6.1.18',
+  '@react-navigation/native-stack': '^6.11.0',
+  '@react-navigation/stack': '^6.0.0',
+  expo: '^51.0.32',
+  'expo-brightness': '~12.0.1',
+  'expo-clipboard': '~6.0.3',
+  react: '18.3.1',
+  'react-native': '0.75.2',
+  'react-native-collapsible': '^1.6.1',
+  'react-native-device-info': '^11.1.0',
+  'react-native-gesture-handler': '^2.18.1',
+  'react-native-get-location': '^5.0.0',
+  'react-native-haptic-feedback': '^2.3.3',
+  'react-native-linear-gradient': '^2.8.3',
+  'react-native-maps': '^1.18.0',
+  'react-native-modal-popover': '^2.1.3',
+  'react-native-reanimated': '3.15.0',
+  'react-native-root-siblings': '^5.0.1',
+  'react-native-safe-area-context': '^4.10.9',
+  'react-native-screens': '^3.34.0',
+  'react-native-webview': '^13.12.1'
+}
+
+async function createRnProject (targetDir, options) {
+  const rnProjectPath = path.resolve(targetDir, 'ReactNativeProject')
+  const packageManager =
+    options.packageManager ||
+    loadOptions().packageManager ||
+    (hasYarn() ? 'yarn' : null) ||
+    (hasPnpm3OrLater() ? 'pnpm' : 'npm')
+  const pm = new PackageManager({
+    context: rnProjectPath,
+    forcePackageManager: packageManager
+  })
+  await execa(
+    'npx',
+    [
+      '@react-native-community/cli',
+      'init',
+      'ReactNativeProject',
+      '--pm',
+      pm.bin,
+      '--skip-install',
+      true,
+      '--skip-git-init',
+      true
+    ],
+    { stdio: 'inherit', cwd: targetDir }
+  )
+  const pkgPath = path.resolve(targetDir, 'ReactNativeProject', 'package.json')
+  const pkg = require(pkgPath)
+  Object.assign(pkg.dependencies, RN_DEP)
+  Object.assign(pkg.scripts, {
+    'bundle:ios': 'react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ./ios/main.jsbundle --assets-dest ./ios',
+    'bundle:android': 'react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/'
+  })
+  fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2))
+  await pm.install()
+  await execa('npx', ['install-expo-modules'], {
+    stdio: 'inherit',
+    cwd: rnProjectPath
+  })
+}
+
+module.exports.createRnProject = createRnProject

package/lib/preset.js

@@ -9,9 +9,6 @@ module.exports = {
     },
     '@mpxjs/vue-cli-plugin-mpx': {
       version: '^2.0.0'
-    },
-    '@mpxjs/vue-cli-plugin-mpx-eslint': {
-      version: '^2.0.0'
     }
   }
 }

package/lib/prompts.js

@@ -17,8 +17,15 @@ module.exports = [
     default: true
   },
   {
-    name: 'needSSR',
+    name: 'needRn',
     when: ({ srcMode }) => srcMode === 'wx',
+    message: '是否需要输出react-native',
+    type: 'confirm',
+    default: false
+  },
+  {
+    name: 'needSSR',
+    when: ({ srcMode, cross }) => srcMode === 'wx' && cross === true,
     message: '是否需要 web ssr',
     type: 'confirm',
     default: false,
@@ -59,6 +66,19 @@ module.exports = [
       }
     }
   },
+  {
+    name: 'needEslint',
+    type: 'confirm',
+    message: '是否需要eslint',
+    default: true,
+    preset: {
+      plugins: {
+        [`${prefix}-eslint`]: {
+          version: '^2.0.0'
+        }
+      }
+    }
+  },
   {
     name: 'needTs',
     type: 'confirm',
@@ -72,7 +92,6 @@ module.exports = [
       }
     }
   },
-
   {
     name: 'needUtilityFirstCSS',
     type: 'confirm',

package/package.json

@@ -30,5 +30,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
-  "version": "3.4.1"
+  "version": "3.4.3"
 }