diff --git a/packages/code-generator/src/plugins/project/framework/rax/plugins/entry.ts b/packages/code-generator/src/plugins/project/framework/rax/plugins/entry.ts index e586ac2e2..b838f8abe 100644 --- a/packages/code-generator/src/plugins/project/framework/rax/plugins/entry.ts +++ b/packages/code-generator/src/plugins/project/framework/rax/plugins/entry.ts @@ -24,6 +24,8 @@ const pluginFactory: BuilderComponentPluginFactory = () => { content: ` import { runApp } from 'rax-app'; import appConfig from './app.json'; + +import './global.scss'; `, linkAfter: [], }); diff --git a/packages/code-generator/src/plugins/project/framework/rax/plugins/globalStyle.ts b/packages/code-generator/src/plugins/project/framework/rax/plugins/globalStyle.ts index a990947a9..78e409fd2 100644 --- a/packages/code-generator/src/plugins/project/framework/rax/plugins/globalStyle.ts +++ b/packages/code-generator/src/plugins/project/framework/rax/plugins/globalStyle.ts @@ -21,9 +21,7 @@ const pluginFactory: BuilderComponentPluginFactory = () => { type: ChunkType.STRING, fileType: FileType.SCSS, // TODO: 样式文件的类型定制化? name: COMMON_CHUNK_NAME.StyleDepsImport, - content: ` -// TODO: 引入默认全局样式 -`, + content: ``, linkAfter: [], }); diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/app.js b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/app.js index f04a4233b..bc474c6e3 100644 --- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/app.js +++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/app.js @@ -1,4 +1,6 @@ import { runApp } from 'rax-app'; import appConfig from './app.json'; +import './global.scss'; + runApp(appConfig); diff --git a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/global.scss b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/global.scss index 5a853d5a9..0d203c62a 100644 --- a/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/global.scss +++ b/packages/code-generator/test-cases/rax-app/demo1/expected/demo-project/src/global.scss @@ -1,5 +1,3 @@ -// TODO: 引入默认全局样式 - body { -webkit-font-smoothing: antialiased; } diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/app.js b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/app.js index f04a4233b..bc474c6e3 100644 --- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/app.js +++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/app.js @@ -1,4 +1,6 @@ import { runApp } from 'rax-app'; import appConfig from './app.json'; +import './global.scss'; + runApp(appConfig); diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/global.scss b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/global.scss index 5a853d5a9..2b98f3726 100644 --- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/global.scss +++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/global.scss @@ -1,5 +1,9 @@ -// TODO: 引入默认全局样式 - body { -webkit-font-smoothing: antialiased; } + +page, +body { + width: 750rpx; + overflow-x: hidden; +} diff --git a/packages/code-generator/test-cases/rax-app/demo2/schema.json5 b/packages/code-generator/test-cases/rax-app/demo2/schema.json5 index dd6492370..eb72af581 100644 --- a/packages/code-generator/test-cases/rax-app/demo2/schema.json5 +++ b/packages/code-generator/test-cases/rax-app/demo2/schema.json5 @@ -341,6 +341,7 @@ }, }, ], + css: 'page,body{\n width: 750rpx;\n overflow-x: hidden;\n}', config: { sdkVersion: '1.0.3', historyMode: 'hash',