shuvi 0.0.1-rc.33

package/lib/cli/agent.d.ts

@@ -0,0 +1,5 @@
+declare type Command = (argv: string[]) => void;
+declare const args: string[];
+declare const cmdPath: string, commandArgs: string[];
+declare const mod: any;
+declare const cmd: Command;

package/lib/cli/agent.js

@@ -0,0 +1,24 @@
+"use strict";
+// fix yarn link with react hooks
+if (process.env.SHUVI__SECRET_FIX_LOCAL_RESOLVE) {
+    const path = require('path');
+    const resolveNodeModule = (req) => path.resolve(__dirname, '../../../../node_modules', req);
+    const BuiltinModule = require('module');
+    // Guard against poorly mocked module constructors
+    const Module = module.constructor.length > 1 ? module.constructor : BuiltinModule;
+    const oldResolveFilename = Module._resolveFilename;
+    Module._resolveFilename = function (request, parentModule, isMain, options) {
+        let redirectdRequest = request;
+        // make sure these packages are resolved into project/node_modules/
+        // this only works on server side
+        if (['react', 'react-dom'].includes(request)) {
+            redirectdRequest = resolveNodeModule(request);
+        }
+        return oldResolveFilename.call(this, redirectdRequest, parentModule, isMain, options);
+    };
+}
+const args = process.argv.slice(2);
+const [cmdPath, ...commandArgs] = args.length ? args : ['dev'];
+const mod = require(cmdPath);
+const cmd = mod.default || mod;
+cmd(commandArgs);

package/lib/cli/cli.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/lib/cli/cli.js

@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = __importDefault(require("commander"));
+const cross_spawn_1 = __importDefault(require("cross-spawn"));
+//@ts-ignore
+const package_json_1 = __importDefault(require("../../package.json"));
+const Commands = ['dev', 'build', 'serve', 'inspect'];
+// must be before .parse()
+commander_1.default.on('--help', () => {
+    console.log('');
+    console.log('Avaliable cmds:');
+    console.log(`  ${Commands.join(', ')}`);
+});
+commander_1.default.name('shuvi').version(package_json_1.default.version).usage('<cmd> [options]');
+const args = process.argv.slice(2);
+const [cmd, ...commandArgs] = args.length ? args : ['dev'];
+if (!Commands.includes(cmd)) {
+    console.error('Unknown command "' + cmd + '".');
+    commander_1.default.outputHelp();
+    process.exit(1);
+}
+const nodeEnv = cmd === 'dev' ? 'development' : 'production';
+const result = cross_spawn_1.default.sync('node', [
+    require.resolve('./agent'),
+    require.resolve('./cmds/' + cmd),
+    ...commandArgs
+], {
+    stdio: 'inherit',
+    env: Object.assign(Object.assign({}, process.env), { NODE_ENV: nodeEnv })
+});
+if (result.signal) {
+    if (result.signal === 'SIGKILL') {
+        console.log('The build failed because the process exited too early. ' +
+            'This probably means the system ran out of memory or someone called ' +
+            '`kill -9` on the process.');
+    }
+    else if (result.signal === 'SIGTERM') {
+        console.log('The build failed because the process exited too early. ' +
+            'Someone might have called `kill` or `killall`, or the system could ' +
+            'be shutting down.');
+    }
+    process.exit(1);
+}
+process.exit(result.status);

package/lib/cli/cmds/build.d.ts

@@ -0,0 +1 @@
+export default function main(argv: string[]): Promise<void>;

package/lib/cli/cmds/build.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = __importDefault(require("commander"));
+const path_1 = __importDefault(require("path"));
+const build_1 = require("@shuvi/service/lib/cli/build");
+//@ts-ignore
+const package_json_1 = __importDefault(require("../../../package.json"));
+const utils_1 = require("../utils");
+const cliConfigMap = {
+    analyze: 'analyze',
+    publicPath: 'publicPath',
+    routerHistory: 'router.history',
+    target(config) {
+        config.ssr = false;
+    }
+};
+function main(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        commander_1.default
+            .name(package_json_1.default.name)
+            .usage(`build [dir] [options]`)
+            .helpOption()
+            .option('--config <file>', 'path to config file')
+            .option('--public-path <url>', 'specify the asset prefix. eg: https://some.cdn.com')
+            .option('--target <target>', 'specify the app output target. eg: spa')
+            .option('--router-history <history>', "specify the hisotry type. 'browser' or 'hash'")
+            .option('--analyze', 'generate html file to help analyze webpack bundle')
+            .option('--config-overrides [json]', 'config overrides json')
+            .parse(argv, { from: 'user' });
+        const cwd = utils_1.getProjectDir(commander_1.default);
+        const config = utils_1.getConfigFromCli(commander_1.default, cliConfigMap);
+        try {
+            yield build_1.build({
+                cwd,
+                config,
+                configFile: commander_1.default.config && path_1.default.resolve(cwd, commander_1.default.config),
+                target: commander_1.default.target
+            });
+            console.log('Build successfully!');
+        }
+        catch (error) {
+            console.error('Failed to build.\n');
+            console.error(error.message);
+            process.exit(1);
+        }
+    });
+}
+exports.default = main;

package/lib/cli/cmds/dev.d.ts

@@ -0,0 +1 @@
+export default function main(argv: string[]): Promise<void>;

package/lib/cli/cmds/dev.js

@@ -0,0 +1,63 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = __importDefault(require("commander"));
+const path_1 = __importDefault(require("path"));
+const service_1 = require("@shuvi/service");
+//@ts-ignore
+const package_json_1 = __importDefault(require("../../../package.json"));
+const utils_1 = require("../utils");
+function main(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        commander_1.default
+            .name(package_json_1.default.name)
+            .usage(`dev [dir] [options]`)
+            .helpOption()
+            .option('--config <file>', 'path to config file')
+            .option('--host <host>', 'specify host')
+            .option('--port <port>', 'specify port')
+            .option('--config-overrides [json]', 'config overrides json')
+            .parse(argv, { from: 'user' });
+        const cwd = utils_1.getProjectDir(commander_1.default);
+        const port = Number(commander_1.default.port) || 3000;
+        const host = commander_1.default.host || 'localhost';
+        const config = utils_1.getConfigFromCli(commander_1.default);
+        const shuviApp = service_1.shuvi({
+            dev: true,
+            cwd,
+            config,
+            configFile: commander_1.default.config && path_1.default.resolve(cwd, commander_1.default.config)
+        });
+        try {
+            console.log('Starting the development server...');
+            yield shuviApp.listen(port, host);
+            const localUrl = `http://${host === '0.0.0.0' ? 'localhost' : host}:${port}`;
+            console.log(`Ready on ${localUrl}`);
+        }
+        catch (err) {
+            if (err.code === 'EADDRINUSE') {
+                let errorMessage = `Port ${port} is already in use.`;
+                errorMessage += '\nUse `--port` to specify some other port.';
+                // tslint:disable-next-line
+                console.error(errorMessage);
+            }
+            else {
+                // tslint:disable-next-line
+                console.error(err);
+            }
+            process.nextTick(() => process.exit(1));
+        }
+    });
+}
+exports.default = main;

package/lib/cli/cmds/inspect.d.ts

@@ -0,0 +1 @@
+export default function main(argv: string[]): Promise<void>;

package/lib/cli/cmds/inspect.js

@@ -0,0 +1,66 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const util_1 = require("util");
+const path_1 = __importDefault(require("path"));
+const commander_1 = __importDefault(require("commander"));
+const cli_highlight_1 = require("cli-highlight");
+const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
+const service_1 = require("@shuvi/service");
+const bundler_1 = require("@shuvi/service/lib/bundler/bundler");
+const utils_1 = require("../utils");
+//@ts-ignore
+const package_json_1 = __importDefault(require("../../../package.json"));
+function main(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        commander_1.default
+            .name(package_json_1.default.name)
+            .description('inspect internal webpack config')
+            .usage('inspect [options] [...paths]')
+            .helpOption()
+            .option('--config <file>', 'path to config file')
+            .option('--config-overrides [json]', 'config overrides json')
+            .option('--mode <mode>', 'specify env mode (default: development)')
+            .option('--verbose', 'show full webpack config')
+            .parse(argv, { from: 'user' });
+        const cwd = utils_1.getProjectDir(commander_1.default);
+        const mode = ['development', 'production'].includes(commander_1.default.mode)
+            ? commander_1.default.mode
+            : 'development';
+        Object.assign(process.env, {
+            NODE_ENV: mode
+        });
+        const config = utils_1.getConfigFromCli(commander_1.default);
+        const api = yield service_1.getApi({
+            cwd,
+            config,
+            configFile: commander_1.default.config && path_1.default.resolve(cwd, commander_1.default.config),
+            mode,
+            phase: 'PHASE_INSPECT_WEBPACK'
+        });
+        const bundler = bundler_1.getBundler(api);
+        const configs = yield bundler.resolveWebpackConfig();
+        configs.forEach(({ name, config }) => {
+            console.log(chalk_1.default.cyan.bold(`${name} webpack config`));
+            const configString = util_1.inspect(config, { depth: commander_1.default.verbose ? 10 : 2 });
+            if (process.env.__DISABLE_HIGHLIGHT__ === 'true') {
+                console.log(configString);
+            }
+            else {
+                console.log(cli_highlight_1.highlight(configString, { language: 'js' }));
+            }
+        });
+    });
+}
+exports.default = main;

package/lib/cli/cmds/serve.d.ts

@@ -0,0 +1 @@
+export default function main(argv: string[]): Promise<void>;

package/lib/cli/cmds/serve.js

@@ -0,0 +1,51 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const commander_1 = __importDefault(require("commander"));
+const path_1 = __importDefault(require("path"));
+const service_1 = require("@shuvi/service");
+//@ts-ignore
+const package_json_1 = __importDefault(require("../../../package.json"));
+const utils_1 = require("../utils");
+function main(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        commander_1.default
+            .name(package_json_1.default.name)
+            .usage(`serve [dir] [options]`)
+            .helpOption()
+            .option('--config <file>', 'path to config file')
+            .option('--host <host>', 'specify host')
+            .option('--port <port>', 'specify port')
+            .option('--config-overrides [json]', 'config overrides json')
+            .parse(argv, { from: 'user' });
+        const cwd = utils_1.getProjectDir(commander_1.default);
+        const port = Number(commander_1.default.port) || 3000;
+        const host = commander_1.default.host || 'localhost';
+        const config = utils_1.getConfigFromCli(commander_1.default);
+        const shuviApp = service_1.shuvi({
+            cwd,
+            config,
+            configFile: commander_1.default.config && path_1.default.resolve(cwd, commander_1.default.config)
+        });
+        try {
+            yield shuviApp.listen(port, host);
+            console.log(`Ready on http://${host}:${port}`);
+        }
+        catch (err) {
+            console.error(err);
+            process.exit(1);
+        }
+    });
+}
+exports.default = main;

package/lib/cli/utils.d.ts

@@ -0,0 +1,4 @@
+import { CommanderStatic } from 'commander';
+import { IConfig } from '@shuvi/service';
+export declare function getProjectDir(cmd: CommanderStatic | Record<string, any>): string;
+export declare function getConfigFromCli(cliOptions: Record<string, any>, cliOptionsKeyMap?: Record<string, string | ((config: any, optionValue: any) => void)>): IConfig;

package/lib/cli/utils.js

@@ -0,0 +1,55 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+const path_1 = __importDefault(require("path"));
+function getProjectDir(cmd) {
+    const dir = path_1.default.resolve(cmd.args[0] || '.');
+    if (!fs_1.existsSync(dir)) {
+        console.error(`> No such directory exists as the project root: ${dir}`);
+        cmd.outputHelp();
+        process.exit(1);
+    }
+    return dir;
+}
+exports.getProjectDir = getProjectDir;
+function set(obj, path, value) {
+    const segments = path.split('.');
+    const final = segments.pop();
+    for (var i = 0; i < segments.length; i++) {
+        if (!obj) {
+            return;
+        }
+        obj = obj[segments[i]];
+    }
+    obj[final] = value;
+}
+function getConfigFromCli(cliOptions, cliOptionsKeyMap = {}) {
+    const config = {};
+    Object.keys(cliOptionsKeyMap).forEach(key => {
+        if (typeof cliOptions[key] !== 'undefined') {
+            const mappedKeyOrFunction = cliOptionsKeyMap[key];
+            const cliOptionValue = cliOptions[key];
+            if (typeof mappedKeyOrFunction === 'function') {
+                mappedKeyOrFunction(config, cliOptionValue);
+            }
+            else {
+                set(config, mappedKeyOrFunction, cliOptionValue);
+            }
+        }
+    });
+    try {
+        const { configOverrides } = cliOptions;
+        if (configOverrides) {
+            const overrides = JSON.parse(configOverrides);
+            Object.assign(config, overrides);
+        }
+    }
+    catch (err) {
+        console.error(err);
+    }
+    return config;
+}
+exports.getConfigFromCli = getConfigFromCli;

package/lib/index.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "shuvi",
+  "version": "0.0.1-rc.33",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/shuvijs/shuvi.git",
+    "directory": "packages/shuvi"
+  },
+  "author": "liximomo",
+  "license": "MIT",
+  "main": "./lib/index.js",
+  "bin": {
+    "shuvi": "./lib/cli/cli.js"
+  },
+  "files": [
+    "lib",
+    "types"
+  ],
+  "scripts": {
+    "dev": "tsc -p tsconfig.build.json -w",
+    "prebuild": "rimraf lib",
+    "build": "tsc -p tsconfig.build.json"
+  },
+  "engines": {
+    "node": ">= 12.0.0"
+  },
+  "dependencies": {
+    "@shuvi/platform-mp": "^0.0.1-rc.33",
+    "@shuvi/platform-web": "^0.0.1-rc.33",
+    "@shuvi/service": "^0.0.1-rc.33",
+    "@shuvi/shared": "0.0.1-rc.32",
+    "@shuvi/utils": "^0.0.1-rc.33",
+    "cli-highlight": "^2.1.9",
+    "commander": "5.1.0",
+    "cross-spawn": "7.0.3",
+    "dotenv": "8.2.0",
+    "dotenv-expand": "5.1.0"
+  },
+  "devDependencies": {
+    "@types/cross-spawn": "6.0.1",
+    "@types/dotenv": "8.2.0"
+  },
+  "gitHead": "ee2abab3c102f68450cf1fb6b2c833d5a59fb0c7"
+}