Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Move webpack files into dir

Browse Source
This commit is contained in:
JC Brand 2022-01-27 12:07:52 +01:00
parent 93ec6e4e83
commit 351212cd13
11 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -64,7 +64,7 @@ serve_bg: node_modules
########################################################################
## Translation machinery
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules
dist/converse-no-dependencies.js: src webpack/webpack.common.js webpack/webpack.nodeps.js @converse/headless node_modules
npm run nodeps
GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=9.0.0 dist/converse-no-dependencies.js -c
@ -185,10 +185,10 @@ logo/conversejs-filled%.png:: logo/conversejs-filled.svg
@converse/headless: src/headless
src/headless/dist/converse-headless.js: src webpack.common.js node_modules @converse/headless
src/headless/dist/converse-headless.js: src webpack/webpack.common.js node_modules @converse/headless
npm run headless-dev
src/headless/dist/converse-headless.min.js: src webpack.common.js node_modules @converse/headless
src/headless/dist/converse-headless.min.js: src webpack/webpack.common.js node_modules @converse/headless
npm run headless
dist:: node_modules src/* | dist/converse.js dist/converse.css dist/website.css dist/website.min.css src/headless/dist/converse-headless.min.js src/headless/dist/converse-headless.js

14
package.json
View File

@ -26,16 +26,16 @@
"src/**/*.json"
],
"scripts": {
"serve": "webpack serve --config webpack.serve.js",
"serve": "webpack serve --config webpack/webpack.serve.js",
"clean": "rm -rf node_modules dist *.zip src/headless/dist src/headless/node_modules",
"headless": "webpack --config webpack.headless.js",
"headless-dev": "webpack --config webpack.headless.dev.js",
"nodeps": "webpack --config webpack.nodeps.js",
"headless": "webpack --config webpack/webpack.headless.js",
"headless-dev": "webpack --config webpack/webpack.headless.dev.js",
"nodeps": "webpack --config webpack/webpack.nodeps.js",
"cdn": "ASSET_PATH=https://cdn.conversejs.org/dist/ npm run dev && ASSET_PATH=https://cdn.conversejs.org/dist/ npm run build",
"prod": "webpack --config webpack.prod.js",
"prod": "webpack --config webpack/webpack.prod.js",
"build": "npm run dev && npm run prod",
"dev": "webpack --config webpack.dev.js",
"watch": "webpack --watch --config webpack.dev.js",
"dev": "webpack --config webpack/webpack.dev.js",
"watch": "webpack --watch --config webpack/webpack.dev.js",
"lerna": "lerna bootstrap --hoist --ignore-scripts",
"prepare": "npm run lerna && npm run build"
},

2
src/converse.js
View File

@ -5,7 +5,7 @@
*/
import "@converse/headless/headless";
import "i18n";
import "./i18n/index.js";
import "shared/registry.js";
import { CustomElement } from 'shared/components/element';
import { VIEW_PLUGINS } from './shared/constants.js';

2
src/plugins/controlbox/index.js
View File

@ -2,7 +2,7 @@
* @copyright 2020, the Converse.js contributors
* @license Mozilla Public License (MPLv2)
*/
import "shared/components/brand-heading";
import "shared/components/brand-heading.js";
import "../chatview/index.js";
import './loginform.js';
import './navback.js';

18
webpack.common.js → webpack/webpack.common.js
View File

@ -11,10 +11,10 @@ if (BOOTSTRAP_IGNORE_MODULES.length > 0) {
module.exports = {
output: {
path: path.resolve(__dirname, 'dist'), // Output path for generated bundles
path: path.resolve(__dirname, '../dist'), // Output path for generated bundles
chunkFilename: '[name].js'
},
entry: path.resolve(__dirname, 'src/entry.js'),
entry: path.resolve(__dirname, '../src/entry.js'),
externals: [{
"window": "window"
}],
@ -62,8 +62,8 @@ module.exports = {
options: {
sassOptions: {
includePaths: [
path.resolve(__dirname, 'node_modules/'),
path.resolve(__dirname, 'src/')
path.resolve(__dirname, '../node_modules/'),
path.resolve(__dirname, '../src/')
]
},
sourceMap: true
@ -108,13 +108,13 @@ module.exports = {
extensions: ['.js'],
modules: [
'node_modules',
path.resolve(__dirname, "src")
path.resolve(__dirname, "../src")
],
alias: {
"IPv6": path.resolve(__dirname, "node_modules/urijs/src/IPv6"),
"SecondLevelDomains": path.resolve(__dirname, "node_modules/urijs/src/SecondLevelDomains"),
"formdata-polyfill": path.resolve(__dirname, "node_modules/formdata-polyfill/FormData"),
"punycode": path.resolve(__dirname, "node_modules/urijs/src/punycode")
"IPv6": path.resolve(__dirname, "../node_modules/urijs/src/IPv6"),
"SecondLevelDomains": path.resolve(__dirname, "../node_modules/urijs/src/SecondLevelDomains"),
"formdata-polyfill": path.resolve(__dirname, "../node_modules/formdata-polyfill/FormData"),
"punycode": path.resolve(__dirname, "../node_modules/urijs/src/punycode")
}
}
}

0
webpack.dev.js → webpack/webpack.dev.js
View File

2
webpack.headless.dev.js → webpack/webpack.headless.dev.js
View File

@ -7,7 +7,7 @@ module.exports = merge(common, {
mode: "development",
entry: "@converse/headless/headless.js",
output: {
path: path.resolve(__dirname, 'src/headless/dist'), // Output path for generated bundles
path: path.resolve(__dirname, '../src/headless/dist'), // Output path for generated bundles
filename: 'converse-headless.js',
},
optimization: {

2
webpack.headless.js → webpack/webpack.headless.js
View File

@ -6,7 +6,7 @@ const { merge } = require("webpack-merge");
module.exports = merge(common, {
entry: "@converse/headless/headless.js",
output: {
path: path.resolve(__dirname, 'src/headless/dist'), // Output path for generated bundles
path: path.resolve(__dirname, '../src/headless/dist'), // Output path for generated bundles
filename: 'converse-headless.min.js',
chunkFilename: '[name].js'
},

2
webpack.nodeps.js → webpack/webpack.nodeps.js
View File

@ -48,7 +48,7 @@ module.exports = merge(common, {
loader: 'sass-loader',
options: {
sassOptions: {
includePaths: [path.resolve(__dirname, 'node_modules/')]
includePaths: [path.resolve(__dirname, '../node_modules/')]
}
}
}

2
webpack.prod.js → webpack/webpack.prod.js
View File

@ -54,7 +54,7 @@ module.exports = merge(common, {
loader: 'sass-loader',
options: {
sassOptions: {
includePaths: [path.resolve(__dirname, 'node_modules/')]
includePaths: [path.resolve(__dirname, '../node_modules/')]
},
sourceMap: true
}

2
webpack.serve.js → webpack/webpack.serve.js
View File

@ -8,7 +8,7 @@ module.exports = merge(common, {
mode: "development",
devtool: "inline-source-map",
devServer: {
static: [ path.resolve(__dirname, '') ],
static: [ path.resolve(__dirname, '../') ],
port: 3003
},
plugins: [