Skip to content

Commit c8c1621

Browse files
authored
Merge pull request #22 from ncphillips/import-cjs-packages
allow for import of commonjs modules
2 parents fa82edd + 491db50 commit c8c1621

File tree

3 files changed

+34
-1
lines changed

3 files changed

+34
-1
lines changed

packages/type-scripts/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"chalk": "^2.3.0",
1919
"react-dev-utils": "^4.2.1",
2020
"rollup": "^0.53.3",
21+
"rollup-plugin-commonjs": "^8.2.6",
2122
"rollup-plugin-node-resolve": "^3.0.0",
2223
"rollup-plugin-typescript2": "^0.9.0"
2324
},

packages/type-scripts/scripts/build.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const path = require("path")
44
const rollupTypescript = require("rollup-plugin-typescript2")
55
const rollup = require("rollup")
66
const resolve = require("rollup-plugin-node-resolve")
7+
const commonJs = require("rollup-plugin-commonjs")
78

89
const PROJECT = "../../../"
910
const NODE_MODULES = "../../"
@@ -30,6 +31,9 @@ const inputOptions = {
3031
moduleDirectory: path.resolve(__dirname, NODE_MODULES),
3132
},
3233
}),
34+
commonJs({
35+
sourceMap: true,
36+
}),
3337
],
3438
}
3539

packages/type-scripts/yarn.lock

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
# yarn lockfile v1
33

44

5+
acorn@^5.2.1:
6+
version "5.3.0"
7+
resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
8+
59
address@1.0.3, address@^1.0.1:
610
version "1.0.3"
711
resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
@@ -170,6 +174,10 @@ estree-walker@^0.3.0:
170174
version "0.3.1"
171175
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
172176

177+
estree-walker@^0.5.0:
178+
version "0.5.1"
179+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.1.tgz#64fc375053abc6f57d73e9bd2f004644ad3c5854"
180+
173181
esutils@^2.0.2:
174182
version "2.0.2"
175183
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -479,6 +487,12 @@ lru-cache@^4.0.1:
479487
pseudomap "^1.0.2"
480488
yallist "^2.1.2"
481489

490+
magic-string@^0.22.4:
491+
version "0.22.4"
492+
resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff"
493+
dependencies:
494+
vlq "^0.2.1"
495+
482496
micromatch@^2.3.11:
483497
version "2.3.11"
484498
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
@@ -656,7 +670,7 @@ resolve@1.1.7:
656670
version "1.1.7"
657671
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
658672

659-
resolve@^1.1.6, resolve@^1.5.0:
673+
resolve@^1.1.6, resolve@^1.4.0, resolve@^1.5.0:
660674
version "1.5.0"
661675
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
662676
dependencies:
@@ -669,6 +683,16 @@ restore-cursor@^2.0.0:
669683
onetime "^2.0.0"
670684
signal-exit "^3.0.2"
671685

686+
rollup-plugin-commonjs@^8.2.6:
687+
version "8.2.6"
688+
resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.2.6.tgz#27e5b9069ff94005bb01e01bb46a1e4873784677"
689+
dependencies:
690+
acorn "^5.2.1"
691+
estree-walker "^0.5.0"
692+
magic-string "^0.22.4"
693+
resolve "^1.4.0"
694+
rollup-pluginutils "^2.0.1"
695+
672696
rollup-plugin-node-resolve@^3.0.0:
673697
version "3.0.0"
674698
resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.0.0.tgz#8b897c4c3030d5001277b0514b25d2ca09683ee0"
@@ -813,6 +837,10 @@ url-parse@^1.1.8:
813837
querystringify "~1.0.0"
814838
requires-port "~1.0.0"
815839

840+
vlq@^0.2.1:
841+
version "0.2.3"
842+
resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
843+
816844
websocket-driver@>=0.5.1:
817845
version "0.7.0"
818846
resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"

0 commit comments

Comments
 (0)