From e0059c1892178d999f223aeacf77426824c1b9fd Mon Sep 17 00:00:00 2001 From: Devin Fee Date: Fri, 21 Dec 2018 01:26:30 -0800 Subject: [PATCH] updated build config for storybook / tsconfig --- .storybook/webpack.config.js | 5 --- package-lock.json | 80 +----------------------------------- package.json | 2 - rollup.config.js | 11 ++--- tsconfig.json | 1 - 5 files changed, 5 insertions(+), 94 deletions(-) diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 18bb511b..3eea5163 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -1,7 +1,5 @@ const path = require("path"); -const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin"); - module.exports = (baseConfig, env, config) => { config.module.rules.push( { @@ -17,8 +15,5 @@ module.exports = (baseConfig, env, config) => { } ); config.resolve.extensions.push(".ts", ".tsx"); - config.resolve.plugins = [ - new TsconfigPathsPlugin({ configFile: "tsconfig.json" }) - ]; return config; }; diff --git a/package-lock.json b/package-lock.json index 09e165c4..d0679511 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rbx", - "version": "1.0.0-beta.2", + "version": "1.0.0-beta.6", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1750,12 +1750,6 @@ } } }, - "@types/json5": { - "version": "0.0.29", - "resolved": "http://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, "@types/node": { "version": "10.12.15", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.15.tgz", @@ -5354,12 +5348,6 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", - "dev": true - }, "default-require-extensions": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", @@ -8425,12 +8413,6 @@ "is-extglob": "^2.1.1" } }, - "is-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz", - "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=", - "dev": true - }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", @@ -13286,25 +13268,6 @@ "@types/node": "*" } }, - "rollup-plugin-node-resolve": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.0.0.tgz", - "integrity": "sha512-7Ni+/M5RPSUBfUaP9alwYQiIKnKeXCOHiqBpKUl9kwp3jX5ZJtgXAait1cne6pGEVUUztPD6skIKH9Kq9sNtfw==", - "dev": true, - "requires": { - "builtin-modules": "^3.0.0", - "is-module": "^1.0.0", - "resolve": "^1.8.1" - }, - "dependencies": { - "builtin-modules": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz", - "integrity": "sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg==", - "dev": true - } - } - }, "rollup-plugin-replace": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/rollup-plugin-replace/-/rollup-plugin-replace-2.1.0.tgz", @@ -15123,47 +15086,6 @@ "yn": "^2.0.0" } }, - "tsconfig-paths": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.7.0.tgz", - "integrity": "sha512-7iE+Q/2E1lgvxD+c0Ot+GFFmgmfIjt/zCayyruXkXQ84BLT85gHXy0WSoQSiuFX9+d+keE/jiON7notV74ZY+A==", - "dev": true, - "requires": { - "@types/json5": "^0.0.29", - "deepmerge": "^2.0.1", - "json5": "^1.0.1", - "minimist": "^1.2.0", - "strip-bom": "^3.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "http://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, - "tsconfig-paths-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz", - "integrity": "sha512-S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g==", - "dev": true, - "requires": { - "chalk": "^2.3.0", - "enhanced-resolve": "^4.0.0", - "tsconfig-paths": "^3.4.0" - } - }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index d351ab41..11f27e93 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,6 @@ "resolve-url-loader": "3.0.0", "rimraf": "^2.6.2", "rollup": "^0.67.4", - "rollup-plugin-node-resolve": "^4.0.0", "rollup-plugin-sass": "^0.9.3", "rollup-plugin-size-snapshot": "^0.7.0", "rollup-plugin-sourcemaps": "^0.4.2", @@ -108,7 +107,6 @@ "ts-jest": "^23.10.5", "ts-loader": "^5.3.1", "ts-node": "^7.0.1", - "tsconfig-paths-webpack-plugin": "^3.2.0", "tslib": "^1.9.3", "tslint": "^5.11.0", "tslint-config-prettier": "^1.17.0", diff --git a/rollup.config.js b/rollup.config.js index a766341d..c8ccb860 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,4 +1,3 @@ -import resolve from "rollup-plugin-node-resolve"; import sass from "rollup-plugin-sass"; import { sizeSnapshot } from "rollup-plugin-size-snapshot"; import sourceMaps from "rollup-plugin-sourcemaps"; @@ -35,15 +34,12 @@ export default { } ], plugins: [ - resolve({ - customResolveOptions: { - moduleDirectory: "compiled" - } - }), - sass({ output: "dist/index.css" }), typescript({ tsconfig: "tsconfig.json", tsconfigOverride: { + compilerOptions: { + declaration: true + }, include: ["src"], exclude: [ "node_modules", @@ -54,6 +50,7 @@ export default { ] } }), + sass({ output: "dist/index.css" }), sizeSnapshot(), sourceMaps() ] diff --git a/tsconfig.json b/tsconfig.json index 4c25cf96..f3e1c6fb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,6 @@ "compilerOptions": { "allowSyntheticDefaultImports": true, "baseUrl": ".", - "declaration": true, "esModuleInterop": true, "jsx": "react", "lib": ["es6", "dom"],