Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-06 23:58:46 +02:00
Code Issues Packages Projects Releases Activity

rename bundles folder into assets

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-10-08 08:36:53 +02:00
parent 03b10b8c5f
commit 8f8072d760
13 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/plugin.xml
View File

@@ -57,7 +57,7 @@
</conditions>
<resources>
<script>plugins/scm-git-plugin.bundle.js</script>
<script>assets/scm-git-plugin.bundle.js</script>
</resources>
</plugin>

2
scm-plugins/scm-git-plugin/webpack.config.js
View File

@@ -61,7 +61,7 @@ module.exports = {
]
},
output: {
path: path.join(__dirname, "target", "scm-git-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
path: path.join(__dirname, "target", "scm-git-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
filename: "[name].bundle.js",
library: "scm-git-plugin",
libraryTarget: "amd"

2
scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/plugin.xml
View File

@@ -57,7 +57,7 @@ jo
</conditions>
<resources>
<script>plugins/scm-hg-plugin.bundle.js</script>
<script>assets/scm-hg-plugin.bundle.js</script>
</resources>
</plugin>

2
scm-plugins/scm-hg-plugin/webpack.config.js
View File

@@ -61,7 +61,7 @@ module.exports = {
]
},
output: {
path: path.join(__dirname, "target", "scm-hg-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
path: path.join(__dirname, "target", "scm-hg-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
filename: "[name].bundle.js",
library: "scm-hg-plugin",
libraryTarget: "amd"

2
scm-plugins/scm-legacy-plugin/src/main/resources/META-INF/scm/plugin.xml
View File

@@ -56,7 +56,7 @@
</conditions>
<resources>
<script>plugins/scm-legacy-plugin.bundle.js</script>
<script>assets/scm-legacy-plugin.bundle.js</script>
</resources>
</plugin>

2
scm-plugins/scm-legacy-plugin/webpack.config.js
View File

@@ -61,7 +61,7 @@ module.exports = {
]
},
output: {
path: path.join(__dirname, "target", "scm-legacy-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
path: path.join(__dirname, "target", "scm-legacy-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
filename: "[name].bundle.js",
library: "scm-legacy-plugin",
libraryTarget: "amd"

2
scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/plugin.xml
View File

@@ -57,7 +57,7 @@
</conditions>
<resources>
<script>plugins/scm-svn-plugin.bundle.js</script>
<script>assets/scm-svn-plugin.bundle.js</script>
</resources>
</plugin>

2
scm-plugins/scm-svn-plugin/webpack.config.js
View File

@@ -61,7 +61,7 @@ module.exports = {
]
},
output: {
path: path.join(__dirname, "target", "scm-svn-plugin-2.0.0-SNAPSHOT", "webapp", "plugins"),
path: path.join(__dirname, "target", "scm-svn-plugin-2.0.0-SNAPSHOT", "webapp", "assets"),
filename: "[name].bundle.js",
library: "scm-svn-plugin",
libraryTarget: "amd"

4
scm-ui/pom.xml
View File

@@ -97,8 +97,8 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<webResources>
<resource>
<directory>target/bundles</directory>
<targetPath>bundles</targetPath>
<directory>target/assets</directory>
<targetPath>assets</targetPath>
</resource>
<resource>
<directory>ui-webapp/public</directory>

4
scm-ui/scripts/webpack.config.js
View File

@@ -58,7 +58,7 @@ module.exports = {
]
},
output: {
path: path.resolve(__dirname, "..", "target", "bundles"),
path: path.resolve(__dirname, "..", "target", "assets"),
filename: "[name].bundle.js"
},
devServer: {
@@ -77,6 +77,6 @@ module.exports = {
};
app.use(createIndexMiddleware(templatePath, renderParams));
},
publicPath: '/bundles/'
publicPath: '/assets/'
}
};

2
scm-ui/ui-webapp/public/index.mustache
View File

@@ -34,7 +34,7 @@
<script>
window.ctxPath = "{{ contextPath }}";
</script>
<script src="{{ contextPath }}/bundles/webapp.bundle.js"></script>
<script src="{{ contextPath }}/assets/webapp.bundle.js"></script>
{{#liveReloadURL}}
<script src="{{liveReloadURL}}"></script>

3
scm-ui/ui-webapp/src/containers/loadBundle.js
View File

@@ -10,6 +10,7 @@ import * as ReactI18Next from "react-i18next";
import * as ClassNames from "classnames";
import * as UIExtensions from "@scm-manager/ui-extensions";
import * as UIComponents from "@scm-manager/ui-components";
import { urls } from "@scm-manager/ui-components";
/**
credentials: "same-origin",
@@ -21,7 +22,7 @@ import * as UIComponents from "@scm-manager/ui-components";
*/
SystemJS.config({
baseURL: "/plugins",
baseURL: urls.withContextPath("/assets"),
meta: {
"/*": {
esModule: true,

2
scm-ui/ui-webapp/src/webpack-public-path.js
View File

@@ -1,4 +1,4 @@
// setup webpack public path:
// https://stackoverflow.com/questions/39879680/example-of-setting-webpack-public-path-at-runtime
// https://github.com/coryhouse/react-slingshot/pull/207/files
__webpack_public_path__ = window.ctxPath + "/bundles/";
__webpack_public_path__ = window.ctxPath + "/assets/";