diff --git a/packages/builder/build/copy.js b/packages/builder/build/copy.js index e69de29bb2..7f16b9bd04 100644 --- a/packages/builder/build/copy.js +++ b/packages/builder/build/copy.js @@ -0,0 +1,8 @@ +const ncp = require('ncp').ncp; + +ncp("./dist", "../server/builder", function (err) { + if (err) { + return console.error(err); + } + console.log('Copied dist folder to ../server/builder'); +}) \ No newline at end of file diff --git a/packages/builder/package.json b/packages/builder/package.json index 7d681ab647..e232dec697 100644 --- a/packages/builder/package.json +++ b/packages/builder/package.json @@ -22,6 +22,7 @@ "devDependencies": { "browser-sync": "^2.26.7", "http-proxy-middleware": "^0.19.1", + "ncp": "^2.0.0", "npm-run-all": "^4.1.5", "rollup": "^1.12.0", "rollup-plugin-alias": "^1.5.2", diff --git a/packages/builder/rollup.config.js b/packages/builder/rollup.config.js index 39272a69b5..0e4e046b73 100644 --- a/packages/builder/rollup.config.js +++ b/packages/builder/rollup.config.js @@ -11,18 +11,23 @@ import browsersync from "rollup-plugin-browsersync"; import proxy from "http-proxy-middleware"; const target = 'http://localhost:4001/_builder'; -const apiProxy = proxy('/api', { - target, - logLevel: "debug", - changeOrigin: true, - cookieDomainRewrite: true, - onProxyReq(proxyReq) { - if (proxyReq.getHeader("origin")) { - proxyReq.setHeader("origin", target) - } - } +const _builderProxy = proxy('/_builder', { + target:"http://localhost:3000", + pathRewrite: {'^/_builder' : ''} }); +const apiProxy = proxy('/_builder/api', { + target, + logLevel: "debug", + changeOrigin: true, + cookieDomainRewrite: true, + onProxyReq(proxyReq) { + if (proxyReq.getHeader("origin")) { + proxyReq.setHeader("origin", target) + } + } + }); + const production = !process.env.ROLLUP_WATCH; const lodash_fp_exports = ["union", "reduce", "isUndefined", "cloneDeep", "split", "some", "map", "filter", "isEmpty", "countBy", "includes", "last", "find", "constant", @@ -34,7 +39,7 @@ const lodash_exports = ["toNumber", "flow", "isArray", "join", "replace", "trim" "constant", "tail", "includes", "startsWith", "findIndex", "isInteger", "isDate", "isString", "split", "clone", "keys", "isFunction", "merge", "has", "isBoolean", "isNumber", "isObjectLike", "assign", "some", "each", "find", "orderBy", "union", "cloneDeep"]; -const writeoptions = {dest: "output/output.js"}; +const outputpath = "../server/builder"; export default { input: 'src/main.js', @@ -42,13 +47,13 @@ export default { sourcemap: true, format: 'iife', name: 'app', - file: 'dist/bundle.js' + file: `${outputpath}/bundle.js` }, plugins: [ copy({ targets: [ - { src: 'src/index.html', dest: 'dist' }, - { src: 'src/favicon.png', dest: 'dist' } + { src: 'src/index.html', dest: outputpath }, + { src: 'src/favicon.png', dest: outputpath } ] }), @@ -59,7 +64,7 @@ export default { // we'll extract any component CSS out into // a separate file — better for performance css: css => { - css.write('dist/bundle.css'); + css.write(`${outputpath}/bundle.css`); } }), @@ -98,10 +103,10 @@ export default { // Watch the `dist` directory and refresh the // browser on changes when not in production - !production && livereload('dist'), + !production && livereload(outputpath), !production && browsersync({ - server: 'dist', - middleware: [apiProxy] + server: outputpath, + middleware: [_builderProxy, apiProxy] }), // If we're building for production (npm run build diff --git a/packages/builder/src/NoPackage.svelte b/packages/builder/src/NoPackage.svelte index a2d92d6f54..e95f335346 100644 --- a/packages/builder/src/NoPackage.svelte +++ b/packages/builder/src/NoPackage.svelte @@ -9,7 +9,7 @@ let errors = [];