diff --git a/config/mp/paths.js b/config/mp/paths.js index 145108f..abf0186 100644 --- a/config/mp/paths.js +++ b/config/mp/paths.js @@ -18,16 +18,16 @@ let moduleFileExtensions = [ 'ts', ]; -if (process.env.OAK_DEV_MODE === 'server') { - moduleFileExtensions = [ - 'server.js', - 'server.ts', - ].concat(moduleFileExtensions); -} else { +if (process.env.OAK_DEV_MODE === 'frontend') { moduleFileExtensions = [ 'frontend.js', 'frontend.ts', ].concat(moduleFileExtensions); +} else { + moduleFileExtensions = [ + 'server.js', + 'server.ts', + ].concat(moduleFileExtensions); } const prodFileExtensions = ['prod.mp.js', 'prod.mp.ts', 'prod.js', 'prod.ts']; diff --git a/config/native/babelEnvPlugin.js b/config/native/babelEnvPlugin.js index b032b06..adf8716 100644 --- a/config/native/babelEnvPlugin.js +++ b/config/native/babelEnvPlugin.js @@ -3,7 +3,7 @@ const assert = require('assert'); const REPLACE_HOLDERS = { OAK_PLATFORM: 'native', - OAK_DEV_MODE: process.env.OAK_DEV_MODE, + OAK_DEV_MODE: process.env.OAK_DEV_MODE || 'server', SUB_DIR_NAME: process.env.SUB_DIR_NAME || 'native', }; diff --git a/config/native/metro.config.js b/config/native/metro.config.js index 28c621c..f48e507 100644 --- a/config/native/metro.config.js +++ b/config/native/metro.config.js @@ -7,20 +7,20 @@ const watchFolders = [ let moduleFileExtensions = ['js', 'ts', 'jsx', 'tsx', 'less', 'json', 'svg']; -if (process.env.OAK_DEV_MODE === 'server') { - moduleFileExtensions = [ - 'server.js', - 'server.ts', - 'server.tsx', - 'server.jsx', - ].concat(moduleFileExtensions); -} else { +if (process.env.OAK_DEV_MODE === 'frontend') { moduleFileExtensions = [ 'frontend.js', 'frontend.ts', 'frontend.tsx', 'frontend.jsx', ].concat(moduleFileExtensions); +} else { + moduleFileExtensions = [ + 'server.js', + 'server.ts', + 'server.tsx', + 'server.jsx', + ].concat(moduleFileExtensions); } const prodFileExtensions = [ @@ -47,9 +47,7 @@ else if (process.env.NODE_ENV === 'staging') { 'staging.ts', 'staging.jsx', 'staging.tsx', - ] - .concat(prodFileExtensions) - .concat(moduleFileExtensions); + ].concat(prodFileExtensions).concat(moduleFileExtensions); } else { moduleFileExtensions = [ 'dev.native.js', diff --git a/config/native/transformer.js b/config/native/transformer.js index 93412bd..e965b9c 100644 --- a/config/native/transformer.js +++ b/config/native/transformer.js @@ -76,21 +76,6 @@ function transform({ filename, options, plugins, src }) { : parseSync(src, babelConfig); const transformResult = transformFromAstSync(sourceAst, src, babelConfig); - - // 为page和componet下的OakComponent注入getRender函数,去取得同目录下的render.native.tsx - // 改成plugin注入 - // const resultAst = transformResult.ast; - // const { base } = path.parse(filename); - // if (['index.ts', 'index.js'].includes(base)) { - // traverse(resultAst, { - // CallExpression(path) { - // const node = path.node; - // if (t.isIdentifier(node.callee) && node.callee.name === 'OakComponent') { - // injectGetRender(node, options.projectRoot, filename, 'native'); - // } - // } - // }) - // } return { ast: nullthrows(transformResult.ast), @@ -99,11 +84,6 @@ function transform({ filename, options, plugins, src }) { }; if (filename.endsWith('less')) { - // return renderToCSS({ src, filename, options }).then((css) => { - // const cssObject = renderCSSToReactNative(css); - // const newSrc = `module.exports = ${JSON.stringify(cssObject)}`; - // return transInner(newSrc); - // }); return lessTransformer.transform({ src, filename, options }); } else if (filename.endsWith('.svg')) { diff --git a/config/web/paths.js b/config/web/paths.js index b70eadc..90f7e13 100644 --- a/config/web/paths.js +++ b/config/web/paths.js @@ -41,16 +41,7 @@ let moduleFileExtensions = [ 'jsx', ]; -if (process.env.OAK_DEV_MODE === 'server') { - moduleFileExtensions = [ - 'server.mjs', - 'server.js', - 'server.ts', - 'server.tsx', - 'server.jsx', - ].concat(moduleFileExtensions); -} -else { +if (process.env.OAK_DEV_MODE === 'frontend') { moduleFileExtensions = [ 'frontend.mjs', 'frontend.js', @@ -59,6 +50,15 @@ else { 'frontend.jsx', ].concat(moduleFileExtensions); } +else { + moduleFileExtensions = [ + 'server.mjs', + 'server.js', + 'server.ts', + 'server.tsx', + 'server.jsx', + ].concat(moduleFileExtensions); +} const prodFileExtensions = [ 'prod.web.js',