diff --git a/_regroup_monorepo/apps/client/libraries/ckeditor/ckeditor-content.css b/apps/client/src/libraries/ckeditor/ckeditor-content.css similarity index 100% rename from _regroup_monorepo/apps/client/libraries/ckeditor/ckeditor-content.css rename to apps/client/src/libraries/ckeditor/ckeditor-content.css diff --git a/_regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.d.ts b/apps/client/src/libraries/ckeditor/ckeditor.d.ts similarity index 100% rename from _regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.d.ts rename to apps/client/src/libraries/ckeditor/ckeditor.d.ts diff --git a/_regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.js b/apps/client/src/libraries/ckeditor/ckeditor.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.js rename to apps/client/src/libraries/ckeditor/ckeditor.js diff --git a/_regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.js.map b/apps/client/src/libraries/ckeditor/ckeditor.js.map similarity index 100% rename from _regroup_monorepo/apps/client/libraries/ckeditor/ckeditor.js.map rename to apps/client/src/libraries/ckeditor/ckeditor.js.map diff --git a/_regroup_monorepo/apps/client/libraries/ckeditor/inspector.js b/apps/client/src/libraries/ckeditor/inspector.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/ckeditor/inspector.js rename to apps/client/src/libraries/ckeditor/inspector.js diff --git a/_regroup_monorepo/apps/client/libraries/codemirror/batch.js b/apps/client/src/libraries/codemirror/batch.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/codemirror/batch.js rename to apps/client/src/libraries/codemirror/batch.js diff --git a/_regroup_monorepo/apps/client/libraries/codemirror/eslint.js b/apps/client/src/libraries/codemirror/eslint.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/codemirror/eslint.js rename to apps/client/src/libraries/codemirror/eslint.js diff --git a/_regroup_monorepo/apps/client/libraries/codemirror/hcl.js b/apps/client/src/libraries/codemirror/hcl.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/codemirror/hcl.js rename to apps/client/src/libraries/codemirror/hcl.js diff --git a/_regroup_monorepo/apps/client/libraries/highlightjs/terraform.js b/apps/client/src/libraries/highlightjs/terraform.js similarity index 100% rename from _regroup_monorepo/apps/client/libraries/highlightjs/terraform.js rename to apps/client/src/libraries/highlightjs/terraform.js diff --git a/apps/client/src/services/i18n.ts b/apps/client/src/services/i18n.ts index 25c98fe39..3b1129619 100644 --- a/apps/client/src/services/i18n.ts +++ b/apps/client/src/services/i18n.ts @@ -12,6 +12,7 @@ export async function initLocale() { locales = await server.get("options/locales"); await i18next.use(i18nextHttpBackend).init({ + debug: true, lng: locale, fallbackLng: "en", backend: { diff --git a/apps/client/webpack.config.js b/apps/client/webpack.config.js index a9f1aad57..cfcfe231e 100644 --- a/apps/client/webpack.config.js +++ b/apps/client/webpack.config.js @@ -42,7 +42,11 @@ module.exports = { } ], baseHref: '/', - assets: ["./src/assets", "./src/stylesheets"], + assets: [ + "./src/assets", + "./src/stylesheets", + "./src/libraries", + ], styles: [], outputHashing: process.env['NODE_ENV'] === 'production' ? 'all' : 'none', optimization: process.env['NODE_ENV'] === 'production', diff --git a/apps/server/src/routes/assets.ts b/apps/server/src/routes/assets.ts index 001edb538..266073961 100644 --- a/apps/server/src/routes/assets.ts +++ b/apps/server/src/routes/assets.ts @@ -31,7 +31,9 @@ async function register(app: express.Application) { app.use(`/${assetPath}/stylesheets`, proxy(publicUrl, { proxyReqPathResolver: (req) => "/stylesheets" + req.url })); - app.use(`/${assetPath}/libraries`, persistentCacheStatic(path.join(srcRoot, "../../client/libraries"))); + app.use(`/${assetPath}/libraries`, proxy(publicUrl, { + proxyReqPathResolver: (req) => "/libraries" + req.url + })); } else { app.use(`/${assetPath}/app`, persistentCacheStatic(path.join(srcRoot, "public/app"))); app.use(`/${assetPath}/app-dist`, persistentCacheStatic(path.join(srcRoot, "public/app-dist")));