diff --git a/build.js b/build.js index 4635aa02ed211a71a747b8bc2598cc31e16a2d5e..4c9ee80aa1b00d86a7d42973ab7caf2a7b3c85e6 100644 --- a/build.js +++ b/build.js @@ -3,35 +3,14 @@ "use strict"; const fs = require("fs"); -const browserify = require("browserify"); -const Uglify = require("uglify-js"); +const { bundle } = require("simple-browser-js-bundler"); const _dir = process.cwd(); const config = require("./config"); const build_conf = config.build; const build_minified = process.argv.includes("prod"); -function build_bundle(input_path, output_path) { - if (build_minified) { - const bundle = browserify() - .add(input_path) - .bundle(); - let stream = ""; - bundle.on("data", chunk => stream += chunk); - bundle.on("end", () => { - const minified = Uglify.minify(stream); - const out = fs.createWriteStream(output_path); - out.write(minified.code); - }); - } else { - browserify() - .add(input_path) - .bundle() - .pipe(fs.createWriteStream(output_path)); - } -} - // Handle home page -build_bundle(`${_dir}/src/main.js`, `${_dir}/public/main.js`) +bundle(`${_dir}/src/main.js`, `${_dir}/public/main.js`, { minify: build_minified }) // Handle subpages function getPageHtml(pageName, pageMeta) { @@ -205,7 +184,7 @@ function createPages(rootdir, destdir) { fs.mkdirSync(targetDirPath); } - build_bundle(fPath, `${targetDirPath}/${p}.js`); + bundle(fPath, `${targetDirPath}/${p}.js`, { minify: build_minified }); const page = fs.createWriteStream(`${targetDirPath}/index.html`); const pageMeta = JSON.parse(fs.readFileSync(`${fPath}/meta.json`, "utf-8")); diff --git a/data/nginx/app.conf b/data/nginx/app.conf index e26671f42b15eae7d5e9c600563c57dbf4510d77..166ca0b4fe377ca5ffd74f5e96fe8584fd08c2a9 100644 --- a/data/nginx/app.conf +++ b/data/nginx/app.conf @@ -8,19 +8,19 @@ server { root /var/www/certbot; } - location / { - return 301 https://$host$request_uri; - } + # location / { + # return 301 https://$host$request_uri; + # } } -server { - server_name kuadrado-software.fr www.kuadrado-software.fr; - listen 443 ssl; - root /usr/share/nginx/html; - index index.html index.htm; - server_tokens off; - ssl_certificate /etc/letsencrypt/live/kuadrado-software.fr/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/kuadrado-software.fr/privkey.pem; - include /etc/letsencrypt/options-ssl-nginx.conf; - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; -} \ No newline at end of file +# server { +# server_name kuadrado-software.fr www.kuadrado-software.fr; +# listen 443 ssl; +# root /usr/share/nginx/html; +# index index.html index.htm; +# server_tokens off; +# ssl_certificate /etc/letsencrypt/live/kuadrado-software.fr/fullchain.pem; +# ssl_certificate_key /etc/letsencrypt/live/kuadrado-software.fr/privkey.pem; +# include /etc/letsencrypt/options-ssl-nginx.conf; +# ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; +# } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index e33ac692b82a78e7fe92bef77283694c91d2bdf5..1178dbf9c3496dd614f638deccc2a7daf9ca125e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,6 +13,7 @@ "devDependencies": { "browserify": "^17.0.0", "sass": "^1.32.0", + "simple-browser-js-bundler": "^0.1.1", "uglify-js": "^3.13.10" } }, @@ -1604,6 +1605,16 @@ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", "dev": true }, + "node_modules/simple-browser-js-bundler": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/simple-browser-js-bundler/-/simple-browser-js-bundler-0.1.1.tgz", + "integrity": "sha512-T95fsFjDb8SG8ZF5s2Hn6rolpCrZWqGh+nqOMkZsVaDuAz2/yz/jegGICS22XAPA98chLeFyxgePmKR4E1AM4g==", + "dev": true, + "dependencies": { + "browserify": "^17.0.0", + "uglify-js": "^3.13.10" + } + }, "node_modules/simple-concat": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", @@ -3306,6 +3317,16 @@ "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", "dev": true }, + "simple-browser-js-bundler": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/simple-browser-js-bundler/-/simple-browser-js-bundler-0.1.1.tgz", + "integrity": "sha512-T95fsFjDb8SG8ZF5s2Hn6rolpCrZWqGh+nqOMkZsVaDuAz2/yz/jegGICS22XAPA98chLeFyxgePmKR4E1AM4g==", + "dev": true, + "requires": { + "browserify": "^17.0.0", + "uglify-js": "^3.13.10" + } + }, "simple-concat": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", diff --git a/package.json b/package.json index ea5b77f40ce42aa3a6af60c1f4a2ce69fa87f317..c00d14306eb5af1f156cba01cdcb889bf1ff0d34 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "devDependencies": { "browserify": "^17.0.0", "sass": "^1.32.0", + "simple-browser-js-bundler": "^0.1.1", "uglify-js": "^3.13.10" } -} \ No newline at end of file +}