From 8eb97465b030fc99897d330716c546b5ab6cfd82 Mon Sep 17 00:00:00 2001
From: Ian Minoso <iminoso@gmail.com>
Date: Wed, 26 Oct 2016 13:59:41 -0400
Subject: [PATCH] Fix bugs with Webpack in Dockerfile
---
Dockerfile | 2 ++
package.json | 6 +++---
tsconfig.json | 15 +++++++--------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 650fa52b9..8df4cd357 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -71,12 +71,14 @@ RUN chmod +x /usr/local/bin/prometheus-aggregator
# Install Webpack, Typescript, React
RUN ln -s /usr/bin/nodejs /usr/bin/node
ADD package.json package.json
+ADD tsconfig.json tsconfig.json
ADD webpack.config.js webpack.config.js
ADD typings.json typings.json
RUN npm install
RUN npm link typescript
# Add static files
+ADD static static
ADD static/js/directives/components static/dist/components
# Run Webpack
diff --git a/package.json b/package.json
index 498eaa59f..e9606a583 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
"private": true,
"version": "1.0.0",
"scripts": {
- "build": "./node_modules/.bin/webpack",
+ "build": "./node_modules/.bin/webpack --progress -p -v",
"watch": "./node_modules/.bin/webpack --watch"
},
"repository": {
@@ -20,13 +20,13 @@
"css-loader": "0.25.0",
"ngreact": "0.3.0",
"react": "15.3.2",
- "react-dom": "^15.3.2",
+ "react-dom": "15.3.2",
"style-loader": "0.13.1",
"typescript": "2.0.3"
},
"devDependencies": {
"source-map-loader": "0.1.5",
- "ts-loader": "0.8.2",
+ "ts-loader": "0.9.5",
"typings": "1.4.0",
"webpack": "1.13.2"
}
diff --git a/tsconfig.json b/tsconfig.json
index cd8e1c6f6..777ef617c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,15 +2,14 @@
"compilerOptions": {
"jsx": "react",
"module": "commonjs",
- "noImplicitAny": true,
"outDir": "./build/",
- "preserveConstEnums": true,
- "removeComments": true,
- "target": "ES5"
+ "target": "es5",
+ "sourceMap": true
},
"exclude": [
- "node_modules",
- "typings/browser.d.ts",
- "typings/browser"
+ "node_modules"
+ ],
+ "include": [
+ "./static/js/**/*.tsx"
]
-}
\ No newline at end of file
+}