Unverified Commit 903c89dd authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #112 from dilallkx/kd_sp29_dev_webpack 

Frontend development server upgrade to 'webpack-dev-server'
parents d07b953b 4a7bbbcb

js-apps/meep-frontend/package-lock.json

+1118 −1186

File changed.

Preview size limit exceeded, changes collapsed.

js-apps/meep-frontend/package.json

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
    "test:verbose": "jest --verbose true",

    "test:coverage": "jest --verbose true --coverage --colors",

    "build": "webpack",

    "build:dev": "webpack-serve --port 8091 --host 10.3.16.105"

    "build:dev": "webpack-dev-server --https true --port 8091 --host 10.3.16.105 --env.MEEP_HOST=10.3.16.105"

  },

  "author": "",

  "license": "ISC",
@@ -35,7 +35,7 @@ 
    "style-loader": "^0.20.3",

    "webpack": "^4.4.1",

    "webpack-cli": "^3.2.3",

    "webpack-serve": "^0.3.1"

    "webpack-dev-server": "^3.11.0"

  },

  "dependencies": {

    "@geoman-io/leaflet-geoman-free": "2.5.0",

js-apps/meep-frontend/src/js/meep-constants.js

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



export const HOST_PATH = location.origin;

//export const HOST_PATH = 'http://10.3.16.150';



// MEEP types

export const TYPE_CFG = 'CFG';

js-apps/meep-frontend/webpack.config.js

+10 −2
Original line number Diff line number Diff line
@@ -105,6 +105,14 @@ module.exports = env => { 
      new webpack.DefinePlugin({

        __VERSION__: JSON.stringify(env.VERSION ? env.VERSION : 'v0.0.0')

      })

    ]

    ],

    devServer: {

      proxy: {

        '/': {

          target: 'https://' + (env ? env.MEEP_HOST : ''),

          secure: false

        }

      }

    }

  };

};