@shuvi/service 1.0.8 → 1.0.10

package/lib/analysis/index.js

@@ -38,9 +38,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.analysis = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const events_1 = require("./events");
-const recursiveReaddir_1 = require("@shuvi/utils/lib/recursiveReaddir");
+const recursiveReaddir_1 = require("@shuvi/utils/recursiveReaddir");
 const typescript_1 = require("../bundler/typescript");
 const analysis = ({ context, telemetry }) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;

package/lib/bundler/bundler.d.ts

@@ -1,4 +1,4 @@
-import { RemoveListenerCallback } from '@shuvi/utils/lib/events';
+import { RemoveListenerCallback } from '@shuvi/utils/events';
 import { Compiler as WebapckCompiler } from '@shuvi/toolpack/lib/webpack';
 import { Server } from '../server';
 import { IPluginContext } from '../core';

package/lib/bundler/bundler.js

@@ -37,14 +37,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getBundler = void 0;
 const path_1 = __importDefault(require("path"));
-const events_1 = require("@shuvi/utils/lib/events");
+const events_1 = require("@shuvi/utils/events");
 const forkTsCheckerWebpackPlugin_1 = __importStar(require("@shuvi/toolpack/lib/utils/forkTsCheckerWebpackPlugin"));
 const formatWebpackMessages_1 = __importDefault(require("@shuvi/toolpack/lib/utils/formatWebpackMessages"));
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const util_1 = require("util");
 const webpack_1 = require("@shuvi/toolpack/lib/webpack");
 const config_1 = require("@shuvi/toolpack/lib/webpack/config");
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 const error_1 = require("../error");
 const config_2 = require("./config");
 const runCompiler_1 = require("./runCompiler");

package/lib/bundler/typescript/checkDependencies.js

@@ -11,8 +11,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkNecessaryDeps = exports.hasTypescriptFiles = exports.resolveDependencies = void 0;
 const fs_extra_1 = require("fs-extra");
-const resolve_1 = require("@shuvi/utils/lib/resolve");
-const recursiveReaddir_1 = require("@shuvi/utils/lib/recursiveReaddir");
+const resolve_1 = require("@shuvi/utils/resolve");
+const recursiveReaddir_1 = require("@shuvi/utils/recursiveReaddir");
 const requiredPackages = [
     { file: 'typescript', pkg: 'typescript' },
     { file: '@types/react/index.d.ts', pkg: '@types/react' },

package/lib/bundler/typescript/configTypeScript.js

@@ -36,8 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeDefaultConfigurations = void 0;
-const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
-const isEqual_1 = __importDefault(require("@shuvi/utils/lib/isEqual"));
+const chalk_1 = __importDefault(require("@shuvi/utils/chalk"));
+const isEqual_1 = __importDefault(require("@shuvi/utils/isEqual"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const CommentJson = __importStar(require("comment-json"));
 const os_1 = __importDefault(require("os"));

package/lib/bundler/typescript/getTsConfig.js

@@ -16,9 +16,9 @@ exports.getTsConfig = exports.hasTsConfig = exports.hasTypescriptFiles = void 0;
 const fs_extra_1 = require("fs-extra");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
-const recursiveReaddir_1 = require("@shuvi/utils/lib/recursiveReaddir");
+const chalk_1 = __importDefault(require("@shuvi/utils/chalk"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
+const recursiveReaddir_1 = require("@shuvi/utils/recursiveReaddir");
 function hasTypescriptFiles(projectDir) {
     return __awaiter(this, void 0, void 0, function* () {
         try {

package/lib/bundler/typescript/installDependencies.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.installDependencies = exports.install = void 0;
-const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
+const chalk_1 = __importDefault(require("@shuvi/utils/chalk"));
 const cross_spawn_1 = __importDefault(require("cross-spawn"));
 const path = __importStar(require("path"));
 const getPkgManager_1 = require("../helper/getPkgManager");

package/lib/bundler/typescript/setupTypeScript.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupTypeScript = exports.loadJsConfig = exports.getJavaScriptInfo = void 0;
 const path = __importStar(require("path"));
-const chalk_1 = __importDefault(require("@shuvi/utils/lib/chalk"));
+const chalk_1 = __importDefault(require("@shuvi/utils/chalk"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const error_1 = require("../../error");
 const getPkgManager_1 = require("../helper/getPkgManager");

package/lib/config/config.js

@@ -16,8 +16,8 @@ exports.loadConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const bundleRequire_1 = require("@shuvi/toolpack/lib/utils/bundleRequire");
-const file_1 = require("@shuvi/utils/lib/file");
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const file_1 = require("@shuvi/utils/file");
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const constants_1 = require("../constants");
 const env_1 = require("./env");
 const validExts = ['.ts', '.tsx', '.js', '.jsx', '.cjs', '.mjs'];

package/lib/config/env.js

@@ -32,7 +32,7 @@ const dotenv = __importStar(require("dotenv"));
 const dotenv_expand_1 = require("dotenv-expand");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 let initialEnv = undefined;
 let combinedEnv = undefined;
 let cachedLoadedEnvFiles = [];

package/lib/constants.d.ts

@@ -1,4 +1,4 @@
-export { CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/lib/constants';
+export { CLIENT_OUTPUT_DIR, SERVER_OUTPUT_DIR } from '@shuvi/shared/constants';
 export declare const CONFIG_FILE = "shuvi.config";
 export declare const DEFAULT_PUBLIC_PATH = "/";
 export declare const PUBLIC_DIR_NAME = "public";

package/lib/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PHASE_INSPECT_WEBPACK = exports.PHASE_DEVELOPMENT_SERVER = exports.PHASE_PRODUCTION_SERVER = exports.PHASE_PRODUCTION_BUILD = exports.PUBLIC_DIR_NAME = exports.DEFAULT_PUBLIC_PATH = exports.CONFIG_FILE = exports.SERVER_OUTPUT_DIR = exports.CLIENT_OUTPUT_DIR = void 0;
-var constants_1 = require("@shuvi/shared/lib/constants");
+var constants_1 = require("@shuvi/shared/constants");
 Object.defineProperty(exports, "CLIENT_OUTPUT_DIR", { enumerable: true, get: function () { return constants_1.CLIENT_OUTPUT_DIR; } });
 Object.defineProperty(exports, "SERVER_OUTPUT_DIR", { enumerable: true, get: function () { return constants_1.SERVER_OUTPUT_DIR; } });
 exports.CONFIG_FILE = 'shuvi.config';

package/lib/core/api.d.ts

@@ -1,5 +1,5 @@
 import { Telemetry as TelemetryImpl, RecordObject, TelemetryEvent } from '@shuvi/telemetry';
-import { FileOption } from '../project';
+import { FileOptionWithId } from '../project';
 import { Bundler } from '../bundler';
 import { ServerPluginInstance } from '../server';
 import { ShuviConfig, IPluginConfig, IPresetConfig, IServiceMode, IServicePhase, IPlatform, IPlatformContent, IPluginContext, RuntimePluginConfig } from './apiTypes';
@@ -52,7 +52,7 @@ declare class Api {
     constructor({ cwd, mode, config, configFile, presets, plugins, phase, platform, normalizePlatformConfig, telemetry }: IApiOPtions);
     get cwd(): string;
     get mode(): IServiceMode;
-    get pluginManager(): import("@shuvi/hook/lib/hookGroup").HookManager<import("./plugin").PluginHooks, IPluginContext>;
+    get pluginManager(): import("@shuvi/hook").HookManager<import("./plugin").PluginHooks, IPluginContext>;
     get pluginContext(): IPluginContext;
     get serverConfigs(): ServerConfigs;
     get telemetry(): Telemetry;
@@ -60,8 +60,8 @@ declare class Api {
     getBundler(): Promise<Bundler>;
     get assetPublicPath(): string;
     buildApp(): Promise<void>;
-    addRuntimeFile(option: FileOption<any>): void;
-    addInternalRuntimeFile(option: FileOption<any>): void;
+    addRuntimeFile(option: FileOptionWithId<any>): void;
+    addInternalRuntimeFile(option: FileOptionWithId<any>): void;
     addRuntimePlugin(plugin: RuntimePluginConfig): void;
     addRuntimeService(source: string, exported: string, filepath?: string): void;
     addRuntimeTypesPatch(file: string): void;

package/lib/core/api.js

@@ -36,10 +36,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getApi = exports.Api = void 0;
-const hookGroup_1 = require("@shuvi/hook/lib/hookGroup");
-const deepmerge_1 = require("@shuvi/utils/lib/deepmerge");
-const string_1 = require("@shuvi/utils/lib/string");
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const hook_1 = require("@shuvi/hook");
+const deepmerge_1 = require("@shuvi/utils/deepmerge");
+const string_1 = require("@shuvi/utils/string");
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const rimraf_1 = __importDefault(require("rimraf"));
 const path = __importStar(require("path"));
 const project_1 = require("../project");
@@ -317,7 +317,7 @@ class Api {
                     if (typeof plugin === 'string') {
                         resolvedPlugins.push((0, getPlugins_1.resolvePlugin)(plugin));
                     }
-                    else if ((0, hookGroup_1.isPluginInstance)(plugin)) {
+                    else if ((0, hook_1.isPluginInstance)(plugin)) {
                         resolvedPlugins.push({ core: plugin });
                     }
                     else {

package/lib/core/apiTypes.d.ts

@@ -1,6 +1,6 @@
 import { CompilerOptions } from '@shuvi/toolpack/lib/webpack/loaders/shuvi-swc-loader';
 import { CorePluginConstructor, CorePluginFactory, CorePluginInstance, PluginRunner } from './plugin';
-import { FileOption } from '../project';
+import { FileOptionWithId } from '../project';
 import { IProxyConfig } from '../server/middlewares/httpProxyMiddleware';
 import { IServerMiddleware, IServerPluginContext, ServerPluginInstance, ServerPluginConstructor, ServerPluginFactory } from '../server';
 import { DevMiddleware } from '../server/middlewares/dev';
@@ -58,7 +58,7 @@ export interface ResolvedPlugin {
 export declare type IPlatformContent = {
     types?: string | string[];
     plugins?: (CorePluginInstance | ResolvedPlugin | string)[];
-    getPresetRuntimeFiles: (context: IPluginContext) => FileOption<any>[] | Promise<FileOption<any>[]>;
+    getPresetRuntimeFiles: (context: IPluginContext) => FileOptionWithId<any>[] | Promise<FileOptionWithId<any>[]>;
     getMiddlewares?: (context: IServerPluginContext) => Promise<IServerMiddleware | IServerMiddleware[]>;
     getMiddlewaresBeforeDevMiddlewares?: (devMiddleware: DevMiddleware, context: IServerPluginContext) => IServerMiddleware | IServerMiddleware[];
 };

package/lib/core/getPlugins.js

@@ -27,9 +27,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPlugins = exports.resolvePresets = exports.resolvePlugins = exports.resolvePreset = exports.resolvePlugin = void 0;
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const hook_1 = require("@shuvi/hook");
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const path = __importStar(require("path"));
 const plugin_1 = require("./plugin");
 const plugin_2 = require("../server/plugin");
@@ -232,8 +232,7 @@ function resolvePlugin(pluginConfig, resolveOptions) {
             }
         }
         if (typesPath) {
-            const dir = path.dirname(typesPath);
-            resolved.types = dir + path.sep + 'types';
+            resolved.types = typesPath;
         }
     }
     return resolved;

package/lib/core/paths.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPaths = void 0;
 const path_1 = require("path");
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 const constants_2 = require("../constants");
 function getPaths(opts) {
     const { rootDir, outputPath } = opts;

package/lib/core/plugin.d.ts

@@ -1,5 +1,5 @@
 import { IPluginInstance, IPluginHandlers } from '@shuvi/hook';
-import { FileOption } from '../project/index';
+import { FileOptionWithId } from '../project/index';
 import { ExtraTargetAssistant, ConfigWebpackAssistant, TargetChain, BundlerDoneExtra, BundlerTargetDoneExtra, RuntimeService, Resources, AddRuntimeFileUtils, WebpackChainType } from './pluginTypes';
 import { ShuviConfig, IPluginContext, CustomCorePluginHooks } from './apiTypes';
 declare const builtinPluginHooks: {
@@ -12,7 +12,7 @@ declare const builtinPluginHooks: {
     configWebpack: import("@shuvi/hook").AsyncSeriesWaterfallHook<WebpackChainType, ConfigWebpackAssistant>;
     addExtraTarget: import("@shuvi/hook").AsyncParallelHook<ExtraTargetAssistant, void, TargetChain>;
     addResource: import("@shuvi/hook").AsyncParallelHook<void, void, Resources | Resources[]>;
-    addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, AddRuntimeFileUtils, FileOption<any, any> | FileOption<any, any>[]>;
+    addRuntimeFile: import("@shuvi/hook").AsyncParallelHook<void, AddRuntimeFileUtils, FileOptionWithId<any, any> | FileOptionWithId<any, any>[]>;
     addRuntimeService: import("@shuvi/hook").AsyncParallelHook<void, void, RuntimeService | RuntimeService[]>;
 };
 export * from './pluginTypes';
@@ -25,4 +25,4 @@ export declare type CorePluginFactory = (options: any) => CorePluginInstance;
 export declare const getManager: () => import("@shuvi/hook").HookManager<PluginHooks, IPluginContext>;
 export declare type PluginManager = ReturnType<typeof getManager>;
 export declare type PluginRunner = PluginManager['runner'];
-export declare const createPluginBefore: import("@shuvi/shared/lib/plugins").PluginFunc<PluginHooks, IPluginContext>, createPlugin: import("@shuvi/shared/lib/plugins").PluginFunc<PluginHooks, IPluginContext>, createPluginAfter: import("@shuvi/shared/lib/plugins").PluginFunc<PluginHooks, IPluginContext>;
+export declare const createPluginBefore: import("@shuvi/shared/plugins").PluginFunc<PluginHooks, IPluginContext>, createPlugin: import("@shuvi/shared/plugins").PluginFunc<PluginHooks, IPluginContext>, createPluginAfter: import("@shuvi/shared/plugins").PluginFunc<PluginHooks, IPluginContext>;

package/lib/core/plugin.js

@@ -17,7 +17,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPluginAfter = exports.createPlugin = exports.createPluginBefore = exports.getManager = void 0;
 const hook_1 = require("@shuvi/hook");
-const plugins_1 = require("@shuvi/shared/lib/plugins");
+const plugins_1 = require("@shuvi/shared/plugins");
 const extendConfig = (0, hook_1.createSyncWaterfallHook)();
 const afterInit = (0, hook_1.createAsyncParallelHook)();
 const afterBuild = (0, hook_1.createAsyncParallelHook)();

package/lib/project/file-builder/fileBuilder.d.ts

@@ -1,4 +1,4 @@
-import type { FileOption, FileInfo } from './types';
+import type { FileOptionWithId, FileInfo } from './types';
 declare type OnBuildStartEvent = {};
 declare type OnSingleBuildEndEvent = {
     finished: boolean;
@@ -12,11 +12,11 @@ declare type OnSingleBuildEndHandler = (event: OnSingleBuildEndEvent) => void;
 declare type OnBuildEndHandler = (event: OnBuildEndEvent) => void;
 declare type EventCanceler = () => void;
 export interface FileBuilder<C extends {}> {
-    addFile: (...newFileOption: FileOption<any, C>[]) => void;
+    addFile: (...newFileOption: FileOptionWithId<any, C>[]) => void;
     build: (dir?: string) => Promise<void>;
     watch: (dir?: string) => Promise<void>;
     close: () => Promise<void>;
-    getContent: <T>(fileOption: FileOption<T>) => T;
+    getContent: <T>(fileOption: FileOptionWithId<T>) => T;
     onBuildStart: (eventHandler: OnBuildStartHandler) => EventCanceler;
     onBuildEnd: (eventHandler: OnBuildEndHandler) => EventCanceler;
     onSingleBuildEnd: (eventHandler: OnSingleBuildEndHandler) => EventCanceler;

package/lib/project/file-builder/fileBuilder.js

@@ -36,11 +36,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFileBuilder = void 0;
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const utils_1 = require("@shuvi/utils");
 const fs = __importStar(require("fs-extra"));
 const path = __importStar(require("path"));
-const fileWatcher_1 = require("@shuvi/utils/lib/fileWatcher");
+const fileWatcher_1 = require("@shuvi/utils/fileWatcher");
 const utils_2 = require("./utils");
 const constants_1 = require("./constants");
 const helpers_1 = require("./helpers");

package/lib/project/file-builder/types.d.ts

@@ -1,7 +1,7 @@
 export declare type FileId = string;
 export declare type ContentFunction<T, C> = (context: C, oldContent: T) => T | Promise<T>;
-export declare type FileDependency = string | FileOption<any>;
-export interface FileOption<T = string, C = any> {
+export declare type FileDependency = string | FileOptionWithId<any>;
+export interface FileOptionWithId<T = string, C = any> {
     id: FileId;
     content: ContentFunction<T, C>;
     name?: string;
@@ -11,7 +11,7 @@ export interface FileOption<T = string, C = any> {
         ignoreFileContentUpdate: boolean;
     };
 }
-export declare type FileOptionWithoutId<T = string, C = any> = Omit<FileOption<T, C>, 'id'>;
+export declare type FileOption<T = string, C = any> = Omit<FileOptionWithId<T, C>, 'id'>;
 export interface FileInternalInstance<T = string, C = any> {
     id: FileId;
     content: ContentFunction<T, C>;
@@ -20,7 +20,7 @@ export interface FileInternalInstance<T = string, C = any> {
     virtual?: boolean;
     fileContent?: T;
 }
-export declare type DefineFile = <T = string, C = any>(fileOption: FileOptionWithoutId<T, C>) => FileOption<T, C>;
+export declare type DefineFile = <T = string, C = any>(fileOption: FileOption<T, C>) => FileOptionWithId<T, C>;
 export declare type DependencyInfo = {
     dependencies: Set<FileId>;
     dependents: Set<FileId>;

package/lib/project/file-presets/files/app/shuvi-app.d.ts.js

@@ -6,7 +6,7 @@ exports.default = (0, __1.defineFile)({
         const types = context.typeDeclarationFiles;
         return types
             .map(file => {
-            const isPath = file.startsWith('/') || file.startsWith('.');
+            const isPath = /\.d\.ts$/.test(file) || file.startsWith('.');
             return isPath
                 ? `/// <reference path="${file}" />`
                 : `/// <reference types="${file}" />`;

package/lib/project/file-presets/index.d.ts

@@ -1,4 +1,4 @@
-import { FileOption, FileOptionWithoutId } from '../file-builder';
-export declare function getFilePresets(): FileOption<any, any>[];
-export declare type FileOptionWithoutName = Omit<FileOptionWithoutId, 'name'>;
+import { FileOptionWithId, FileOption } from '../file-builder';
+export declare function getFilePresets(): FileOptionWithId<any, any>[];
+export declare type FileOptionWithoutName = Omit<FileOption, 'name'>;
 export declare const defineFile: (options: FileOptionWithoutName) => FileOptionWithoutName;

package/lib/project/file-utils/utils.js

@@ -26,8 +26,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExportsFromObject = exports.getContentProxyObj = exports.getUserCustomFileCandidates = exports.getFirstModuleExport = exports.getModuleExport = exports.getAllFiles = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const recursiveReaddir_1 = require("@shuvi/utils/lib/recursiveReaddir");
-const file_1 = require("@shuvi/utils/lib/file");
+const recursiveReaddir_1 = require("@shuvi/utils/recursiveReaddir");
+const file_1 = require("@shuvi/utils/file");
 const getAllFiles = (dependencies) => {
     const allFiles = [];
     const fileDependencies = Array.isArray(dependencies)
@@ -72,9 +72,9 @@ const getUserCustomFileCandidates = (rootPath, fileName, fallbackType) => {
     const SRC_DIR = 'src';
     const moduleFileExtensions = ['.ts', '.tsx', '.js', '.jsx'];
     const fallbackMap = {
-        nullish: require.resolve('@shuvi/utils/lib/nullish'),
-        noop: require.resolve('@shuvi/utils/lib/noop'),
-        noopFn: require.resolve('@shuvi/utils/lib/noopFn')
+        nullish: require.resolve('@shuvi/utils/nullish'),
+        noop: require.resolve('@shuvi/utils/noop'),
+        noopFn: require.resolve('@shuvi/utils/noopFn')
     };
     const fallback = fallbackMap[fallbackType] || fallbackMap['nullish'];
     return [

package/lib/project/projectBuilder.d.ts

@@ -1,5 +1,5 @@
 import { RuntimePluginConfig } from '../core';
-import { FileOption } from './file-builder';
+import { FileOptionWithId } from './file-builder';
 declare class ProjectBuilder {
     private _projectContext;
     private _fileBuilder;
@@ -12,11 +12,11 @@ declare class ProjectBuilder {
     /**
      * default path is the root path
      */
-    addFile(option: FileOption<any, any>): void;
+    addFile(option: FileOptionWithId<any, any>): void;
     build(dir: string): Promise<void>;
     watch(dir: string): Promise<void>;
     stopBuild(): Promise<void>;
-    get getContent(): <T>(fileOption: FileOption<T, any>) => T;
+    get getContent(): <T>(fileOption: FileOptionWithId<T, any>) => T;
     get onBuildStart(): (eventHandler: (event: {}) => void) => () => void;
     get onBuildEnd(): (eventHandler: (event: {
         changedFiles: ReadonlyMap<string, import("./file-builder").FileInfo>;

package/lib/project/projectBuilder.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectBuilder = void 0;
 const path = __importStar(require("path"));
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const file_presets_1 = require("./file-presets");
 const file_utils_1 = require("./file-utils");
 const projectContext_1 = require("./projectContext");

package/lib/resources.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._setResourceEnv = void 0;
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 let isCached = false;
 let requireTarget = '';
 const cache = {};

package/lib/server/http-server/router.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRouter = void 0;
 const util_1 = require("util");
 const utils_1 = require("@shuvi/utils");
-const invariant_1 = __importDefault(require("@shuvi/utils/lib/invariant"));
+const invariant_1 = __importDefault(require("@shuvi/utils/invariant"));
 const router_1 = require("@shuvi/router");
 class RouterImpl {
     constructor(options) {

package/lib/server/http-server/server.js

@@ -39,7 +39,7 @@ exports.Server = void 0;
 const http = __importStar(require("http"));
 const url_1 = require("url");
 const router_1 = require("@shuvi/router");
-const logger_1 = __importDefault(require("@shuvi/utils/lib/logger"));
+const logger_1 = __importDefault(require("@shuvi/utils/logger"));
 const detect_port_1 = __importDefault(require("detect-port"));
 const utils_1 = require("../utils");
 const router_2 = require("./router");

package/lib/server/middlewares/dev/devMiddleware.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDevMiddleware = void 0;
 const ws_1 = __importDefault(require("ws"));
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 const middleware_1 = require("@shuvi/error-overlay/lib/middleware");
 const constants_2 = require("../../../constants");
 const hotMiddleware_1 = require("./hotMiddleware");

package/lib/server/middlewares/dev/hotMiddleware.js

@@ -8,7 +8,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebpackHotMiddleware = void 0;
 const module_replace_plugin_1 = __importDefault(require("@shuvi/toolpack/lib/webpack/plugins/module-replace-plugin"));
-const constants_1 = require("@shuvi/shared/lib/constants");
+const constants_1 = require("@shuvi/shared/constants");
 const modulesActivity = new Map();
 const routesActivity = new Map();
 const activePages = new Set();

package/lib/server/plugin.d.ts

@@ -17,7 +17,7 @@ export interface BuiltInServerPluginHooks extends HookMap {
 export interface ServerPluginHooks extends BuiltInServerPluginHooks, CustomServerPluginHooks {
 }
 export declare const getManager: () => import("@shuvi/hook").HookManager<ServerPluginHooks, IServerPluginContext>;
-export declare const createServerPluginBefore: import("@shuvi/shared/lib/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>, createServerPlugin: import("@shuvi/shared/lib/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>, createServerPluginAfter: import("@shuvi/shared/lib/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>;
+export declare const createServerPluginBefore: import("@shuvi/shared/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>, createServerPlugin: import("@shuvi/shared/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>, createServerPluginAfter: import("@shuvi/shared/plugins").PluginFunc<ServerPluginHooks, IServerPluginContext>;
 export declare type ServerPluginConstructor = IPluginHandlers<ServerPluginHooks, IServerPluginContext>;
 export declare type ServerPluginInstance = IPluginInstance<ServerPluginHooks, IServerPluginContext>;
 export declare type ServerPluginFactory = (options: any) => ServerPluginInstance;

package/lib/server/plugin.js

@@ -17,7 +17,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initServerPlugins = exports.createServerPluginAfter = exports.createServerPlugin = exports.createServerPluginBefore = exports.getManager = void 0;
 const hook_1 = require("@shuvi/hook");
-const plugins_1 = require("@shuvi/shared/lib/plugins");
+const plugins_1 = require("@shuvi/shared/plugins");
 __exportStar(require("./pluginTypes"), exports);
 const listen = (0, hook_1.createAsyncParallelHook)();
 const internalHooks = {

package/lib/server/serverMiddleware.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeServerMiddleware = void 0;
-const resolve_1 = require("@shuvi/utils/lib/resolve");
+const resolve_1 = require("@shuvi/utils/resolve");
 function resolveHandler(handler, options) {
     try {
         // Note: check if it is a npm module

package/lib/server/shuviDevServer.js

@@ -21,8 +21,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShuviDevServer = void 0;
-const constants_1 = require("@shuvi/shared/lib/constants");
-const fileWatcher_1 = require("@shuvi/utils/lib/fileWatcher");
+const constants_1 = require("@shuvi/shared/constants");
+const fileWatcher_1 = require("@shuvi/utils/fileWatcher");
 const config_1 = require("@shuvi/toolpack/lib/webpack/config");
 const path_1 = require("path");
 const typescript_1 = require("../bundler/typescript");

package/lib/server/shuviServer.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShuviServer = void 0;
-const string_1 = require("@shuvi/utils/lib/string");
+const string_1 = require("@shuvi/utils/string");
 const serverMiddleware_1 = require("./serverMiddleware");
 const http_server_1 = require("./http-server");
 const plugin_1 = require("./plugin");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/service",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -22,21 +22,21 @@
     "build": "tsc -p tsconfig.build.json -m commonjs"
   },
   "engines": {
-    "node": ">= 12.0.0"
+    "node": ">= 16.0.0"
   },
   "dependencies": {
     "@babel/code-frame": "7.14.5",
     "@babel/generator": "7.14.5",
     "@babel/parser": "7.14.7",
     "@babel/traverse": "7.14.7",
-    "@shuvi/hook": "1.0.8",
-    "@shuvi/router": "1.0.8",
-    "@shuvi/runtime": "1.0.8",
-    "@shuvi/shared": "1.0.8",
-    "@shuvi/toolpack": "1.0.8",
-    "@shuvi/utils": "1.0.8",
-    "@shuvi/error-overlay": "1.0.8",
-    "@shuvi/telemetry": "1.0.8",
+    "@shuvi/hook": "1.0.10",
+    "@shuvi/router": "1.0.10",
+    "@shuvi/runtime": "1.0.10",
+    "@shuvi/shared": "1.0.10",
+    "@shuvi/toolpack": "1.0.10",
+    "@shuvi/utils": "1.0.10",
+    "@shuvi/error-overlay": "1.0.10",
+    "@shuvi/telemetry": "1.0.10",
     "commander": "5.1.0",
     "comment-json": "4.2.2",
     "cross-spawn": "7.0.3",