Skip to content

Commit 53dab5d

Browse files
author
Maciej Warszawski
committed
fix node6 compilation
1 parent 5955d6c commit 53dab5d

File tree

3 files changed

+23
-29
lines changed

3 files changed

+23
-29
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@
5454
"react-dom": "^16.2.0",
5555
"react-intl": "^2.4.0",
5656
"rollup": "^0.56.3",
57-
"rollup-plugin-babel": "^3.0.3",
58-
"rollup-plugin-postcss": "^1.3.1",
57+
"rollup-plugin-postcss": "1.2.8",
5958
"rollup-plugin-typescript": "^0.8.1",
6059
"source-map-loader": "^0.2.3",
6160
"style-loader": "^0.20.2",

rollup.lib.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,22 @@ const copyright = `/*
1313
`;
1414
const cssExportMap = {};
1515

16+
const pluginTypescriptOptions = tsconfig.compilerOptions;
17+
pluginTypescriptOptions.typescript = typescript;
18+
pluginTypescriptOptions.tsconfig = false;
19+
20+
const pluginPostcssOptions = {
21+
modules: true,
22+
extensions: ['.css'],
23+
namedExports: true,
24+
plugins: [postCssCssNext],
25+
};
26+
1627
function rollupConfig(packageBasePath) {
1728
const pkg = require(path.resolve(packageBasePath, 'package.json'));
1829
const plugins = [
19-
pluginTypescript({
20-
typescript,
21-
tsconfig: false,
22-
...tsconfig.compilerOptions,
23-
}),
24-
pluginPostcss({
25-
modules: true,
26-
extensions: ['.css'],
27-
namedExports: true,
28-
plugins: [postCssCssNext],
29-
}),
30+
pluginTypescript(pluginTypescriptOptions),
31+
pluginPostcss(pluginPostcssOptions),
3032
];
3133
const external = Object.getOwnPropertyNames(pkg.peerDependencies);
3234
const banner = copyright;

yarn.lock

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6728,7 +6728,7 @@ resolve@1.1.7:
67286728
version "1.1.7"
67296729
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
67306730

6731-
resolve@^1.1.7, resolve@^1.3.2, resolve@^1.3.3, resolve@^1.5.0:
6731+
resolve@^1.1.7, resolve@^1.3.2, resolve@^1.3.3:
67326732
version "1.5.0"
67336733
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
67346734
dependencies:
@@ -6772,15 +6772,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
67726772
hash-base "^2.0.0"
67736773
inherits "^2.0.1"
67746774

6775-
rollup-plugin-babel@^3.0.3:
6776-
version "3.0.3"
6777-
resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.3.tgz#63adedc863130327512a4a9006efc2241c5b7c15"
6778-
dependencies:
6779-
rollup-pluginutils "^1.5.0"
6780-
6781-
rollup-plugin-postcss@^1.3.1:
6782-
version "1.3.1"
6783-
resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-1.3.1.tgz#afe6466991a148856e89dbbd39bb0a32b48c96b1"
6775+
rollup-plugin-postcss@1.2.8:
6776+
version "1.2.8"
6777+
resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-1.2.8.tgz#3389f4235521cd6a019ab6316cadccb0046c11f3"
67846778
dependencies:
67856779
chalk "^2.0.0"
67866780
concat-with-sourcemaps "^1.0.5"
@@ -6792,9 +6786,8 @@ rollup-plugin-postcss@^1.3.1:
67926786
postcss-modules "^1.1.0"
67936787
promise.series "^0.2.0"
67946788
reserved-words "^0.1.2"
6795-
resolve "^1.5.0"
67966789
rollup-pluginutils "^2.0.1"
6797-
style-inject "^0.3.0"
6790+
style-inject "^0.2.0"
67986791

67996792
rollup-plugin-typescript@^0.8.1:
68006793
version "0.8.1"
@@ -6806,7 +6799,7 @@ rollup-plugin-typescript@^0.8.1:
68066799
tippex "^2.1.1"
68076800
typescript "^1.8.9"
68086801

6809-
rollup-pluginutils@^1.3.1, rollup-pluginutils@^1.5.0:
6802+
rollup-pluginutils@^1.3.1:
68106803
version "1.5.2"
68116804
resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
68126805
dependencies:
@@ -7343,9 +7336,9 @@ strong-log-transformer@^1.0.6:
73437336
moment "^2.6.0"
73447337
through "^2.3.4"
73457338

7346-
style-inject@^0.3.0:
7347-
version "0.3.0"
7348-
resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3"
7339+
style-inject@^0.2.0:
7340+
version "0.2.1"
7341+
resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.2.1.tgz#0cac933812c2693820d0351202aad0b36da78cb8"
73497342

73507343
style-loader@^0.20.2:
73517344
version "0.20.2"

0 commit comments

Comments
 (0)