doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): update built files to output js to new place

Browse source
This commit is contained in:
hexxa 2022-04-17 12:31:29 +08:00 • committed by Hexxa
parent 8162fc15f3
commit 56505dacdd
8 changed files with 68 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/copy_js.sh
View file

@ -2,6 +2,6 @@
set -o nounset errexit set -o nounset errexit
export ROOT=`pwd` export ROOT=`pwd`
cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/static/public/js/
cp $ROOT/node_modules/react-dom/umd/react-dom.production.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/react-dom/umd/react-dom.production.min.js $ROOT/static/public/js/
cp $ROOT/node_modules/react/umd/react.production.min.js $ROOT/public/static/js cp $ROOT/node_modules/react/umd/react.production.min.js $ROOT/static/public/js

6
scripts/copy_js_dev.sh
View file

@ -2,6 +2,6 @@
set -o nounset errexit set -o nounset errexit
export ROOT=`pwd` export ROOT=`pwd`
cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/public/static/js/ cp $ROOT/node_modules/immutable/dist/immutable.min.js $ROOT/static/public/js/
cp $ROOT/node_modules/react-dom/umd/react-dom.development.js $ROOT/public/static/js/ cp $ROOT/node_modules/react-dom/umd/react-dom.development.js $ROOT/static/public/js/
cp $ROOT/node_modules/react/umd/react.development.js $ROOT/public/static/js/ cp $ROOT/node_modules/react/umd/react.development.js $ROOT/static/public/js/

52
src/client/web/build/template/index.template.dev.html
View file

@ -7,93 +7,93 @@
name="viewport" name="viewport"
content="initial-scale=1.0, maximum-scale=1, minimum-scale=1, user-scalable=no,uc-fitscreen=yes" content="initial-scale=1.0, maximum-scale=1, minimum-scale=1, user-scalable=no,uc-fitscreen=yes"
/> />
<link rel="icon" href="static/img/favicon.svg" /> <link rel="icon" href="img/favicon.svg" />
<link rel=”mask-icon” href=”static/img/favicon.svg” color=”#16a085"> <link rel=”mask-icon” href=”img/favicon.svg” color=”#16a085">
<link rel="apple-touch-icon" href="static/img/favicon.png" /> <link rel="apple-touch-icon" href="img/favicon.png" />
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
<script src="/static/js/react.development.js?v=16.8.6"></script> <script src="js/react.development.js?v=16.8.6"></script>
<script src="/static/js/react-dom.development.js?v=16.8.6"></script> <script src="js/react-dom.development.js?v=16.8.6"></script>
<script src="/static/js/immutable.min.js?v=4.0.0-rc.12"></script> <script src="js/immutable.min.js?v=4.0.0-rc.12"></script>
<link rel="stylesheet" href="/static/css/reset.css" /> <link rel="stylesheet" href="css/reset.css" />
<link rel="stylesheet" href="/static/css/colors.css" /> <link rel="stylesheet" href="css/colors.css" />
<link rel="stylesheet" href="/static/css/default.css" /> <link rel="stylesheet" href="css/default.css" />
<link rel="stylesheet" href="/static/css/white.css" /> <link rel="stylesheet" href="css/white.css" />
<link rel="stylesheet" href="/static/css/dark.css" /> <link rel="stylesheet" href="css/dark.css" />
<!-- <link <!-- <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="57x57" sizes="57x57"
href="/static/fav/apple-icon-57x57.png" href="fav/apple-icon-57x57.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="60x60" sizes="60x60"
href="/static/fav/apple-icon-60x60.png" href="fav/apple-icon-60x60.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="72x72" sizes="72x72"
href="/static/fav/apple-icon-72x72.png" href="fav/apple-icon-72x72.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="76x76" sizes="76x76"
href="/static/fav/apple-icon-76x76.png" href="fav/apple-icon-76x76.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="114x114" sizes="114x114"
href="/static/fav/apple-icon-114x114.png" href="fav/apple-icon-114x114.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="120x120" sizes="120x120"
href="/static/fav/apple-icon-120x120.png" href="fav/apple-icon-120x120.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="144x144" sizes="144x144"
href="/static/fav/apple-icon-144x144.png" href="fav/apple-icon-144x144.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="152x152" sizes="152x152"
href="/static/fav/apple-icon-152x152.png" href="fav/apple-icon-152x152.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="180x180" sizes="180x180"
href="/static/fav/apple-icon-180x180.png" href="fav/apple-icon-180x180.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="192x192" sizes="192x192"
href="/static/fav/android-icon-192x192.png" href="fav/android-icon-192x192.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="32x32" sizes="32x32"
href="/static/fav/favicon-32x32.png" href="fav/favicon-32x32.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="96x96" sizes="96x96"
href="/static/fav/favicon-96x96.png" href="fav/favicon-96x96.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="16x16" sizes="16x16"
href="/static/fav/favicon-16x16.png" href="fav/favicon-16x16.png"
/> />
<link rel="manifest" href="/static/fav/manifest.json" /> <link rel="manifest" href="fav/manifest.json" />
<meta name="msapplication-TileColor" content="#ffffff" /> <meta name="msapplication-TileColor" content="#ffffff" />
<meta <meta
name="msapplication-TileImage" name="msapplication-TileImage"
content="/static/fav/ms-icon-144x144.png" content="fav/ms-icon-144x144.png"
/> --> /> -->
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
</head> </head>

52
src/client/web/build/template/index.template.html
View file

@ -7,93 +7,93 @@
name="viewport" name="viewport"
content="initial-scale=1.0, maximum-scale=1, minimum-scale=1, user-scalable=no,uc-fitscreen=yes" content="initial-scale=1.0, maximum-scale=1, minimum-scale=1, user-scalable=no,uc-fitscreen=yes"
/> />
<link rel="icon" href="static/img/favicon.svg" /> <link rel="icon" href="img/favicon.svg" />
<link rel=”mask-icon” href=”static/img/favicon.svg” color=”#16a085"> <link rel=”mask-icon” href=”img/favicon.svg” color=”#16a085">
<link rel="apple-touch-icon" href="static/img/favicon.png" /> <link rel="apple-touch-icon" href="img/favicon.png" />
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
<script src="/static/js/react.production.min.js?v=16.8.6"></script> <script src="js/react.production.min.js?v=16.8.6"></script>
<script src="/static/js/react-dom.production.min.js?v=16.8.6"></script> <script src="js/react-dom.production.min.js?v=16.8.6"></script>
<script src="/static/js/immutable.min.js?v=4.0.0-rc.12"></script> <script src="js/immutable.min.js?v=4.0.0-rc.12"></script>
<link rel="stylesheet" href="/static/css/reset.css" /> <link rel="stylesheet" href="css/reset.css" />
<link rel="stylesheet" href="/static/css/colors.css" /> <link rel="stylesheet" href="css/colors.css" />
<link rel="stylesheet" href="/static/css/default.css" /> <link rel="stylesheet" href="css/default.css" />
<link rel="stylesheet" href="/static/css/white.css" /> <link rel="stylesheet" href="css/white.css" />
<link rel="stylesheet" href="/static/css/dark.css" /> <link rel="stylesheet" href="css/dark.css" />
<!-- <link <!-- <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="57x57" sizes="57x57"
href="/static/fav/apple-icon-57x57.png" href="fav/apple-icon-57x57.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="60x60" sizes="60x60"
href="/static/fav/apple-icon-60x60.png" href="fav/apple-icon-60x60.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="72x72" sizes="72x72"
href="/static/fav/apple-icon-72x72.png" href="fav/apple-icon-72x72.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="76x76" sizes="76x76"
href="/static/fav/apple-icon-76x76.png" href="fav/apple-icon-76x76.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="114x114" sizes="114x114"
href="/static/fav/apple-icon-114x114.png" href="fav/apple-icon-114x114.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="120x120" sizes="120x120"
href="/static/fav/apple-icon-120x120.png" href="fav/apple-icon-120x120.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="144x144" sizes="144x144"
href="/static/fav/apple-icon-144x144.png" href="fav/apple-icon-144x144.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="152x152" sizes="152x152"
href="/static/fav/apple-icon-152x152.png" href="fav/apple-icon-152x152.png"
/> />
<link <link
rel="apple-touch-icon" rel="apple-touch-icon"
sizes="180x180" sizes="180x180"
href="/static/fav/apple-icon-180x180.png" href="fav/apple-icon-180x180.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="192x192" sizes="192x192"
href="/static/fav/android-icon-192x192.png" href="fav/android-icon-192x192.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="32x32" sizes="32x32"
href="/static/fav/favicon-32x32.png" href="fav/favicon-32x32.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="96x96" sizes="96x96"
href="/static/fav/favicon-96x96.png" href="fav/favicon-96x96.png"
/> />
<link <link
rel="icon" rel="icon"
type="image/png" type="image/png"
sizes="16x16" sizes="16x16"
href="/static/fav/favicon-16x16.png" href="fav/favicon-16x16.png"
/> />
<link rel="manifest" href="/static/fav/manifest.json" /> --> <link rel="manifest" href="fav/manifest.json" /> -->
<!-- <meta name="msapplication-TileColor" content="#ffffff" /> --> <!-- <meta name="msapplication-TileColor" content="#ffffff" /> -->
<!-- <meta <!-- <meta
name="msapplication-TileImage" name="msapplication-TileImage"
content="/static/fav/ms-icon-144x144.png" content="fav/ms-icon-144x144.png"
/> --> /> -->
<meta name="theme-color" content="#ffffff" /> <meta name="theme-color" content="#ffffff" />
</head> </head>

2
src/client/web/src/components/pane_admin.tsx
View file

@ -846,7 +846,7 @@ export class SiteCfg extends React.Component<SiteCfgProps, SiteCfgState, {}> {
siteName: "Quickshare", siteName: "Quickshare",
siteDesc: "Quickshare", siteDesc: "Quickshare",
bg: { bg: {
url: "/static/img/textured_paper.png", url: "",
repeat: "repeat", repeat: "repeat",
position: "center", position: "center",
align: "fixed", align: "fixed",

9
src/client/web/webpack.app.dev.js
View file

@ -4,15 +4,6 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
const dev = require("./webpack.dev.js"); const dev = require("./webpack.dev.js");
module.exports = merge(dev, { module.exports = merge(dev, {
entry: ["./src/app.tsx", "./src/components/api.ts"],
context: `${__dirname}`,
output: {
globalObject: "this",
path: `${__dirname}/../../../public/static`,
chunkFilename: "[name].bundle.js",
filename: "[name].bundle.js",
library: "Q",
},
plugins: [ plugins: [
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: `${__dirname}/build/template/index.template.dev.html`, template: `${__dirname}/build/template/index.template.dev.html`,

9
src/client/web/webpack.app.prod.js
View file

@ -4,15 +4,6 @@ const HtmlWebpackPlugin = require("html-webpack-plugin");
const prod = require("./webpack.prod.js"); const prod = require("./webpack.prod.js");
module.exports = merge(prod, { module.exports = merge(prod, {
entry: ["./src/app.tsx", "./src/components/api.ts"],
context: `${__dirname}`,
output: {
globalObject: "this",
path: `${__dirname}/../../../public/static`,
chunkFilename: "[name].bundle.js",
filename: "[name].bundle.js",
library: "Q",
},
plugins: [ plugins: [
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: `${__dirname}/build/template/index.template.html`, template: `${__dirname}/build/template/index.template.html`,

9
src/client/web/webpack.common.js
View file

@ -8,6 +8,15 @@ const BundleAnalyzerPlugin = require("webpack-bundle-analyzer")
module.exports = { module.exports = {
entry: ["./src/app.tsx", "./src/components/api.ts"],
context: `${__dirname}`,
output: {
globalObject: "this",
path: `${__dirname}/../../../static/public/js`,
chunkFilename: "[name].bundle.js",
filename: "[name].bundle.js",
library: "Q",
},
module: { module: {
rules: [ rules: [
{ {