Upgrade vue-cli to v4, change the way server params injection is made
and serve es6 modules Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
parent
4b80b8616d
commit
6718dd8e69
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -17,7 +17,7 @@ erl_crash.dump
|
|||
|
||||
.env.production
|
||||
.env.test
|
||||
.env
|
||||
/.env
|
||||
.env.2
|
||||
|
||||
setup_db.psql
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"presets": [
|
||||
"@vue/app"
|
||||
]
|
||||
}
|
||||
1
js/.env
Normal file
1
js/.env
Normal file
|
|
@ -0,0 +1 @@
|
|||
VUE_APP_INJECT_COMMENT = <meta name="server-injected-data" />
|
||||
1
js/.gitignore
vendored
1
js/.gitignore
vendored
|
|
@ -27,4 +27,3 @@ yarn-error.log*
|
|||
*.sln
|
||||
*.sw*
|
||||
|
||||
.env
|
||||
|
|
|
|||
7
js/babel.config.js
Normal file
7
js/babel.config.js
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
module.exports = {
|
||||
presets: [
|
||||
[
|
||||
"@vue/app", {useBuiltIns: "entry"}
|
||||
]
|
||||
]
|
||||
};
|
||||
|
|
@ -46,12 +46,13 @@
|
|||
"@types/leaflet": "^1.5.2",
|
||||
"@types/lodash": "^4.14.141",
|
||||
"@types/mocha": "^5.2.6",
|
||||
"@vue/cli-plugin-babel": "^3.6.0",
|
||||
"@vue/cli-plugin-e2e-cypress": "^4.0.0-rc.7",
|
||||
"@vue/cli-plugin-pwa": "^3.6.0",
|
||||
"@vue/cli-plugin-typescript": "^3.6.0",
|
||||
"@vue/cli-plugin-unit-mocha": "^3.6.0",
|
||||
"@vue/cli-service": "^3.6.0",
|
||||
"@vue/cli-plugin-babel": "^4.0.3",
|
||||
"@vue/cli-plugin-e2e-cypress": "^4.0.3",
|
||||
"@vue/cli-plugin-pwa": "^4.0.3",
|
||||
"@vue/cli-plugin-router": "^4.0.3",
|
||||
"@vue/cli-plugin-typescript": "^4.0.3",
|
||||
"@vue/cli-plugin-unit-mocha": "^4.0.3",
|
||||
"@vue/cli-service": "^4.0.3",
|
||||
"@vue/eslint-config-typescript": "^4.0.0",
|
||||
"@vue/test-utils": "^1.0.0-beta.29",
|
||||
"apollo-link-error": "^1.1.12",
|
||||
|
|
@ -64,7 +65,7 @@
|
|||
"tslint": "^5.20.0",
|
||||
"tslint-config-airbnb": "^5.11.2",
|
||||
"typescript": "^3.6.3",
|
||||
"vue-cli-plugin-styleguidist": "^3.24.2",
|
||||
"vue-cli-plugin-styleguidist": "^3.25.0",
|
||||
"vue-cli-plugin-webpack-bundle-analyzer": "^1.3.0",
|
||||
"vue-i18n-extract": "^1.0.2",
|
||||
"vue-svg-inline-loader": "^1.3.0",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<!--server-generated-meta-->
|
||||
<%= VUE_APP_INJECT_COMMENT %>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
const Dotenv = require('dotenv-webpack');
|
||||
const path = require('path');
|
||||
|
||||
module.exports = {
|
||||
pluginOptions: {
|
||||
webpackBundleAnalyzer: {
|
||||
|
|
@ -11,9 +8,6 @@ module.exports = {
|
|||
runtimeCompiler: true,
|
||||
outputDir: '../priv/static',
|
||||
configureWebpack: {
|
||||
plugins: [
|
||||
new Dotenv({ path: path.resolve(process.cwd(), '../.env') }),
|
||||
],
|
||||
module: {
|
||||
rules: [ // fixes https://github.com/graphql/graphql-js/issues/1272
|
||||
{
|
||||
|
|
@ -28,19 +22,14 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
chainWebpack: config => {
|
||||
config
|
||||
.plugin('html')
|
||||
.tap(args => {
|
||||
args[0].minify = {
|
||||
collapseWhitespace: true,
|
||||
removeComments: false,
|
||||
removeRedundantAttributes: true,
|
||||
removeScriptTypeAttributes: true,
|
||||
removeStyleLinkTypeAttributes: true,
|
||||
useShortDoctype: true
|
||||
};
|
||||
return args
|
||||
});
|
||||
// config
|
||||
// .plugin('html')
|
||||
// .tap(args => {
|
||||
// args[0].minify = {
|
||||
// removeComments: false,
|
||||
// };
|
||||
// return args
|
||||
// });
|
||||
|
||||
config.module
|
||||
.rule("vue")
|
||||
|
|
|
|||
2090
js/yarn.lock
2090
js/yarn.lock
File diff suppressed because it is too large
Load diff
|
|
@ -74,7 +74,7 @@ defmodule MobilizonWeb.PageView do
|
|||
when page in ["actor.html", "event.html", "comment.html"] do
|
||||
with {:ok, index_content} <- File.read(index_file_path()) do
|
||||
tags = object |> Metadata.build_tags() |> MetadataUtils.stringify_tags()
|
||||
index_content = String.replace(index_content, "<!--server-generated-meta-->", tags)
|
||||
index_content = String.replace(index_content, "<meta name=server-injected-data>", tags)
|
||||
{:safe, index_content}
|
||||
end
|
||||
end
|
||||
|
|
@ -82,7 +82,7 @@ defmodule MobilizonWeb.PageView do
|
|||
def render("index.html", _assigns) do
|
||||
with {:ok, index_content} <- File.read(index_file_path()) do
|
||||
tags = Instance.build_tags() |> MetadataUtils.stringify_tags()
|
||||
index_content = String.replace(index_content, "<!--server-generated-meta-->", tags)
|
||||
index_content = String.replace(index_content, "<meta name=server-injected-data>", tags)
|
||||
{:safe, index_content}
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue