From eae48b17e31b6d902aaff85ae8a5295a0728c1fa Mon Sep 17 00:00:00 2001 From: wkj <278599135@qq.com> Date: Fri, 19 Aug 2022 11:15:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0=20?= =?UTF-8?q?=E5=92=8C=20Web=E7=9A=84=E6=A0=B7=E5=BC=8F=E6=89=8B=E5=8A=A8imp?= =?UTF-8?q?ort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/babel-plugin/oakPath.js | 72 ++++++++++++++++---------------- config/babel-plugin/oakRender.js | 1 - 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/config/babel-plugin/oakPath.js b/config/babel-plugin/oakPath.js index 64ec49a..e5efb55 100644 --- a/config/babel-plugin/oakPath.js +++ b/config/babel-plugin/oakPath.js @@ -14,42 +14,42 @@ function isOakNamespaceIdentifier(node, name) { module.exports = (babel) => { return { visitor: { - Program(path, state) { - const { cwd, filename } = state; - const rel = relative(cwd, filename).replace(/\\/g, '/'); - if ( - /(pages|components)[\w|\W]+(index\.tsx|index\.pc\.tsx)$/.test( - rel - ) - ) { - const lessFile = filename.replace(/\.(ts|tsx)$/, '.less'); - const lessFileExists = fs.existsSync(lessFile); - const pcLessFile = filename.replace( - /\.(ts|tsx)$/, - '.pc.less' - ); - const pcLessFileExists = fs.existsSync(pcLessFile); - const { body } = path.node; - const lessFileImport = rel.endsWith('.pc.tsx') - ? pcLessFileExists - ? './index.pc.less' - : './index.less' - : lessFileExists - ? './index.less' - : './index.pc.less'; - if ( - (lessFileExists && !pcLessFileExists) || - (!lessFileExists && pcLessFileExists) - ) { - body.unshift( - t.importDeclaration( - [], - t.stringLiteral(lessFileImport) - ) - ); - } - } - }, + // Program(path, state) { + // const { cwd, filename } = state; + // const rel = relative(cwd, filename).replace(/\\/g, '/'); + // if ( + // /(pages|components)[\w|\W]+(index\.tsx|index\.pc\.tsx|web\.tsx|web\.pc\.tsx|web\.jsx|web\.pc\.jsx)$/.test( + // rel + // ) + // ) { + // const lessFile = filename.replace(/\.(ts|tsx|jsx)$/, '.less'); + // const lessFileExists = fs.existsSync(lessFile); + // const pcLessFile = filename.replace( + // /\.(ts|tsx)$/, + // '.pc.less' + // ); + // const pcLessFileExists = fs.existsSync(pcLessFile); + // const { body } = path.node; + // const lessFileImport = rel.endsWith('.pc.tsx') + // ? pcLessFileExists + // ? './index.pc.less' + // : './index.less' + // : lessFileExists + // ? './index.less' + // : './index.pc.less'; + // if ( + // (lessFileExists && !pcLessFileExists) || + // (!lessFileExists && pcLessFileExists) + // ) { + // body.unshift( + // t.importDeclaration( + // [], + // t.stringLiteral(lessFileImport) + // ) + // ); + // } + // } + // }, JSXAttribute(path, state) { const { cwd, filename } = state; const rel = relative(cwd, filename).replace(/\\/g, '/'); diff --git a/config/babel-plugin/oakRender.js b/config/babel-plugin/oakRender.js index 5d67eab..35e6d65 100644 --- a/config/babel-plugin/oakRender.js +++ b/config/babel-plugin/oakRender.js @@ -14,7 +14,6 @@ module.exports = (babel) => { const jsPage = (/oak-general-business\/lib/.test(rel) && /(pages|components)[\w|\W]+index\.(web.js|js)$/.test(rel)) || (!/node_modules/.test(rel) && /(pages|components)[\w|\W]+index\.(web.js|js)$/.test(rel)); if (tsPage || jsPage) { - console.log(rel); const tsxFile = filename.replace( /index\.(web.ts|ts|web.js|js)$/, tsPage ? 'web.tsx' : 'web.jsx'