From 5f7779f99ba04e0db69ea9ebed1a5f0c9956d3b1 Mon Sep 17 00:00:00 2001 From: James Shiffer <2191476+scoliono@users.noreply.github.com> Date: Tue, 23 Jun 2020 21:23:29 -0700 Subject: [PATCH] i *think* i got babel to work :eyes: --- package-lock.json | 26 ++++++++++++++++++++++++++ package.json | 2 ++ static/a/.gitignore | 2 ++ static/a/.gitkeep | 0 webpack.config.js | 33 ++++++++++++++++++++++++++++++--- 5 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 static/a/.gitignore delete mode 100644 static/a/.gitkeep diff --git a/package-lock.json b/package-lock.json index ec0b7f7..e84247c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -805,6 +805,18 @@ "@babel/helper-plugin-utils": "^7.10.1" } }, + "@babel/plugin-transform-runtime": { + "version": "7.10.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.10.3.tgz", + "integrity": "sha512-b5OzMD1Hi8BBzgQdRHyVVaYrk9zG0wset1it2o3BgonkPadXfOv0aXRqd7864DeOIu3FGKP/h6lr15FE5mahVw==", + "dev": true, + "requires": { + "@babel/helper-module-imports": "^7.10.3", + "@babel/helper-plugin-utils": "^7.10.3", + "resolve": "^1.8.1", + "semver": "^5.5.1" + } + }, "@babel/plugin-transform-shorthand-properties": { "version": "7.10.1", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.1.tgz", @@ -871,6 +883,15 @@ "@babel/helper-plugin-utils": "^7.10.1" } }, + "@babel/polyfill": { + "version": "7.10.1", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.1.tgz", + "integrity": "sha512-TviueJ4PBW5p48ra8IMtLXVkDucrlOZAIZ+EXqS3Ot4eukHbWiqcn7DcqpA1k5PcKtmJ4Xl9xwdv6yQvvcA+3g==", + "requires": { + "core-js": "^2.6.5", + "regenerator-runtime": "^0.13.4" + } + }, "@babel/preset-env": { "version": "7.10.3", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.3.tgz", @@ -2264,6 +2285,11 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + }, "core-js-compat": { "version": "3.6.5", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz", diff --git a/package.json b/package.json index 9f85675..50f34d1 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "test": "run-p --race dev cy:run" }, "dependencies": { + "@babel/polyfill": "^7.10.1", "@babel/runtime": "^7.10.3", "bcrypt": "^4.0.1", "body-parser": "^1.19.0", @@ -35,6 +36,7 @@ "@babel/core": "^7.10.3", "@babel/plugin-proposal-object-rest-spread": "^7.10.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3", + "@babel/plugin-transform-runtime": "^7.10.3", "@babel/preset-env": "^7.10.3", "babel-loader": "^8.1.0", "npm-run-all": "^4.1.5", diff --git a/static/a/.gitignore b/static/a/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/static/a/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/static/a/.gitkeep b/static/a/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/webpack.config.js b/webpack.config.js index 70193b2..628cab9 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,4 +1,5 @@ const webpack = require('webpack'); +const TerserPlugin = require('terser-webpack-plugin'); const path = require('path'); const config = require('sapper/config/webpack.js'); const pkg = require('./package.json'); @@ -19,18 +20,40 @@ module.exports = { resolve: { alias, extensions, mainFields }, module: { rules: [ + { + test: /\.(js|mjs|html|svelte)$/, + exclude: /(node_modules\/@babel)/, + use: { + loader: 'babel-loader', + options: { + presets: [ + ['@babel/preset-env', { + targets: '> 0.25%, ie >= 6, not dead' + }] + ], + plugins: [ + '@babel/plugin-syntax-dynamic-import', + '@babel/plugin-proposal-object-rest-spread', + ['@babel/plugin-transform-runtime', { + regenerator: true + }], + ], + sourceType: 'unambiguous' + } + } + }, { test: /\.(svelte|html)$/, use: { loader: 'svelte-loader', options: { dev, - hydratable: true, + hydratable: true, hotReload: true, onwarn } } - } + }, ] }, mode, @@ -42,7 +65,11 @@ module.exports = { 'process.env.NODE_ENV': JSON.stringify(mode) }), ].filter(Boolean), - devtool: dev && 'inline-source-map', + devtool: dev && 'inline-source-map', + optimization: { + minimize: true, + minimizer: [new TerserPlugin()], + }, }, server: {