CHANGELOG.md

@@ -5,6 +5,74 @@
 
 
 
+
+
+
+## 1.6.27 (2023-01-09)
+
+#### :rocket: New Features
+* `mpx-cli`, `vue-cli-plugin-mpx-mp`, `vue-cli-plugin-mpx-web`, `vue-cli-plugin-mpx`
+  * [#64](https://github.com/mpx-ecology/mpx-cli/pull/64) Feature/mpx env ([@mater1996](https://github.com/mater1996))
+
+#### Committers: 1
+- Mater ([@mater1996](https://github.com/mater1996))
+
+
+
+
+
+
+## 1.6.25 (2022-12-29)
+
+#### :bug: Bug Fix
+* `vue-cli-plugin-mpx-mp`
+  * [#63](https://github.com/mpx-ecology/mpx-cli/pull/63) fix: copy plugin target mode path error ([@mater1996](https://github.com/mater1996))
+
+#### Committers: 1
+- Mater ([@mater1996](https://github.com/mater1996))
+
+
+
+
+
+
+## 1.6.23 (2022-12-22)
+
+#### :bug: Bug Fix
+* `vue-cli-plugin-mpx-mp`, `vue-cli-plugin-mpx-web`, `vue-cli-plugin-mpx`
+  * [#62](https://github.com/mpx-ecology/mpx-cli/pull/62) Fix: 更改output.path导致linkfile失效。 ([@mater1996](https://github.com/mater1996))
+
+#### Committers: 1
+- Mater ([@mater1996](https://github.com/mater1996))
+
+
+
+## 1.6.22 (2022-12-06)
+
+#### :bug: Bug Fix
+* `vue-cli-plugin-mpx-mp`
+  * [#61](https://github.com/mpx-ecology/mpx-cli/pull/61) fix: webpack mode ([@mater1996](https://github.com/mater1996))
+
+#### Committers: 1
+- Mater ([@mater1996](https://github.com/mater1996))
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ## 1.6.17-0 (2022-12-02)
 
 #### :rocket: New Features

README.md

@@ -35,6 +35,8 @@
 npm i @mpxjs/cli -g
 ```
 
+> 如果插件版本是2.x以上，需要前往https://github.com/mpx-ecology/mpx-cli/tree/next  查看文档
+
 ## 使用
 
 ```sh
@@ -67,6 +69,7 @@ npm run build
 
   --targets    编译到小程序目标(默认值: wx)
   --mode       指定环境模式 (默认值：production)
+  --env        自定义 __mpx_env__
   --watch      监听文件变化
   --report     生成包分析报告
   --open-child-process 开启子进程编译
@@ -95,6 +98,7 @@ mpx-cli-service build:mp --targets=wx,ali
 选项:
 
   --targets    编译到小程序目标(默认值: wx)
+  --env        自定义 __mpx_env__
   --open-child-process 开启子进程编译
 ```
 
@@ -114,6 +118,7 @@ mpx-cli-service serve:mp --targets=wx,ali
   --dest        指定输出目录 (默认值：dist)
   --modern      面向现代浏览器带自动回退地构建应用
   --target      app | lib | wc | wc-async (默认值：app)
+  --env         自定义 __mpx_env__
   --name        库或 Web Components 模式下的名字 (默认值：package.json 中的 "name" 字段或入口文件名)
   --no-clean    在构建项目之前不清除目标目录的内容
   --report      生成 report.html 以帮助分析包内容
@@ -139,6 +144,7 @@ mpx-cli-service build:web
   --host    指定 host (默认值：0.0.0.0)
   --port    指定 port (默认值：8080)
   --https   使用 https (默认值：false)
+  --env     自定义 __mpx_env__
 ```
 
 ```sh
@@ -187,8 +193,10 @@ module.exports = {
 
 可根据构建平台和开发环境进行选择性的配置，在构建过程中暴露出来的环境变量包括：
 
-- `MPX_CLI_MODE`: `mp` | `web`
-- `NODE_ENV`：`development` | `production`
+- `MPX_CLI_MODE`: 'mp' | 'web'
+- `NODE_ENV`：'development' | 'production'
+- `MPX_CURRENT_TARGET_MODE`: 'wx' | 'ali' | 'swan' | 'qq' | 'tt' | 'dd'
+- `MPX_CURRENT_TARGET_ENV` : 'development' | 'production'
 
 ```javascript
 // vue.config.js

lerna.json

@@ -17,5 +17,5 @@
       "PR: Underlying Tools": ":hammer: Underlying Tools"
     }
   },
-  "version": "1.6.18"
+  "version": "1.6.30"
 }

package.json

@@ -41,5 +41,5 @@
     "trailingComma": "none",
     "singleQuote": true
   },
-  "version": "1.6.18"
+  "version": "1.6.30"
 }

packages/mpx-cli-service/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/mpx-cli-service",
-  "version": "1.6.18",
+  "version": "1.6.30",
   "description": "local service for mpx-cli project",
   "main": "lib/Service.js",
   "bin": {

packages/mpx-cli/bin/mpx.js

@@ -63,6 +63,7 @@ program
   .description('inspect the webpack config in a project with mpx-cli-service')
   .option('--mode <mode>')
   .option('--targets <targets>')
+  .option('--env <env>', 'custom define __mpx_env__')
   .option('-v --verbose', 'Show full function definitions in output')
   .action((paths, options) => {
     require('../lib/inspect')(paths, options, 'mp')
@@ -72,6 +73,7 @@ program
   .command('inspect:web [paths...]')
   .description('inspect the webpack config in a project with mpx-cli-service')
   .option('--mode <mode>')
+  .option('--env <env>', 'custom define __mpx_env__')
   .option('--rule <ruleName>', 'inspect a specific module rule')
   .option('--plugin <pluginName>', 'inspect a specific plugin')
   .option('--rules', 'list all module rule names')

packages/mpx-cli/lib/inspect.js

@@ -24,6 +24,7 @@ module.exports = function inspect (paths, args, mode) {
       `inspect:${mode}`,
       ...(args.mode ? ['--mode', args.mode] : []),
       ...(args.targets ? ['--targets', args.targets] : []),
+      ...(args.env ? ['--env', args.env] : []),
       ...(args.rule ? ['--rule', args.rule] : []),
       ...(args.plugin ? ['--plugin', args.plugin] : []),
       ...(args.rules ? ['--rules'] : []),

packages/vue-cli-plugin-mpx-cloud-func/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/vue-cli-plugin-mpx-cloud-func",
-  "version": "1.6.18",
+  "version": "1.6.30",
   "description": "mp cloud func plugin for mpx",
   "main": "index.js",
   "scripts": {

packages/vue-cli-plugin-mpx-e2e-test/generator/index.js

@@ -9,15 +9,15 @@ module.exports = function (api, options = {}) {
 
   api.extendPackage({
     devDependencies: {
-      jest: '^27.4.5',
-      '@types/jest': '^27.5.1'
+      jest: '^27.4.5'
     }
   })
 
   if (needTs) {
     api.extendPackage({
       devDependencies: {
-        'ts-jest': '^27.1.2'
+        'ts-jest': '^27.1.2',
+        '@types/jest': '^27.5.1'
       }
     })
   }

packages/vue-cli-plugin-mpx-e2e-test/generator/template-typescript/e2e/components/list.spec.ts

@@ -26,7 +26,7 @@ describe('index', () => {
     // 断言页面标签
     expect(desc.tagName).toBe('view')
     // 断言文字内容
-    expect(await desc.text()).toContain('this is mpx project')
+    expect(await desc.text()).toContain('手机')
     // 保存页面快照
     await miniProgram.screenshot({
       path: 'e2e/screenshot/homePage.png'

packages/vue-cli-plugin-mpx-e2e-test/generator/template/e2e/components/list.spec.js

@@ -26,7 +26,7 @@ describe('index', () => {
     // 断言页面标签
     expect(desc.tagName).toBe('view')
     // 断言文字内容
-    expect(await desc.text()).toContain('this is mpx project')
+    expect(await desc.text()).toContain('手机')
     // 保存页面快照
     await miniProgram.screenshot({
       path: 'e2e/screenshot/homePage.png'

packages/vue-cli-plugin-mpx-e2e-test/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/vue-cli-plugin-mpx-e2e-test",
-  "version": "1.6.18",
+  "version": "1.6.30",
   "description": "e2e plugin for mpx",
   "main": "index.js",
   "scripts": {

packages/vue-cli-plugin-mpx-eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/vue-cli-plugin-mpx-eslint",
-  "version": "1.6.18",
+  "version": "1.6.30",
   "description": "eslint plugin for mpx-cli",
   "main": "index.js",
   "scripts": {

packages/vue-cli-plugin-mpx-mp/commands/build.js

@@ -19,11 +19,13 @@ module.exports = function registerBuildCommand (api, options) {
         '--targets': `compile for target platform, support ${MODE.SUPPORT_MODE}`,
         '--watch': 'compile in watch mode',
         '--report': 'generate report.html to help analyze bundle content',
-        '--open-child-process': 'open child process'
+        '--open-child-process': 'open child process',
+        '--env': 'custom define __mpx_env__'
       }
     },
     function (args, rawArgv) {
       const watch = !!args.watch
+      const customMpxEnv = args.env
       const mode = api.service.mode
       const targets = getTargets(args, options)
       const openChildProcess =
@@ -44,12 +46,12 @@ module.exports = function registerBuildCommand (api, options) {
         options,
         targets,
         (webpackConfig, target) => {
-          const env = target.env
-          if (env === 'production' || env === 'development') {
-            webpackConfig.mode(env)
-            webpackConfig.plugin('mpx-define-plugin').tap(() => [
+          const targetEnv = target.env
+          if (targetEnv === 'production' || targetEnv === 'development') {
+            webpackConfig.mode(targetEnv === 'production' ? targetEnv : 'none')
+            webpackConfig.plugin('define').tap((args) => [
               {
-                'process.env.NODE_ENV': `"${env}"`
+                'process.env.NODE_ENV': `"${targetEnv}"`
               }
             ])
           }
@@ -58,6 +60,12 @@ module.exports = function registerBuildCommand (api, options) {
               .plugin('bundle-analyzer-plugin')
               .use(BundleAnalyzerPlugin, [{}])
           }
+          if (customMpxEnv) {
+            webpackConfig.plugin('mpx-webpack-plugin').tap((args) => {
+              args[0].env = customMpxEnv
+              return args
+            })
+          }
           // 仅在watch模式下生产sourcemap
           // 百度小程序不开启sourcemap，开启会有模板渲染问题
           webpackConfig.devtool(

packages/vue-cli-plugin-mpx-mp/commands/inspect.js

@@ -14,19 +14,20 @@ module.exports = function registerInspectCommand (api, options) {
     function (args) {
       const targets = getTargets(args, options)
       const { verbose } = args
+      const customMpxEnv = args.env
 
       // 小程序业务代码构建配置
       const res = resolveWebpackConfigByTargets(
         api,
         options,
         targets,
         (webpackConfig, target) => {
-          const env = target.env
-          if (env === 'production' || env === 'development') {
-            webpackConfig.mode(env)
-            webpackConfig.plugin('mpx-define-plugin').tap((args) => [
+          const targetEnv = target.env
+          if (targetEnv === 'production' || targetEnv === 'development') {
+            webpackConfig.mode(targetEnv === 'production' ? targetEnv : 'none')
+            webpackConfig.plugin('define').tap((args) => [
               {
-                'process.env.NODE_ENV': `"${env}"`
+                'process.env.NODE_ENV': `"${targetEnv}"`
               }
             ])
           }
@@ -35,6 +36,12 @@ module.exports = function registerInspectCommand (api, options) {
               .plugin('bundle-analyzer-plugin')
               .use(BundleAnalyzerPlugin, [{}])
           }
+          if (customMpxEnv) {
+            webpackConfig.plugin('mpx-webpack-plugin').tap((args) => {
+              args[0].env = customMpxEnv
+              return args
+            })
+          }
         }
       )
       const output = toString(res, { verbose })

packages/vue-cli-plugin-mpx-mp/commands/serve.js

@@ -15,11 +15,14 @@ module.exports = function registerServeCommand (api, options) {
       description: 'mp development',
       usage: 'mpx-cli-service serve:mp',
       options: {
-        '--targets': `compile for target platform, support ${MODE.SUPPORT_MODE}`
+        '--targets': `compile for target platform, support ${MODE.SUPPORT_MODE}`,
+        '--open-child-process': 'open child process',
+        '--env': 'custom define __mpx_env__'
       }
     },
     function (args, rawArgv) {
       const mode = api.service.mode
+      const customMpxEnv = args.env
       const targets = getTargets(args, options)
       const openChildProcess =
         !!args['open-child-process'] && targets.length > 1
@@ -30,7 +33,10 @@ module.exports = function registerServeCommand (api, options) {
       )
 
       if (openChildProcess) {
-        return runWebpackInChildProcess('serve:mp', rawArgv, { targets, watch: true })
+        return runWebpackInChildProcess('serve:mp', rawArgv, {
+          targets,
+          watch: true
+        })
       }
 
       // 小程序业务代码构建配置
@@ -40,11 +46,17 @@ module.exports = function registerServeCommand (api, options) {
         targets,
         (webpackConfig) => {
           webpackConfig.devtool('source-map')
+          if (customMpxEnv) {
+            webpackConfig.plugin('mpx-webpack-plugin').tap((args) => {
+              args[0].env = customMpxEnv
+              return args
+            })
+          }
         }
       )
       return runWebpack(webpackConfigs, {
         watch: true
-      }).then(res => {
+      }).then((res) => {
         symLinkTargetConfig(api, targets, webpackConfigs)
         return res
       })