diff --git a/packages/code-generator/package.json b/packages/code-generator/package.json index a3959d2e6..638819833 100644 --- a/packages/code-generator/package.json +++ b/packages/code-generator/package.json @@ -7,8 +7,7 @@ "lib" ], "scripts": { - "compile": "rimraf lib && tsc", - "build": "rimraf lib && webpack", + "build": "rimraf lib && tsc", "demo": "ts-node -r tsconfig-paths/register ./src/demo/main.ts", "test": "ava" }, @@ -24,11 +23,7 @@ "rimraf": "^3.0.2", "ts-loader": "^6.2.2", "ts-node": "^7.0.1", - "tsconfig-paths": "^3.9.0", - "tsconfig-paths-webpack-plugin": "^3.2.0", - "webpack": "^4.42.1", - "webpack-cli": "^3.3.11", - "webpack-node-externals": "^1.7.2" + "tsconfig-paths": "^3.9.0" }, "ava": { "compileEnhancements": false, diff --git a/packages/code-generator/src/demo/main.ts b/packages/code-generator/src/demo/main.ts index 15d011fdb..e0d341ef4 100644 --- a/packages/code-generator/src/demo/main.ts +++ b/packages/code-generator/src/demo/main.ts @@ -1,7 +1,7 @@ -import { IResultDir, IResultFile } from '@/types'; +import { IResultDir, IResultFile } from '../types'; -import CodeGenerator from '@/index'; -import { createDiskPublisher } from '@/publisher/disk'; +import CodeGenerator from '../index'; +import { createDiskPublisher } from '../publisher/disk'; import demoSchema from './simpleDemo'; function flatFiles(rootName: string | null, dir: IResultDir): IResultFile[] { diff --git a/packages/code-generator/src/demo/simpleDemo.ts b/packages/code-generator/src/demo/simpleDemo.ts index b85b1dbba..cf124ceb9 100644 --- a/packages/code-generator/src/demo/simpleDemo.ts +++ b/packages/code-generator/src/demo/simpleDemo.ts @@ -1,9 +1,4 @@ -import { IProjectSchema } from '@/types'; - -// meta: { -// title: '测试', -// router: '/', -// }, +import { IProjectSchema } from '../types'; const demoData: IProjectSchema = { version: '1.0.0', diff --git a/packages/code-generator/src/generator/ProjectBuilder.ts b/packages/code-generator/src/generator/ProjectBuilder.ts index 98f4dc0a4..ada2e47fd 100644 --- a/packages/code-generator/src/generator/ProjectBuilder.ts +++ b/packages/code-generator/src/generator/ProjectBuilder.ts @@ -11,10 +11,10 @@ import { PostProcessor, } from '../types'; -import ResultDir from '@/model/ResultDir'; -import SchemaParser from '@/parser/SchemaParser'; +import ResultDir from '../model/ResultDir'; +import SchemaParser from '../parser/SchemaParser'; -import { createModuleBuilder } from '@/generator/ModuleBuilder'; +import { createModuleBuilder } from '../generator/ModuleBuilder'; interface IModuleInfo { moduleName?: string; @@ -67,7 +67,7 @@ export class ProjectBuilder implements IProjectBuilder { // Parse / Format // Preprocess - // Colllect Deps + // Collect Deps // Parse JSExpression const parseResult: IParseResult = schemaParser.parse(schema); let buildResult: IModuleInfo[] = []; diff --git a/packages/code-generator/src/index.ts b/packages/code-generator/src/index.ts index f6d467bc7..a0af2ba95 100644 --- a/packages/code-generator/src/index.ts +++ b/packages/code-generator/src/index.ts @@ -2,9 +2,9 @@ * 低代码引擎的出码模块,负责将编排产出的 Schema 转换成实际可执行的代码。 * */ -import { createProjectBuilder } from '@/generator/ProjectBuilder'; -import { createDiskPublisher } from '@/publisher/disk'; -import createIceJsProjectBuilder from '@/solutions/icejs'; +import { createProjectBuilder } from './generator/ProjectBuilder'; +import { createDiskPublisher } from './publisher/disk'; +import createIceJsProjectBuilder from './solutions/icejs'; export * from './types'; diff --git a/packages/code-generator/src/parser/SchemaParser.ts b/packages/code-generator/src/parser/SchemaParser.ts index 3104e01f3..4288d894b 100644 --- a/packages/code-generator/src/parser/SchemaParser.ts +++ b/packages/code-generator/src/parser/SchemaParser.ts @@ -6,10 +6,8 @@ import { SUPPORT_SCHEMA_VERSION_LIST } from '../const'; import { handleChildren } from '../utils/children'; -import { uniqueArray } from '../utils/common'; import { - ChildNodeItem, ChildNodeType, CodeGeneratorError, CompatibilityError, @@ -86,7 +84,7 @@ class SchemaParser implements ISchemaParser { }); } } else { - throw new CodeGeneratorError(`Can't find anything to generator.`); + throw new CodeGeneratorError(`Can't find anything to generate.`); } // 建立所有容器的内部依赖索引 diff --git a/packages/code-generator/src/plugins/component/react/containerInjectUtils.ts b/packages/code-generator/src/plugins/component/react/containerInjectUtils.ts index c2deeaa89..a6670230a 100644 --- a/packages/code-generator/src/plugins/component/react/containerInjectUtils.ts +++ b/packages/code-generator/src/plugins/component/react/containerInjectUtils.ts @@ -5,7 +5,6 @@ import { ChunkType, FileType, ICodeStruct, - IContainerInfo, } from '../../../types'; const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/component/react/jsx.ts b/packages/code-generator/src/plugins/component/react/jsx.ts index ed02499f6..3e5162353 100644 --- a/packages/code-generator/src/plugins/component/react/jsx.ts +++ b/packages/code-generator/src/plugins/component/react/jsx.ts @@ -11,7 +11,7 @@ import { IJSExpression, } from '../../../types'; -import { handleChildren } from '@/utils/children'; +import { handleChildren } from '../../../utils/children'; import { generateCompositeType } from '../../utils/compositeType'; import { REACT_CHUNK_NAME } from './const'; diff --git a/packages/code-generator/src/plugins/project/constants.ts b/packages/code-generator/src/plugins/project/constants.ts index 6e6e887b6..7be166d3d 100644 --- a/packages/code-generator/src/plugins/project/constants.ts +++ b/packages/code-generator/src/plugins/project/constants.ts @@ -1,12 +1,12 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; -import { generateCompositeType } from '@/plugins/utils/compositeType'; +import { COMMON_CHUNK_NAME } from '../../const/generator'; +import { generateCompositeType } from '../../plugins/utils/compositeType'; import { BuilderComponentPlugin, ChunkType, FileType, ICodeStruct, IProjectInfo, -} from '@/types'; +} from '../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/plugins/entry.ts b/packages/code-generator/src/plugins/project/framework/icejs/plugins/entry.ts index 488e573b5..f32d9abed 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/plugins/entry.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/plugins/entry.ts @@ -1,4 +1,4 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; +import { COMMON_CHUNK_NAME } from '../../../../../const/generator'; import { BuilderComponentPlugin, @@ -6,7 +6,7 @@ import { FileType, ICodeStruct, IProjectInfo, -} from '@/types'; +} from '../../../../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/plugins/entryHtml.ts b/packages/code-generator/src/plugins/project/framework/icejs/plugins/entryHtml.ts index 7b12c4252..6ceebc04a 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/plugins/entryHtml.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/plugins/entryHtml.ts @@ -1,4 +1,4 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; +import { COMMON_CHUNK_NAME } from '../../../../../const/generator'; import { BuilderComponentPlugin, @@ -6,7 +6,7 @@ import { FileType, ICodeStruct, IProjectInfo, -} from '@/types'; +} from '../../../../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/plugins/globalStyle.ts b/packages/code-generator/src/plugins/project/framework/icejs/plugins/globalStyle.ts index d0e923968..3e083c1f1 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/plugins/globalStyle.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/plugins/globalStyle.ts @@ -1,4 +1,4 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; +import { COMMON_CHUNK_NAME } from '../../../../../const/generator'; import { BuilderComponentPlugin, @@ -6,7 +6,7 @@ import { FileType, ICodeStruct, IProjectInfo, -} from '@/types'; +} from '../../../../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/plugins/packageJSON.ts b/packages/code-generator/src/plugins/project/framework/icejs/plugins/packageJSON.ts index fbcf98d91..0e4c48805 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/plugins/packageJSON.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/plugins/packageJSON.ts @@ -1,4 +1,4 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; +import { COMMON_CHUNK_NAME } from '../../../../../const/generator'; import { BuilderComponentPlugin, @@ -7,7 +7,7 @@ import { ICodeStruct, IPackageJSON, IProjectInfo, -} from '@/types'; +} from '../../../../../types'; interface IIceJsPackageJSON extends IPackageJSON { ideMode: { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/plugins/router.ts b/packages/code-generator/src/plugins/project/framework/icejs/plugins/router.ts index 29a9dd995..b2c9c0805 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/plugins/router.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/plugins/router.ts @@ -1,4 +1,4 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; +import { COMMON_CHUNK_NAME } from '../../../../../const/generator'; import { BuilderComponentPlugin, @@ -6,7 +6,7 @@ import { FileType, ICodeStruct, IRouterInfo, -} from '@/types'; +} from '../../../../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/README.md.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/README.md.ts index 62933484a..c5a268127 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/README.md.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/README.md.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/abc.json.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/abc.json.ts index b7e2a9565..9b99a2185 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/abc.json.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/abc.json.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/build.json.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/build.json.ts index 359a1b6b5..b30c7c58f 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/build.json.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/build.json.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/editorconfig.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/editorconfig.ts index 445fe9647..14876b397 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/editorconfig.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/editorconfig.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintignore.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintignore.ts index f115ec386..8f6f68e1f 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintignore.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintignore.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintrc.js.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintrc.js.ts index 02aed6eec..ad7ce4480 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintrc.js.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/eslintrc.js.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/gitignore.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/gitignore.ts index e4c31b7ca..e7bed2e9e 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/gitignore.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/gitignore.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/jsconfig.json.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/jsconfig.json.ts index 387a02b1b..f5b5e9fa2 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/jsconfig.json.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/jsconfig.json.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierignore.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierignore.ts index f50c843d1..f6d2e9ed2 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierignore.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierignore.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierrc.js.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierrc.js.ts index 83b4dc8b7..66531c8dc 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierrc.js.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/prettierrc.js.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.jsx.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.jsx.ts index aa1f1bd08..639337aa5 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.jsx.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.jsx.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.module.scss.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.module.scss.ts index 3f1f98511..cb57ac646 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.module.scss.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Footer/index.module.scss.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.jsx.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.jsx.ts index 517972a5b..cef5376ae 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.jsx.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.jsx.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.module.scss.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.module.scss.ts index 214dcf88a..6969595e6 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.module.scss.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/Logo/index.module.scss.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/PageNav/index.jsx.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/PageNav/index.jsx.ts index 4e81e4b67..b722e6695 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/PageNav/index.jsx.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/components/PageNav/index.jsx.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/index.jsx.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/index.jsx.ts index 6c3fd945e..6f7cd7b92 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/index.jsx.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/index.jsx.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/menuConfig.js.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/menuConfig.js.ts index 1ed76f426..70ed04738 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/menuConfig.js.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/src/layouts/BasicLayout/menuConfig.js.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintignore.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintignore.ts index ee0c9367f..5d369298a 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintignore.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintignore.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintrc.js.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintrc.js.ts index 51f420222..7ed60d2c9 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintrc.js.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/stylelintrc.js.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/files/tsconfig.json.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/files/tsconfig.json.ts index 7d2c26261..4b8aab7ed 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/files/tsconfig.json.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/files/tsconfig.json.ts @@ -1,5 +1,5 @@ -import ResultFile from '@/model/ResultFile'; -import { IResultFile } from '@/types'; +import ResultFile from '../../../../../../model/ResultFile'; +import { IResultFile } from '../../../../../../types'; export default function getFile(): [string[], IResultFile] { const file = new ResultFile( diff --git a/packages/code-generator/src/plugins/project/framework/icejs/template/index.ts b/packages/code-generator/src/plugins/project/framework/icejs/template/index.ts index 326290e3e..2a1f3a285 100644 --- a/packages/code-generator/src/plugins/project/framework/icejs/template/index.ts +++ b/packages/code-generator/src/plugins/project/framework/icejs/template/index.ts @@ -1,5 +1,9 @@ -import ResultDir from '@/model/ResultDir'; -import { IProjectTemplate, IResultDir, IResultFile } from '@/types'; +import ResultDir from '../../../../../model/ResultDir'; +import { + IProjectTemplate, + IResultDir, + IResultFile, +} from '../../../../../types'; import file12 from './files/abc.json'; import file11 from './files/build.json'; diff --git a/packages/code-generator/src/plugins/project/i18n.ts b/packages/code-generator/src/plugins/project/i18n.ts index 59e05b8d4..14b9ef773 100644 --- a/packages/code-generator/src/plugins/project/i18n.ts +++ b/packages/code-generator/src/plugins/project/i18n.ts @@ -1,12 +1,12 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; -import { generateCompositeType } from '@/plugins/utils/compositeType'; +import { COMMON_CHUNK_NAME } from '../../const/generator'; +import { generateCompositeType } from '../../plugins/utils/compositeType'; import { BuilderComponentPlugin, ChunkType, FileType, ICodeStruct, IProjectInfo, -} from '@/types'; +} from '../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/project/utils.ts b/packages/code-generator/src/plugins/project/utils.ts index 8a104dc45..f40ba41e2 100644 --- a/packages/code-generator/src/plugins/project/utils.ts +++ b/packages/code-generator/src/plugins/project/utils.ts @@ -1,13 +1,12 @@ -import { COMMON_CHUNK_NAME } from '@/const/generator'; -import { generateCompositeType } from '@/plugins/utils/compositeType'; -// import { } from '@/plugins/utils/jsExpression'; +import { COMMON_CHUNK_NAME } from '../../const/generator'; + import { BuilderComponentPlugin, ChunkType, FileType, ICodeStruct, IUtilInfo, -} from '@/types'; +} from '../../types'; // TODO: How to merge this logic to common deps const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { diff --git a/packages/code-generator/src/plugins/utils/compositeType.ts b/packages/code-generator/src/plugins/utils/compositeType.ts index a1bfdf220..2e102fcac 100644 --- a/packages/code-generator/src/plugins/utils/compositeType.ts +++ b/packages/code-generator/src/plugins/utils/compositeType.ts @@ -1,4 +1,4 @@ -import { CompositeArray, CompositeValue, ICompositeObject } from '@/types'; +import { CompositeArray, CompositeValue, ICompositeObject } from '../../types'; import { generateValue, isJsExpression } from './jsExpression'; function generateArray(value: CompositeArray): string { diff --git a/packages/code-generator/src/postprocessor/prettier/index.ts b/packages/code-generator/src/postprocessor/prettier/index.ts index 694038aa0..947c535c2 100644 --- a/packages/code-generator/src/postprocessor/prettier/index.ts +++ b/packages/code-generator/src/postprocessor/prettier/index.ts @@ -1,6 +1,6 @@ import prettier from 'prettier'; -import { PostProcessor } from '@/types'; +import { PostProcessor } from '../../types'; const PARSERS = ['css', 'scss', 'less', 'json', 'html', 'vue']; diff --git a/packages/code-generator/src/publisher/disk/index.ts b/packages/code-generator/src/publisher/disk/index.ts index a806e2ce4..77f45c07a 100644 --- a/packages/code-generator/src/publisher/disk/index.ts +++ b/packages/code-generator/src/publisher/disk/index.ts @@ -1,4 +1,4 @@ -import { CodeGeneratorError, IResultDir } from '@/types'; +import { CodeGeneratorError, IResultDir } from '../../types'; export type PublisherFactory = (configuration?: Partial) => U; diff --git a/packages/code-generator/src/publisher/disk/utils.ts b/packages/code-generator/src/publisher/disk/utils.ts index 4352031ef..35fbbc2ad 100644 --- a/packages/code-generator/src/publisher/disk/utils.ts +++ b/packages/code-generator/src/publisher/disk/utils.ts @@ -1,7 +1,7 @@ import { existsSync, mkdir, writeFile } from 'fs'; import { join } from 'path'; -import { IResultDir, IResultFile } from '@/types'; +import { IResultDir, IResultFile } from '../../types'; export const writeFolder = async ( folder: IResultDir, diff --git a/packages/code-generator/src/solutions/icejs.ts b/packages/code-generator/src/solutions/icejs.ts index e8091e69b..10fe842c4 100644 --- a/packages/code-generator/src/solutions/icejs.ts +++ b/packages/code-generator/src/solutions/icejs.ts @@ -1,27 +1,27 @@ -import { IProjectBuilder } from '@/types'; +import { IProjectBuilder } from '../types'; -import { createProjectBuilder } from '@/generator/ProjectBuilder'; +import { createProjectBuilder } from '../generator/ProjectBuilder'; -import esmodule from '@/plugins/common/esmodule'; -import containerClass from '@/plugins/component/react/containerClass'; -import containerInitState from '@/plugins/component/react/containerInitState'; -// import containerInjectUtils from '@/plugins/component/react/containerInjectUtils'; -import containerLifeCycle from '@/plugins/component/react/containerLifeCycle'; -import containerMethod from '@/plugins/component/react/containerMethod'; -import jsx from '@/plugins/component/react/jsx'; -import reactCommonDeps from '@/plugins/component/react/reactCommonDeps'; -import css from '@/plugins/component/style/css'; -import constants from '@/plugins/project/constants'; -import iceJsEntry from '@/plugins/project/framework/icejs/plugins/entry'; -import iceJsEntryHtml from '@/plugins/project/framework/icejs/plugins/entryHtml'; -import iceJsGlobalStyle from '@/plugins/project/framework/icejs/plugins/globalStyle'; -import iceJsPackageJSON from '@/plugins/project/framework/icejs/plugins/packageJSON'; -import iceJsRouter from '@/plugins/project/framework/icejs/plugins/router'; -import template from '@/plugins/project/framework/icejs/template'; -import i18n from '@/plugins/project/i18n'; -import utils from '@/plugins/project/utils'; +import esmodule from '../plugins/common/esmodule'; +import containerClass from '../plugins/component/react/containerClass'; +import containerInitState from '../plugins/component/react/containerInitState'; +import containerInjectUtils from '../plugins/component/react/containerInjectUtils'; +import containerLifeCycle from '../plugins/component/react/containerLifeCycle'; +import containerMethod from '../plugins/component/react/containerMethod'; +import jsx from '../plugins/component/react/jsx'; +import reactCommonDeps from '../plugins/component/react/reactCommonDeps'; +import css from '../plugins/component/style/css'; +import constants from '../plugins/project/constants'; +import iceJsEntry from '../plugins/project/framework/icejs/plugins/entry'; +import iceJsEntryHtml from '../plugins/project/framework/icejs/plugins/entryHtml'; +import iceJsGlobalStyle from '../plugins/project/framework/icejs/plugins/globalStyle'; +import iceJsPackageJSON from '../plugins/project/framework/icejs/plugins/packageJSON'; +import iceJsRouter from '../plugins/project/framework/icejs/plugins/router'; +import template from '../plugins/project/framework/icejs/template'; +import i18n from '../plugins/project/i18n'; +import utils from '../plugins/project/utils'; -import { prettier } from '@/postprocessor'; +import { prettier } from '../postprocessor'; export default function createIceJsProjectBuilder(): IProjectBuilder { return createProjectBuilder({ @@ -31,7 +31,7 @@ export default function createIceJsProjectBuilder(): IProjectBuilder { reactCommonDeps, esmodule, containerClass, - // containerInjectUtils, + containerInjectUtils, containerInitState, containerLifeCycle, containerMethod, @@ -42,7 +42,7 @@ export default function createIceJsProjectBuilder(): IProjectBuilder { reactCommonDeps, esmodule, containerClass, - // containerInjectUtils, + containerInjectUtils, containerInitState, containerLifeCycle, containerMethod, diff --git a/packages/code-generator/src/types/core.ts b/packages/code-generator/src/types/core.ts index 8fedf317b..804f4f3e6 100644 --- a/packages/code-generator/src/types/core.ts +++ b/packages/code-generator/src/types/core.ts @@ -143,3 +143,8 @@ export interface IProjectBuilder { } export type PostProcessor = (content: string, fileType: string) => string; + +// TODO: temp interface, need modify +export interface IPluginOptions { + fileDirDepth: number; +} diff --git a/packages/code-generator/src/utils/children.ts b/packages/code-generator/src/utils/children.ts index 3d848f988..2f2d34fda 100644 --- a/packages/code-generator/src/utils/children.ts +++ b/packages/code-generator/src/utils/children.ts @@ -3,7 +3,7 @@ import { ChildNodeType, IComponentNodeItem, IJSExpression, -} from '@/types'; +} from '../types'; // tslint:disable-next-line: no-empty const noop = () => []; diff --git a/packages/code-generator/tsconfig.json b/packages/code-generator/tsconfig.json index 2660ef448..eb8638577 100644 --- a/packages/code-generator/tsconfig.json +++ b/packages/code-generator/tsconfig.json @@ -1,17 +1,12 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "target": "es5", - "strictNullChecks": true, - "inlineSources": false, - "lib": ["es6"], - "downlevelIteration": true, - "paths": { - "@/*": ["./src/*"] - }, "outDir": "./lib", + "lib": [ + "es6" + ], "types": ["node"], - "baseUrl": "." /* Base directory to resolve non-absolute module names. */ + "baseUrl": ".", /* Base directory to resolve non-absolute module names. */ }, "include": [ "src/**/*" diff --git a/packages/code-generator/webpack.config.js b/packages/code-generator/webpack.config.js deleted file mode 100644 index 00f21d2e1..000000000 --- a/packages/code-generator/webpack.config.js +++ /dev/null @@ -1,31 +0,0 @@ -const path = require('path'); -const nodeExternals = require('webpack-node-externals'); -const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'); - -module.exports = { - mode: 'production', - target: 'node', - entry: { - index: './src/index.ts', - // demo: './src/demo/main.ts', - }, - module: { - rules: [ - { - test: /\.tsx?$/, - use: 'ts-loader', - exclude: /node_modules/, - }, - ], - }, - resolve: { - extensions: [ '.tsx', '.ts', '.js' ], - plugins: [new TsconfigPathsPlugin({/* options: see below */})], - }, - output: { - // filename: 'bundle.js', - filename: '[name].js', - path: path.resolve(__dirname, 'lib'), - }, - externals: [nodeExternals()], // in order to ignore all modules in node_modules folder -};