fix(nerv-build): fix error during installing nerv-build on windows

NervJS · Mar 15, 2018 · 6f9caf6 · 6f9caf6
1 parent 386f07a
commit 6f9caf6
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 3 deletions.
diff --git a/packages/nerv-create-class/rollup.config.js b/packages/nerv-create-class/rollup.config.js
@@ -9,6 +9,10 @@ const alias = require('rollup-plugin-alias')
 const { join } = require('path')
 const cwd = __dirname
 
+function resolver (path) {
+  return join(__dirname, path)
+}
+
 const optJSPlugin = {
   name: 'optimizeJs',
   transformBundle (code) {
@@ -63,6 +67,7 @@ const baseConfig = {
     }),
     resolve(),
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     }),
     buble(),

diff --git a/packages/nerv-devtools/rollup.config.js b/packages/nerv-devtools/rollup.config.js
@@ -29,6 +29,7 @@ module.exports = {
       'nerv-utils': join(cwd, '../nerv-utils/dist/index')
     }),
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     })
   ]

diff --git a/packages/nerv-server/rollup.config.js b/packages/nerv-server/rollup.config.js
@@ -3,14 +3,19 @@ const pkg = require('./package.json')
 const alias = require('rollup-plugin-alias')
 const { join } = require('path')
 const cwd = __dirname
+function resolver (path) {
+  return join(__dirname, path)
+}
 module.exports = {
   input: 'src/index.ts',
   plugins: [
     alias({
       'nerv-shared': join(cwd, '../nerv-shared/dist/index'),
       'nerv-utils': join(cwd, '../nerv-utils/dist/index')
     }),
-    typescript()
+    typescript({
+      tsconfig: resolver('../../tsconfig.json')
+    })
   ],
   output: [
     {

diff --git a/packages/nerv-shared/rollup.config.js b/packages/nerv-shared/rollup.config.js
@@ -12,6 +12,7 @@ module.exports = {
   },
   plugins: [
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     })
   ]

diff --git a/packages/nerv-test-utils/rollup.config.js b/packages/nerv-test-utils/rollup.config.js
@@ -30,6 +30,7 @@ module.exports = {
       'nerv-utils': join(cwd, '../nerv-utils/dist/index')
     }),
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     })
   ]

diff --git a/packages/nerv-test-utils/src/index.ts b/packages/nerv-test-utils/src/index.ts
@@ -8,8 +8,7 @@ import {
   isComponent
 } from 'nerv-shared'
 import { isString, isArray } from 'nerv-utils'
-// tslint:disable-next-line:no-var-requires
-const simulateEvents = require('simulate-event')
+import simulateEvents from 'simulate-event'
 
 function renderIntoDocument (instance) {
   const dom = document.createElement('div')

diff --git a/packages/nerv-utils/rollup.config.js b/packages/nerv-utils/rollup.config.js
@@ -14,6 +14,7 @@ module.exports = {
   external: ['nerv-shared'],
   plugins: [
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     })
   ]

diff --git a/packages/nerv/rollup.config.js b/packages/nerv/rollup.config.js
@@ -9,6 +9,10 @@ const alias = require('rollup-plugin-alias')
 const { join } = require('path')
 const cwd = __dirname
 
+function resolver (path) {
+  return join(__dirname, path)
+}
+
 const optJSPlugin = {
   name: 'optimizeJs',
   transformBundle (code) {
@@ -62,6 +66,7 @@ const baseConfig = {
     }),
     resolve(),
     typescript({
+      tsconfig: resolver('../../tsconfig.json'),
       typescript: require('typescript')
     }),
     buble(),