@cocojs/cli 0.1.0-beta.20 → 0.1.0-beta.22

package/README.md

@@ -0,0 +1,3 @@
+# coconut-framework [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/cocojs-org/coconut-framework/blob/main/LICENSE)
+
+`@cocojs/cli`属于[coconut-framework](https://github.com/cocojs-org/coconut-framework)代码仓，更多内容见[cocojs.dev](https://cocojs.dev)。

package/dist/index.js

@@ -4,10 +4,7 @@ var child_process = require('child_process');
 var path = require('path');
 var process$1 = require('node:process');
 var path$1 = require('node:path');
-var rollup = require('rollup');
-var typescript = require('@rollup/plugin-typescript');
-var babel = require('@rollup/plugin-babel');
-var cocojs = require('@cocojs/rollup-plugin-mvc');
+var bundleRollup = require('@cocojs/bundle-rollup');
 var fs = require('node:fs');
 
 function _arrayLikeToArray(r, a) {
@@ -520,7 +517,7 @@ function _getRollupConfig() {
 }
 var build = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-    var config, result;
+    var config;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -529,41 +526,14 @@ var build = /*#__PURE__*/function () {
         case 1:
           config = _context.v;
           _context.n = 2;
-          return rollup.rollup({
+          return bundleRollup.bundle({
             input: path$1.join(process$1.cwd(), './src/index.ts'),
-            plugins: [cocojs(config[ValidProp.cocojs]), typescript({
-              compilerOptions: {
-                target: 'ESNext',
-                lib: ['dom', 'esnext'],
-                declaration: true,
-                declarationDir: './dist/types',
-                jsx: 'preserve',
-                resolveJsonModule: true,
-                plugins: [{
-                  transform: '@cocojs/type-extractor',
-                  transformProgram: true
-                }]
-              }
-            }), babel({
-              extensions: ['.js', '.jsx', '.ts', '.tsx'],
-              plugins: [[require.resolve('@babel/plugin-proposal-decorators'), {
-                version: '2023-11'
-              }], [require.resolve('@babel/plugin-transform-react-jsx', {
-                paths: [path$1.resolve(__dirname, '..', '../node_modules')]
-              }), {
-                runtime: 'automatic',
-                importSource: '@cocojs/mvc'
-              }]]
-            })]
-          });
+            output: {
+              file: path$1.join(process$1.cwd(), './dist/index.esm.js'),
+              format: 'es'
+            }
+          }, config[ValidProp.cocojs]);
         case 2:
-          result = _context.v;
-          _context.n = 3;
-          return result.write({
-            file: path$1.join(process$1.cwd(), './dist/index.esm.js'),
-            format: 'es'
-          });
-        case 3:
           return _context.a(2);
       }
     }, _callee);

package/dist/webpack-process/index.js

@@ -1,12 +1,10 @@
 'use strict';
 
 var process$1 = require('node:process');
-var Webpack = require('webpack');
-var WebpackDevServer = require('webpack-dev-server');
+var bundleWebpack = require('@cocojs/bundle-webpack');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var path = require('node:path');
 var fs = require('node:fs');
-var webpackMerge = require('webpack-merge');
 
 function asyncGeneratorStep(n, t, e, r, o, a, c) {
   try {
@@ -55,47 +53,6 @@ function _defineProperty(e, r, t) {
     writable: true
   }) : e[r] = t, e;
 }
-function ownKeys(e, r) {
-  var t = Object.keys(e);
-  if (Object.getOwnPropertySymbols) {
-    var o = Object.getOwnPropertySymbols(e);
-    r && (o = o.filter(function (r) {
-      return Object.getOwnPropertyDescriptor(e, r).enumerable;
-    })), t.push.apply(t, o);
-  }
-  return t;
-}
-function _objectSpread2(e) {
-  for (var r = 1; r < arguments.length; r++) {
-    var t = null != arguments[r] ? arguments[r] : {};
-    r % 2 ? ownKeys(Object(t), true).forEach(function (r) {
-      _defineProperty(e, r, t[r]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
-      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
-    });
-  }
-  return e;
-}
-function _objectWithoutProperties(e, t) {
-  if (null == e) return {};
-  var o,
-    r,
-    i = _objectWithoutPropertiesLoose(e, t);
-  if (Object.getOwnPropertySymbols) {
-    var n = Object.getOwnPropertySymbols(e);
-    for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
-  }
-  return i;
-}
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (-1 !== e.indexOf(n)) continue;
-    t[n] = r[n];
-  }
-  return t;
-}
 function _regenerator() {
   /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
   var e,
@@ -282,32 +239,6 @@ function _readWebpack() {
 var buildInConfig = {
   mode: 'production',
   entry: path.join(process.cwd(), './src/.coco/index.tsx'),
-  module: {
-    rules: [{
-      test: /\.tsx?$/,
-      use: [{
-        loader: require.resolve('babel-loader'),
-        options: {
-          plugins: [[require.resolve('@babel/plugin-proposal-decorators'), {
-            version: '2023-11'
-          }], [require.resolve('@babel/plugin-transform-react-jsx'), {
-            runtime: 'automatic',
-            importSource: '@cocojs/mvc'
-          }]]
-        }
-      }, {
-        loader: require.resolve('ts-loader'),
-        options: {
-          context: process.cwd(),
-          // TODO: 如果开启类型检查的话，编译过程会比较慢，待优化，试试看：fork-ts-checker-webpack-plugin
-          transpileOnly: true
-        }
-      }, {
-        loader: require.resolve('@cocojs/webpack-loader-mvc')
-      }],
-      exclude: /node_modules/
-    }]
-  },
   resolveLoader: {
     modules: [path.resolve(__dirname, '../../node_modules'), 'node_modules']
   },
@@ -355,61 +286,37 @@ function _getWebpackConfig() {
           return readWebpack(cmd);
         case 2:
           envConfig = _context2.v;
-          return _context2.a(2, webpackMerge.merge(buildInConfig, baseConfig, envConfig));
+          return _context2.a(2, [buildInConfig, baseConfig, envConfig]);
       }
     }, _callee2);
   }));
   return _getWebpackConfig.apply(this, arguments);
 }
 
-var _excluded = ["devServer"];
 var WebpackBuilder = /*#__PURE__*/function () {
   function WebpackBuilder() {
     _classCallCheck(this, WebpackBuilder);
-    _defineProperty(this, "server", void 0);
+    // server: WebpackDevServer;
+    _defineProperty(this, "stopDev", void 0);
   }
   return _createClass(WebpackBuilder, [{
     key: "build",
     value: function () {
-      var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+      var _build = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+        var config;
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
-              return _context2.a(2, new Promise(/*#__PURE__*/function () {
-                var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(resolve, reject) {
-                  var config, compiler;
-                  return _regenerator().w(function (_context) {
-                    while (1) switch (_context.n) {
-                      case 0:
-                        _context.n = 1;
-                        return getWebpackConfig('build');
-                      case 1:
-                        config = _context.v;
-                        compiler = Webpack(config);
-                        compiler.run(function (err, stats) {
-                          console.log(stats.toString({
-                            chunks: false,
-                            // 使构建过程更静默无输出
-                            colors: true // 在控制台展示颜色
-                          }));
-                          if (stats.hasErrors()) {
-                            reject(err);
-                          } else {
-                            resolve();
-                          }
-                          compiler.close(function (err) {});
-                        });
-                      case 2:
-                        return _context.a(2);
-                    }
-                  }, _callee);
-                }));
-                return function (_x, _x2) {
-                  return _ref.apply(this, arguments);
-                };
-              }()));
+              _context.n = 1;
+              return getWebpackConfig('build');
+            case 1:
+              config = _context.v;
+              _context.n = 2;
+              return bundleWebpack.bundle(config);
+            case 2:
+              return _context.a(2);
           }
-        }, _callee2);
+        }, _callee);
       }));
       function build() {
         return _build.apply(this, arguments);
@@ -419,28 +326,27 @@ var WebpackBuilder = /*#__PURE__*/function () {
   }, {
     key: "startServer",
     value: function () {
-      var _startServer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-        var _yield$getWebpackConf, devServer, config, compiler, devServerOptions;
-        return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+      var _startServer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        var config;
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              _context3.n = 1;
-              return getWebpackConfig('dev');
+              if (!this.stopDev) {
+                _context2.n = 1;
+                break;
+              }
+              console.warn('已经启动了一个 dev 服务了。');
+              return _context2.a(2);
             case 1:
-              _yield$getWebpackConf = _context3.v;
-              devServer = _yield$getWebpackConf.devServer;
-              config = _objectWithoutProperties(_yield$getWebpackConf, _excluded);
-              compiler = Webpack(config);
-              devServerOptions = _objectSpread2(_objectSpread2({}, devServer), {}, {
-                open: true
-              });
-              this.server = new WebpackDevServer(devServerOptions, compiler);
-              _context3.n = 2;
-              return this.server.start();
+              _context2.n = 2;
+              return getWebpackConfig('dev');
             case 2:
-              return _context3.a(2);
+              config = _context2.v;
+              this.stopDev = bundleWebpack.startDev(config);
+            case 3:
+              return _context2.a(2);
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
       function startServer() {
         return _startServer.apply(this, arguments);
@@ -450,22 +356,24 @@ var WebpackBuilder = /*#__PURE__*/function () {
   }, {
     key: "stopServer",
     value: function () {
-      var _stopServer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+      var _stopServer = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+        return _regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
-              if (!this.server) {
-                _context4.n = 2;
+              if (!this.stopDev) {
+                _context3.n = 2;
                 break;
               }
-              _context4.n = 1;
-              return this.server.stop();
+              _context3.n = 1;
+              return this.stopDev();
             case 1:
-              this.server = null;
+              this.stopDev = null;
+              _context3.n = 2;
+              break;
             case 2:
-              return _context4.a(2);
+              return _context3.a(2);
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
       function stopServer() {
         return _stopServer.apply(this, arguments);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cocojs/cli",
   "description": "命令行工具，支持开发和构建功能",
-  "version": "0.1.0-beta.20",
+  "version": "0.1.0-beta.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -27,25 +27,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/generator": "^7.26.5",
-    "@babel/plugin-proposal-decorators": "^7.25.9",
-    "@babel/plugin-transform-react-jsx": "^7.25.9",
-    "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-typescript": "^12.1.2",
-    "babel-loader": "^10.0.0",
     "chokidar": "^4.0.3",
     "fs-extra": "^11.2.0",
     "html-webpack-plugin": "^5.6.3",
-    "rollup": "^4.36.0",
-    "ts-loader": "^9.5.2",
-    "webpack": "^5.98.0",
-    "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.0",
-    "webpack-merge": "^6.0.1",
-    "@cocojs/rollup-plugin-mvc": "0.0.1-alpha.7",
-    "@cocojs/type-extractor": "0.0.16",
-    "@cocojs/webpack-loader-mvc": "0.0.1-alpha.7"
+    "@cocojs/bundle-rollup": "0.0.1-beta.9",
+    "@cocojs/bundle-webpack": "0.0.1-beta.9"
   },
   "devDependencies": {
     "@types/node": "^22.15.18"

package/runtime-config/tsconfig.json

@@ -7,11 +7,5 @@
         "allowSyntheticDefaultImports": true,
         "jsx": "preserve",
         "resolveJsonModule": true,
-        "plugins": [
-            {
-                "transform": "@cocojs/type-extractor",
-                "transformProgram": true
-            }
-        ]
     }
 }