shuvi 1.0.28 → 1.0.30

package/lib/commands/eslint/options.js

@@ -12,14 +12,18 @@ exports.optionRulesDir = new commander_1.Option('--rulesDir <path...>', `Use add
 exports.optionFix = new commander_1.Option('--fix', `Automatically fix problems`).default(false);
 exports.optionFixType = new commander_1.Option('--fix-type <type...>', `Specify the types of fixes to apply (problem, suggestion, layout)`).default(null);
 exports.optionIgnorePath = new commander_1.Option('--ignore-path <filePath>', `Specify path of ignore file`).default(null);
-exports.optionNoIgnore = new commander_1.Option('--no-ignore', `Disable use of ignore files and patterns`).default(false);
+exports.optionNoIgnore = new commander_1.Option('--no-ignore', `Disable use of ignore files and patterns`).default(true);
 exports.optionQuiet = new commander_1.Option('--quiet', `Report errors only`).default(false);
-exports.optionMaxWarnings = new commander_1.Option('--max-warnings', `Number of warnings to trigger nonzero exit code`).default(-1);
+exports.optionMaxWarnings = new commander_1.Option('--max-warnings', `Number of warnings to trigger nonzero exit code`)
+    .argParser(function (value) {
+    return parseInt(value, 10);
+})
+    .default(-1);
 exports.optionOutputFile = new commander_1.Option('-o, --output-file <path>', `Specify file to write report to`).default(null);
 exports.optionFormat = new commander_1.Option('-f, --format <format>', `Use a specific output format`).default(null, 'Shuvi.js custom formatter');
-exports.optionNoInlineConfig = new commander_1.Option('--no-inline-config', `Prevent comments from changing config or rules`).default(false);
-exports.optionReportUnusedDisableDirectives = new commander_1.Option('--report-unused-disable-directives', `Adds reported errors for unused eslint-disable directives ("error" | "warn" | "off")`).default(null);
-exports.optionNoCache = new commander_1.Option('--no-cache', `Disable caching`).default(false);
+exports.optionNoInlineConfig = new commander_1.Option('--no-inline-config', `Prevent comments from changing config or rules`).default(true);
+exports.optionReportUnusedDisableDirectives = new commander_1.Option('--report-unused-disable-directives <directives>', `Adds reported errors for unused eslint-disable directives ("error" | "warn" | "off")`).default(null);
+exports.optionNoCache = new commander_1.Option('--no-cache', `Disable caching`).default(true);
 exports.optionCacheLocation = new commander_1.Option('--cache-location <location>', `Path to the cache file or directory`).default('.eslintcache');
 exports.optionCacheStrategy = new commander_1.Option('--cache-strategy <strategy>', `Strategy to use for detecting changed files in the cache, either metadata or content`).default('metadata');
 exports.optionErrorOnUnmatchedPattern = new commander_1.Option('--error-on-unmatched-pattern', `Show errors when any file patterns are unmatched - default: false`).default(false);

package/lib/commands/lint.js

@@ -31,10 +31,10 @@ const eslintOptions = (options, cacheLocation) => ({
     fix: options.fix,
     fixTypes: options.fixType,
     ignorePath: options.ignorePath,
-    ignore: !Boolean(options.ignore),
-    allowInlineConfig: !Boolean(options.inlineConfig),
+    ignore: Boolean(options.ignore),
+    allowInlineConfig: Boolean(options.inlineConfig),
     reportUnusedDisableDirectives: options.reportUnusedDisableDirectives,
-    cache: !Boolean(options.cache),
+    cache: Boolean(options.cache),
     cacheLocation: cacheLocation,
     cacheStrategy: options.cacheStrategy,
     errorOnUnmatchedPattern: options.errorOnUnmatchedPattern

package/lib/shuvi.js

@@ -24,31 +24,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initShuvi = exports.getPlatform = void 0;
-const telemetry_1 = require("@shuvi/telemetry");
 const service_1 = require("@shuvi/service");
 const platform_web_1 = __importDefault(require("@shuvi/platform-web"));
 const config_1 = require("./config");
-//@ts-ignore
-const package_json_1 = __importDefault(require("../package.json"));
+const telemetry_1 = require("./telemetry");
+const trace_1 = require("@shuvi/service/lib/trace");
 function getPlatform() {
     return (0, platform_web_1.default)({ framework: 'react' });
 }
 exports.getPlatform = getPlatform;
-const TELEMETRY_ENDPOINT = '';
 function initShuvi(_a) {
     var { config } = _a, options = __rest(_a, ["config"]);
     return __awaiter(this, void 0, void 0, function* () {
         const { plugins, presets } = config, restConfig = __rest(config, ["plugins", "presets"]);
-        const telemetry = TELEMETRY_ENDPOINT
-            ? new telemetry_1.Telemetry({
-                name: 'Shuvi.js',
-                meta: { shuviVersion: package_json_1.default.version },
-                postEndpoint: TELEMETRY_ENDPOINT
-            })
-            : undefined;
         const shuvi = yield (0, service_1.getApi)(Object.assign(Object.assign({}, options), { plugins,
-            presets, config: restConfig, platform: getPlatform(), normalizePlatformConfig: config_1.normalizePlatformConfig,
-            telemetry }));
+            presets, config: restConfig, platform: getPlatform(), normalizePlatformConfig: config_1.normalizePlatformConfig }));
+        if (telemetry_1.telemetry) {
+            (0, trace_1.setReporter)(telemetry_1.telemetry.report);
+        }
         return shuvi;
     });
 }

package/lib/tasks/build.js

@@ -43,6 +43,7 @@ const service_1 = require("@shuvi/service");
 const constants_1 = require("@shuvi/shared/constants");
 const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const shuvi_1 = require("../shuvi");
+const telemetry_1 = require("../telemetry");
 const defaultBuildOptions = {
     target: 'ssr'
 };
@@ -93,8 +94,7 @@ function build(options) {
         // transpile the application
         yield bundle(bundler);
         yield pluginContext.pluginRunner.afterBuild();
-        yield (0, service_1.analysis)({ context: api.pluginContext, telemetry: api.telemetry });
-        yield api.telemetry.flush();
+        yield (0, service_1.analysis)({ context: api.pluginContext, telemetry: telemetry_1.telemetry });
         return api;
     });
 }

package/lib/telemetry.d.ts

@@ -0,0 +1,2 @@
+import { Telemetry } from '@shuvi/reporters';
+export declare const telemetry: Telemetry | undefined;

package/lib/telemetry.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.telemetry = void 0;
+const reporters_1 = require("@shuvi/reporters");
+//@ts-ignore
+const package_json_1 = __importDefault(require("../package.json"));
+const TELEMETRY_ENDPOINT = '';
+exports.telemetry = TELEMETRY_ENDPOINT
+    ? new reporters_1.Telemetry({
+        name: 'Shuvi.js',
+        meta: { shuviVersion: package_json_1.default.version },
+        postEndpoint: TELEMETRY_ENDPOINT
+    })
+    : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shuvi",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "Full Stack Web development framework.",
   "repository": {
     "type": "git",
@@ -30,13 +30,13 @@
     "find-up": "4.1.0",
     "semver": "7.3.2",
     "cli-select": "1.1.2",
-    "@shuvi/platform-shared": "1.0.28",
-    "@shuvi/platform-web": "1.0.28",
-    "@shuvi/service": "1.0.28",
-    "@shuvi/shared": "1.0.28",
-    "@shuvi/toolpack": "1.0.28",
-    "@shuvi/utils": "1.0.28",
-    "@shuvi/telemetry": "1.0.28",
+    "@shuvi/platform-shared": "1.0.30",
+    "@shuvi/platform-web": "1.0.30",
+    "@shuvi/service": "1.0.30",
+    "@shuvi/shared": "1.0.30",
+    "@shuvi/toolpack": "1.0.30",
+    "@shuvi/utils": "1.0.30",
+    "@shuvi/reporters": "1.0.30",
     "cli-highlight": "^2.1.9",
     "commander": "10.0.0",
     "cross-spawn": "7.0.3",