@cocojs/cli 0.0.1-alpha.1 → 0.0.1-alpha.10

package/dist/index.js

@@ -8,6 +8,7 @@ var rollup = require('rollup');
 var typescript = require('@rollup/plugin-typescript');
 var babel = require('@rollup/plugin-babel');
 var cocojs = require('@cocojs/rollup-plugin-mvc');
+var fs = require('node:fs');
 
 function _arrayLikeToArray(r, a) {
   (null == a || a > r.length) && (a = r.length);
@@ -216,6 +217,15 @@ function _toPropertyKey(t) {
   var i = _toPrimitive(t, "string");
   return "symbol" == typeof i ? i : i + "";
 }
+function _typeof(o) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
+}
 function _unsupportedIterableToArray(r, a) {
   if (r) {
     if ("string" == typeof r) return _arrayLikeToArray(r, a);
@@ -409,16 +419,118 @@ function _buildApp() {
   return _buildApp.apply(this, arguments);
 }
 
+var cmdDefaultEnvMap = {
+  dev: 'dev',
+  build: 'prod'
+};
+var defaultConfigName = 'config.js';
+/**
+ * 得到构建配置的名称
+ */
+var configFileName = function configFileName(cmd) {
+  var env = process$1.env.NODE_ENV || cmdDefaultEnvMap[cmd] || '';
+  return env ? "config.".concat(env, ".js") : defaultConfigName;
+};
+
+var ValidProp;
+(function (ValidProp) {
+  ValidProp["cocojs"] = "cocojs";
+})(ValidProp || (ValidProp = {}));
+function readRollup(_x) {
+  return _readRollup.apply(this, arguments);
+} // 目前 rollup 的配置仅支持简单的自定义，后续有需求再增强
+function _readRollup() {
+  _readRollup = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(cmd) {
+    var _yield$import, _content$rollup;
+    var filename, filepath, content, _t, _t2, _t3;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          filename = cmd ? configFileName(cmd) : defaultConfigName;
+          filepath = path$1.resolve(process$1.cwd(), "config/".concat(filename));
+          if (fs.existsSync(filepath)) {
+            _context2.n = 1;
+            break;
+          }
+          console.warn("\u914D\u7F6E\u6587\u4EF6\u4E0D\u5B58\u5728\uFF1A".concat(filepath));
+          return _context2.a(2, {});
+        case 1:
+          _context2.n = 2;
+          return import(filepath);
+        case 2:
+          _t2 = _yield$import = _context2.v;
+          _t = _t2 === null;
+          if (_t) {
+            _context2.n = 3;
+            break;
+          }
+          _t = _yield$import === void 0;
+        case 3:
+          if (!_t) {
+            _context2.n = 4;
+            break;
+          }
+          _t3 = void 0;
+          _context2.n = 5;
+          break;
+        case 4:
+          _t3 = _yield$import["default"];
+        case 5:
+          content = _t3;
+          return _context2.a(2, (_content$rollup = content === null || content === void 0 ? void 0 : content.rollup) !== null && _content$rollup !== void 0 ? _content$rollup : {});
+      }
+    }, _callee2);
+  }));
+  return _readRollup.apply(this, arguments);
+}
+function mergeRollupConfig(config1, config2) {
+  var validKeys = [ValidProp.cocojs];
+  var _config1 = {};
+  var _config2 = {};
+  for (var _i = 0, _validKeys = validKeys; _i < _validKeys.length; _i++) {
+    var key = _validKeys[_i];
+    _config1[key] = _typeof(config1) === 'object' || config1 !== null ? config1[key] : undefined;
+    _config2[key] = _typeof(config2) === 'object' || config2 !== null ? config2[key] : undefined;
+  }
+  return Object.assign({}, _config1, _config2);
+}
+function getRollupConfig() {
+  return _getRollupConfig.apply(this, arguments);
+}
+function _getRollupConfig() {
+  _getRollupConfig = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+    var baseConfig, envConfig;
+    return _regenerator().w(function (_context3) {
+      while (1) switch (_context3.n) {
+        case 0:
+          _context3.n = 1;
+          return readRollup();
+        case 1:
+          baseConfig = _context3.v;
+          _context3.n = 2;
+          return readRollup('build');
+        case 2:
+          envConfig = _context3.v;
+          return _context3.a(2, mergeRollupConfig(baseConfig, envConfig));
+      }
+    }, _callee3);
+  }));
+  return _getRollupConfig.apply(this, arguments);
+}
 var build = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-    var result;
+    var config, result;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
           _context.n = 1;
+          return getRollupConfig();
+        case 1:
+          config = _context.v;
+          _context.n = 2;
           return rollup.rollup({
             input: path$1.join(process$1.cwd(), './src/index.ts'),
-            plugins: [cocojs(), typescript({
+            plugins: [cocojs(config[ValidProp.cocojs]), typescript({
               compilerOptions: {
                 target: 'ESNext',
                 lib: ['dom', 'esnext'],
@@ -443,14 +555,14 @@ var build = /*#__PURE__*/function () {
               }]]
             })]
           });
-        case 1:
+        case 2:
           result = _context.v;
-          _context.n = 2;
+          _context.n = 3;
           return result.write({
             file: path$1.join(process$1.cwd(), './dist/index.esm.js'),
             format: 'es'
           });
-        case 2:
+        case 3:
           return _context.a(2);
       }
     }, _callee);

package/dist/webpack-process/index.js

@@ -288,7 +288,6 @@ var buildInConfig = {
       use: [{
         loader: require.resolve('babel-loader'),
         options: {
-          presets: [require.resolve('@babel/preset-typescript')],
           plugins: [[require.resolve('@babel/plugin-proposal-decorators'), {
             version: '2023-11'
           }], [require.resolve('@babel/plugin-transform-react-jsx'), {
@@ -302,6 +301,8 @@ var buildInConfig = {
           context: process.cwd(),
           transpileOnly: false
         }
+      }, {
+        loader: require.resolve('@cocojs/webpack-loader-mvc')
       }],
       exclude: /node_modules/
     }]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cocojs/cli",
   "description": "命令行工具，支持开发和构建功能",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.10",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": {
@@ -31,7 +31,6 @@
     "@babel/generator": "^7.26.5",
     "@babel/plugin-proposal-decorators": "^7.25.9",
     "@babel/plugin-transform-react-jsx": "^7.25.9",
-    "@babel/preset-typescript": "^7.26.0",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-typescript": "^12.1.2",
     "babel-loader": "^10.0.0",
@@ -44,7 +43,8 @@
     "webpack-cli": "^6.0.1",
     "webpack-dev-server": "^5.2.0",
     "webpack-merge": "^6.0.1",
-    "@cocojs/rollup-plugin-mvc": "0.0.1-alpha.3",
+    "@cocojs/rollup-plugin-mvc": "0.0.1-alpha.5",
+    "@cocojs/webpack-loader-mvc": "0.0.1-alpha.2",
     "@cocojs/type-extractor": "0.0.16"
   },
   "devDependencies": {