fix(taro): 文件打包错误

wowlusitong · May 4, 2018 · e739236 · e739236
1 parent a90f579
commit e739236
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -62,6 +62,7 @@
     "npm-run-all": "^4.1.2",
     "rimraf": "^2.6.2",
     "rollup": "^0.57.1",
+    "rollup-plugin-alias": "^1.4.0",
     "rollup-plugin-babel": "^4.0.0-beta.2",
     "rollup-plugin-buble": "^0.19.2",
     "rollup-plugin-commonjs": "^9.1.0",

diff --git a/packages/taro-h5/rollup.config.js b/packages/taro-h5/rollup.config.js
@@ -1,6 +1,8 @@
 const { join } = require('path')
 const resolve = require('rollup-plugin-node-resolve')
 const babel = require('rollup-plugin-babel')
+const common = require('rollup-plugin-commonjs')
+const alias = require('rollup-plugin-alias')
 const cwd = __dirname
 
 const baseConfig = {
@@ -22,6 +24,9 @@ const baseConfig = {
     }
   ],
   plugins: [
+    alias({
+      '@tarojs/taro': join(cwd, '../taro/src/index')
+    }),
     resolve({
       preferBuiltins: false
     }),
@@ -39,7 +44,8 @@ const baseConfig = {
           'pragma': 'Nerv.createElement'
         }]
       ]
-    })
+    }),
+    common()
   ]
 }
 const esmConfig = Object.assign({}, baseConfig, {

diff --git a/packages/taro-h5/src/index.js b/packages/taro-h5/src/index.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import { getEnv, ENV_TYPE, internal_safe_get, internal_dynamic_recursive } from '@tarojs/taro/index.esm.js'
+import { getEnv, ENV_TYPE, internal_safe_get, internal_dynamic_recursive } from '@tarojs/taro'
 
 import initNativeApi from './native-api'
 

diff --git a/packages/taro-weapp/rollup.config.js b/packages/taro-weapp/rollup.config.js
@@ -1,6 +1,8 @@
 const { join } = require('path')
 const resolve = require('rollup-plugin-node-resolve')
 const babel = require('rollup-plugin-babel')
+const common = require('rollup-plugin-commonjs')
+const alias = require('rollup-plugin-alias')
 const cwd = __dirname
 
 const baseConfig = {
@@ -22,6 +24,9 @@ const baseConfig = {
     }
   ],
   plugins: [
+    alias({
+      '@tarojs/taro': join(cwd, '../taro/src/index')
+    }),
     resolve({
       preferBuiltins: false
     }),
@@ -39,7 +44,8 @@ const baseConfig = {
           'pragma': 'Nerv.createElement'
         }]
       ]
-    })
+    }),
+    common()
   ]
 }
 const esmConfig = Object.assign({}, baseConfig, {

diff --git a/packages/taro-weapp/src/create-page.js b/packages/taro-weapp/src/create-page.js
@@ -1,4 +1,4 @@
-import { internal_safe_get as safeGet } from '@tarojs/taro/index.esm.js'
+import { internal_safe_get as safeGet } from '@tarojs/taro'
 
 import { isEmptyObject, getPrototypeChain } from './util'
 

diff --git a/packages/taro-weapp/src/index.js b/packages/taro-weapp/src/index.js
@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-import { getEnv, ENV_TYPE, internal_safe_get, internal_dynamic_recursive } from '@tarojs/taro/index.esm.js'
+import { getEnv, ENV_TYPE, internal_safe_get, internal_dynamic_recursive } from '@tarojs/taro'
 
 import Component from './component'
 import createApp from './create-app'

diff --git a/yarn.lock b/yarn.lock
@@ -7485,6 +7485,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^2.0.0"
     inherits "^2.0.1"
 
+rollup-plugin-alias@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.4.0.tgz#120cba7c46621c03138f0ca6fd5dd2ade9872db9"
+  dependencies:
+    slash "^1.0.0"
+
 rollup-plugin-babel@^4.0.0-beta.2:
   version "4.0.0-beta.4"
   resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.0.0-beta.4.tgz#d869646885d6ad73dd10791a261fb92674a80410"