Unverified Commit baf4f199 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #20777 from davelopez/client_build_stability 

Stabilize client build after client-dev-server
parents 077cd126 4ce6f561

client-api/tsconfig.json

+2 −2
Original line number Diff line number Diff line 
{

    "compilerOptions": {

        "target": "es2020",

        "module": "es2020",

        "target": "es2022",

        "module": "es2022",

        "moduleResolution": "node",

        

        "verbatimModuleSyntax": true,

client-api/tsup.config.ts

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ export default defineConfig({ 
  clean: true,

  treeshake: true,

  minify: false,

  target: 'es2020',

  target: 'es2022',

  esbuildOptions(options) {

    options.external = [

      ...options.external || [],

client/tsconfig.json

+2 −2
Original line number Diff line number Diff line 
{

    "extends": "@vue/tsconfig/tsconfig.json",

    "compilerOptions": {

        "target": "es2020",

        "module": "es2020",

        "target": "es2022",

        "module": "es2022",

        "moduleResolution": "Bundler",



        "verbatimModuleSyntax": true,

client/webpack.config.js

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ const buildDate = new Date(); 
module.exports = (env = {}, argv = {}) => {

    // environment name based on -d, -p, webpack flag

    const targetEnv = process.env.NODE_ENV == "production" || argv.mode == "production" ? "production" : "development";

    // Detect if running under webpack-dev-server

    const isDevServer = argv.$0 && argv.$0.includes("webpack-dev-server");



    let minimizations = {};

    if (targetEnv == "production") {
@@ -323,6 +325,9 @@ module.exports = (env = {}, argv = {}) => { 
            buildDependencies: {

                config: [__filename],

            },

            // Use different cache directories for dev server vs regular build

            // to prevent conflicts when switching between modes

            name: isDevServer ? "dev-server" : "build",

        },

        devServer: {

            client: {