Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

external cdn

goenningc5b37b21500e
diff --git a/.gitignore b/.gitignore
index 7cb42ef30..548f4778a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ wechy.exe
gin-bin
gin-bin.exe
gin-bin.exe~
-.env
\ No newline at end of file
+.env
+npm-debug.log
\ No newline at end of file
diff --git a/package.json b/package.json
index 20ace7f4d..df2797bd7 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,14 @@
"repository": "https://github.com/WeCanHearYou/wechy",
"license": "GPL-3.0",
"scripts": {
- "build": "rm -rf dist && webpack",
+ "build": "rm -rf dist && webpack -p",
"build:watch": "rm -rf dist && webpack --watch",
"lint": "tslint public/**/**.tsx public/**/**.ts",
- "heroku-postbuild": "npm run build"
+ "heroku-postbuild": "npm run build"
},
"dependencies": {
- "react": "^15.4.2",
"jquery": "^3.2.0",
+ "react": "^15.4.2",
"react-dom": "^15.4.2",
"semantic-ui-css": "^2.2.9"
},
@@ -20,10 +20,8 @@
"@types/jquery": "^2.0.41",
"@types/react": "^15.0.16",
"@types/react-dom": "^0.14.23",
- "clean-webpack-plugin": "^0.1.15",
"css-loader": "^0.27.3",
"file-loader": "^0.10.1",
- "on-build-webpack": "^0.1.0",
"rimraf": "^2.6.1",
"style-loader": "^0.13.2",
"ts-loader": "^2.0.1",
diff --git a/public/components/Header.tsx b/public/components/Header.tsx
index 6b6cd991d..cb1037925 100644
--- a/public/components/Header.tsx
+++ b/public/components/Header.tsx
@@ -32,10 +32,10 @@ export class Header extends React.Component<{}, {}> {
<div id="user-popup" className="ui popup top left transition hidden">
<div className="ui list">
<div className="item">
- <SocialSignInButton provider="facebook"/>
+ <SocialSignInButton provider="facebook"/>
</div>
<div className="item">
- <SocialSignInButton provider="google"/>
+ <SocialSignInButton provider="google"/>
</div>
</div>
</div>;
diff --git a/public/index.ts b/public/index.ts
index cb8bb0600..94cafd86b 100644
--- a/public/index.ts
+++ b/public/index.ts
@@ -2,9 +2,6 @@ import * as $ from "jquery";
import init from "./init";
-(<any> window).$ = (<any> window).jQuery = $;
-import "semantic-ui-css/semantic.min.css";
-import "semantic-ui-css/semantic.min.js";
import "./css/main.css";
$(document).ready(() => {
diff --git a/views/base.html b/views/base.html
index f1bab1031..0ff6fa9e9 100644
--- a/views/base.html
+++ b/views/base.html
@@ -4,6 +4,7 @@
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width,initial-scale=1">
<link rel="icon" type="image/x-icon" href="/favicon.ico">
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.9/semantic.min.css" integrity="sha256-lCqHBvboFPu7gyEswcz5UdbXKyB6FDOtfbOeMvUEfkY=" crossorigin="anonymous" />
<title>{{template "title" .}}</title>
</head>
<body>
@@ -18,6 +19,10 @@
<div id="root"></div>
{{template "content" .}}
- <script type="text/javascript" src="/assets/js/{{ .JavaScriptBundle }}"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.0/jquery.min.js" integrity="sha256-JAW99MJVpJBGcbzEuXk4Az05s/XyDdBomFqNlM3ic+I=" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.4.2/react.min.js" integrity="sha256-Rtnfi1MVZAj3v+eDeFjh/iAXo8//D0zVKql8fjVLCiM=" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.4.2/react-dom.min.js" integrity="sha256-uzKwYuH50DHzDYr3h/Bnpv7C5QJNUjHEpVmT3Xuq3ww=" crossorigin="anonymous"></script>
+ <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.9/semantic.min.js" integrity="sha256-mq9Ru97qzOm1x5zeYFfPniWgQP9tEmjo3O4jUEJdjNY=" crossorigin="anonymous"></script>
+ <script src="/assets/js/{{ .JavaScriptBundle }}"></script>
</body>
</html>
diff --git a/webpack.config.js b/webpack.config.js
index 433b5c5ae..c47704077 100755
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,5 @@
const path = require('path');
-const CleanWebpackPlugin = require('clean-webpack-plugin');
-var AutoCleanBuildPlugin = require('webpack-auto-clean-build-plugin');
+const AutoCleanBuildPlugin = require('webpack-auto-clean-build-plugin');
module.exports = {
entry: "./public/index.ts",
@@ -9,11 +8,12 @@ module.exports = {
filename: "js/bundle.[chunkhash].js",
publicPath: "/assets/"
},
+ devtool: "source-map",
resolve: {
extensions: ['.ts', '.tsx', '.js']
},
module: {
- loaders: [
+ rules: [
{ test: /\.css$/, loader: "style-loader!css-loader" },
{ test: /\.(ts|tsx)$/, loader: "ts-loader" },
{
@@ -28,5 +28,10 @@ module.exports = {
},
plugins: [
new AutoCleanBuildPlugin()
- ]
+ ],
+ externals: {
+ 'react': 'React',
+ 'react-dom' : 'ReactDOM',
+ "jquery": "jQuery"
+ }
};
\ No newline at end of file