From 351212cd1362465bde7ff9a02bc358c1fdb14420 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Thu, 27 Jan 2022 12:07:52 +0100 Subject: [PATCH] Move webpack files into dir --- Makefile | 6 +++--- package.json | 14 +++++++------- src/converse.js | 2 +- src/plugins/controlbox/index.js | 2 +- webpack.common.js => webpack/webpack.common.js | 18 +++++++++--------- webpack.dev.js => webpack/webpack.dev.js | 0 .../webpack.headless.dev.js | 2 +- .../webpack.headless.js | 2 +- webpack.nodeps.js => webpack/webpack.nodeps.js | 2 +- webpack.prod.js => webpack/webpack.prod.js | 2 +- webpack.serve.js => webpack/webpack.serve.js | 2 +- 11 files changed, 26 insertions(+), 26 deletions(-) rename webpack.common.js => webpack/webpack.common.js (86%) rename webpack.dev.js => webpack/webpack.dev.js (100%) rename webpack.headless.dev.js => webpack/webpack.headless.dev.js (78%) rename webpack.headless.js => webpack/webpack.headless.js (79%) rename webpack.nodeps.js => webpack/webpack.nodeps.js (98%) rename webpack.prod.js => webpack/webpack.prod.js (98%) rename webpack.serve.js => webpack/webpack.serve.js (91%) diff --git a/Makefile b/Makefile index 6918f4f32..4f00faf56 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/package.json b/package.json index 707ff32ae..dbf8c75af 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/src/converse.js b/src/converse.js index 1963f8609..42eed5b8b 100644 --- a/src/converse.js +++ b/src/converse.js @@ -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'; diff --git a/src/plugins/controlbox/index.js b/src/plugins/controlbox/index.js index 8838f0909..337ec2222 100644 --- a/src/plugins/controlbox/index.js +++ b/src/plugins/controlbox/index.js @@ -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'; diff --git a/webpack.common.js b/webpack/webpack.common.js similarity index 86% rename from webpack.common.js rename to webpack/webpack.common.js index 09adb1228..08e676c01 100644 --- a/webpack.common.js +++ b/webpack/webpack.common.js @@ -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") } } } diff --git a/webpack.dev.js b/webpack/webpack.dev.js similarity index 100% rename from webpack.dev.js rename to webpack/webpack.dev.js diff --git a/webpack.headless.dev.js b/webpack/webpack.headless.dev.js similarity index 78% rename from webpack.headless.dev.js rename to webpack/webpack.headless.dev.js index 4e41c85d3..74f60059f 100644 --- a/webpack.headless.dev.js +++ b/webpack/webpack.headless.dev.js @@ -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: { diff --git a/webpack.headless.js b/webpack/webpack.headless.js similarity index 79% rename from webpack.headless.js rename to webpack/webpack.headless.js index dee76f17a..1d4764b44 100644 --- a/webpack.headless.js +++ b/webpack/webpack.headless.js @@ -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' }, diff --git a/webpack.nodeps.js b/webpack/webpack.nodeps.js similarity index 98% rename from webpack.nodeps.js rename to webpack/webpack.nodeps.js index 6c2a3ad4e..55b4da554 100644 --- a/webpack.nodeps.js +++ b/webpack/webpack.nodeps.js @@ -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/')] } } } diff --git a/webpack.prod.js b/webpack/webpack.prod.js similarity index 98% rename from webpack.prod.js rename to webpack/webpack.prod.js index 55342c4bf..736d82c6f 100644 --- a/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -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 } diff --git a/webpack.serve.js b/webpack/webpack.serve.js similarity index 91% rename from webpack.serve.js rename to webpack/webpack.serve.js index 64ddfb62e..b29fff513 100644 --- a/webpack.serve.js +++ b/webpack/webpack.serve.js @@ -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: [