fix: 修正 module import 错误

remaxjs · Oct 14, 2019 · e27547e · e27547e · vercel · Oct 14, 2019
1 parent 3638327
commit e27547e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/packages/remax-cli/src/build/plugins/nativeComponents/babelPlugin.ts b/packages/remax-cli/src/build/plugins/nativeComponents/babelPlugin.ts
@@ -8,6 +8,7 @@ import { Adapter } from '../../adapters';
 import { isNativeComponent } from './util';
 import { RemaxOptions } from '../../../getConfig';
 import alias from '../alias';
+import extensions from '../../../extensions';
 
 interface Component {
  type: string;
@@ -52,6 +53,7 @@ export default (options: RemaxOptions, adapter: Adapter) => () => ({
 
  let sourcePath = alias(options).resolveId(source, importer) || source;
  sourcePath = resolve.sync(sourcePath, {
+ extensions,
  basedir: path.dirname(importer),
  });
 

diff --git a/packages/remax-cli/src/build/rollupConfig.ts b/packages/remax-cli/src/build/rollupConfig.ts
@@ -32,6 +32,8 @@ import fixRegeneratorRuntime from './plugins/fixRegeneratorRuntime';
 import nativeComponents from './plugins/nativeComponents/index';
 import nativeComponentsBabelPlugin from './plugins/nativeComponents/babelPlugin';
 import alias from './plugins/alias';
+import extensions from '../extensions';
+import { without } from 'lodash';
 
 export default function rollupConfig(
  options: RemaxOptions,
@@ -98,15 +100,15 @@ export default function rollupConfig(
  'scheduler',
  'react-reconciler',
  ],
- extensions: ['.mjs', '.js', '.jsx', '.json', '.ts', '.tsx'],
+ extensions,
  customResolveOptions: {
  moduleDirectory: 'node_modules',
  },
  }),
  commonjs({
  include: /node_modules/,
  namedExports,
- extensions: ['.mjs', '.js', '.jsx', '.json', '.ts', '.tsx'],
+ extensions,
  ignoreGlobal: false,
  }),
  stub({
@@ -115,19 +117,19 @@ export default function rollupConfig(
  babel({
  babelrc: false,
  include: entries.pages.map(p => p.file),
- extensions: ['.js', '.jsx', '.ts', '.tsx'],
+ extensions: without(extensions, '.json'),
  plugins: [nativeComponentsBabelPlugin(options, adapter), page],
  presets: [[require.resolve('babel-preset-remax'), { react: false }]],
  }),
  babel({
  babelrc: false,
  include: entries.app,
- extensions: ['.js', '.jsx', '.ts', '.tsx'],
+ extensions: without(extensions, '.json'),
  plugins: [nativeComponentsBabelPlugin(options, adapter), app],
  presets: [[require.resolve('babel-preset-remax'), { react: false }]],
  }),
  babel({
- extensions: ['.js', '.jsx', '.ts', '.tsx'],
+ extensions: without(extensions, '.json'),
  plugins: [
  nativeComponentsBabelPlugin(options, adapter),
  components(adapter),

diff --git a/packages/remax-cli/src/extensions.ts b/packages/remax-cli/src/extensions.ts
@@ -0,0 +1,3 @@
+const extensions = ['.mjs', '.js', '.jsx', '.json', '.ts', '.tsx'];
+
+export default extensions;