umi 4.0.0-beta.1 → 4.0.0-beta.10

package/bin/forkedDev.js

@@ -0,0 +1,4 @@
+#!/usr/bin/env node
+
+require('v8-compile-cache');
+require('../dist/cli/forkedDev');

package/bin/umi.js

@@ -0,0 +1,9 @@
+#!/usr/bin/env node
+
+require('v8-compile-cache');
+require('../dist/cli/cli')
+  .run()
+  .catch((e) => {
+    console.error(e);
+    process.exit(1);
+  });

package/dist/cli/cli.d.ts

@@ -1 +1,5 @@
+interface IOpts {
+    presets?: string[];
+}
+export declare function run(opts?: IOpts): Promise<void>;
 export {};

package/dist/cli/cli.js

@@ -9,43 +9,50 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
 const utils_1 = require("@umijs/utils");
 const constants_1 = require("../constants");
 const service_1 = require("../service/service");
 const dev_1 = require("./dev");
 const node_1 = require("./node");
-(0, node_1.checkVersion)();
-(0, node_1.checkLocal)();
-(0, node_1.setNodeTitle)();
-(0, node_1.setNoDeprecation)();
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    const args = (0, utils_1.yParser)(process.argv.slice(2), {
-        alias: {
-            version: ['v'],
-            help: ['h'],
-        },
-        boolean: ['version'],
-    });
-    const command = args._[0];
-    if ([constants_1.DEV_COMMAND, 'setup'].includes(command)) {
-        process.env.NODE_ENV = 'development';
-    }
-    else if (command === 'build') {
-        process.env.NODE_ENV = 'production';
-    }
-    if (command === constants_1.DEV_COMMAND) {
-        (0, dev_1.dev)();
-    }
-    else {
-        try {
-            yield new service_1.Service().run2({
-                name: args._[0],
-                args,
-            });
+function run(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        (0, node_1.checkVersion)();
+        (0, node_1.checkLocal)();
+        (0, node_1.setNodeTitle)();
+        (0, node_1.setNoDeprecation)();
+        const args = (0, utils_1.yParser)(process.argv.slice(2), {
+            alias: {
+                version: ['v'],
+                help: ['h'],
+            },
+            boolean: ['version'],
+        });
+        const command = args._[0];
+        if ([constants_1.DEV_COMMAND, 'setup'].includes(command)) {
+            process.env.NODE_ENV = 'development';
+        }
+        else if (command === 'build') {
+            process.env.NODE_ENV = 'production';
+        }
+        if (opts === null || opts === void 0 ? void 0 : opts.presets) {
+            process.env.UMI_PRESETS = opts.presets.join(',');
         }
-        catch (e) {
-            utils_1.logger.error(e);
-            process.exit(1);
+        if (command === constants_1.DEV_COMMAND) {
+            (0, dev_1.dev)();
         }
-    }
-}))();
+        else {
+            try {
+                yield new service_1.Service().run2({
+                    name: args._[0],
+                    args,
+                });
+            }
+            catch (e) {
+                utils_1.logger.error(e);
+                process.exit(1);
+            }
+        }
+    });
+}
+exports.run = run;

package/dist/cli/node.js

@@ -12,7 +12,7 @@ function checkVersion() {
 }
 exports.checkVersion = checkVersion;
 function checkLocal() {
-    if (__filename.includes('packages/umi')) {
+    if (__filename.includes(`packages/${constants_1.FRAMEWORK_NAME}`)) {
         utils_1.logger.info('@local');
     }
 }

package/dist/index.d.ts

@@ -1,3 +1,5 @@
 import { IServicePluginAPI, PluginAPI } from '@umijs/core';
+import * as utils from '@umijs/utils';
 export declare type IApi = PluginAPI & IServicePluginAPI;
 export * from './service/service';
+export { utils };

package/dist/index.js

@@ -6,8 +6,23 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.utils = void 0;
+const utils = __importStar(require("@umijs/utils"));
+exports.utils = utils;
 __exportStar(require("./service/service"), exports);

package/dist/service/service.js

@@ -19,10 +19,7 @@ class Service extends core_1.Service {
     constructor(opts) {
         process.env.UMI_DIR = (0, path_1.dirname)(require.resolve('../../package'));
         const cwd = (0, cwd_1.getCwd)();
-        super(Object.assign(Object.assign({}, opts), { env: process.env.NODE_ENV, cwd, defaultConfigFiles: constants_1.DEFAULT_CONFIG_FILES, frameworkName: constants_1.FRAMEWORK_NAME, presets: [
-                require.resolve('@umijs/preset-built-in'),
-                ...((opts === null || opts === void 0 ? void 0 : opts.presets) || []),
-            ], plugins: [
+        super(Object.assign(Object.assign({}, opts), { env: process.env.NODE_ENV, cwd, defaultConfigFiles: constants_1.DEFAULT_CONFIG_FILES, frameworkName: constants_1.FRAMEWORK_NAME, presets: [require.resolve('@umijs/preset-umi'), ...((opts === null || opts === void 0 ? void 0 : opts.presets) || [])], plugins: [
                 (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.ts')) && (0, path_1.join)(cwd, 'plugin.ts'),
                 (0, fs_1.existsSync)((0, path_1.join)(cwd, 'plugin.js')) && (0, path_1.join)(cwd, 'plugin.js'),
             ].filter(Boolean) }));

package/index.d.ts

@@ -1,3 +1,3 @@
-export type { IApi } from '@umijs/preset-built-in';
+export type { IApi } from '@umijs/preset-umi';
 export * from '@umijs/renderer-react';
 export * from './dist/index';

package/package.json

@@ -1,15 +1,26 @@
 {
   "name": "umi",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.10",
   "description": "umi",
+  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
+  "bugs": "https://github.com/umijs/umi-next/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/umijs/umi-next"
+  },
+  "license": "MIT",
   "main": "dist/index.js",
   "module": "index.esm.js",
   "types": "index.d.ts",
+  "bin": {
+    "umi": "bin/umi.js"
+  },
   "files": [
     "dist",
     "index.d.ts",
     "index.esm.js",
-    "client"
+    "client",
+    "bin"
   ],
   "scripts": {
     "build": "pnpm tsc",
@@ -17,24 +28,17 @@
     "build:deps": "pnpm esno ../../scripts/bundleDeps.ts",
     "dev": "pnpm build -- --watch"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/umijs/umi-next"
+  "dependencies": {
+    "@umijs/core": "4.0.0-beta.10",
+    "@umijs/preset-umi": "4.0.0-beta.10",
+    "@umijs/renderer-react": "4.0.0-beta.10",
+    "@umijs/utils": "4.0.0-beta.10",
+    "v8-compile-cache": "2.3.0"
   },
-  "authors": [
-    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
-  ],
-  "license": "MIT",
-  "bugs": "https://github.com/umijs/umi-next/issues",
-  "homepage": "https://github.com/umijs/umi-next/tree/master/packages/umi#readme",
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "@umijs/core": "4.0.0-beta.1",
-    "@umijs/preset-built-in": "4.0.0-beta.1",
-    "@umijs/renderer-react": "4.0.0-beta.1",
-    "@umijs/utils": "4.0.0-beta.1",
-    "v8-compile-cache": "2.3.0"
-  }
+  "authors": [
+    "chencheng <sorrycc@gmail.com> (https://github.com/sorrycc)"
+  ]
 }