From 32afef4ae8d57a04ff71c4e85a976a3983361386 Mon Sep 17 00:00:00 2001 From: arthurfiorette Date: Thu, 9 Dec 2021 16:30:01 -0300 Subject: [PATCH] chore: transpile @tusbar/cache-control and correct babel config --- .babelrc | 8 +++++++ babel.config.json | 12 ----------- package.json | 9 ++++---- webpack.config.js | 21 ++++++++++++++++--- yarn.lock | 53 +++++++++++++---------------------------------- 5 files changed, 44 insertions(+), 59 deletions(-) create mode 100644 .babelrc delete mode 100644 babel.config.json diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..b4a1ff9 --- /dev/null +++ b/.babelrc @@ -0,0 +1,8 @@ +// Config ignored by babel when running from webpack +{ + "presets": ["@babel/preset-env", "@babel/preset-typescript"], + "plugins": ["@babel/plugin-transform-runtime"], + "comments": false, + "compact": true, + "sourceMaps": true +} diff --git a/babel.config.json b/babel.config.json deleted file mode 100644 index 7c90d35..0000000 --- a/babel.config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "presets": ["@babel/preset-env", "@babel/preset-typescript"], - "plugins": [ - "@babel/plugin-transform-runtime", - "@babel/proposal-class-properties", - "@babel/proposal-object-rest-spread" - ], - "comments": false, - "compact": true, - "sourceMaps": true, - "ignore": ["index.bundle.ts"] -} diff --git a/package.json b/package.json index ae799ac..e15261d 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "unpkg": "./dist/index.bundle.js", "scripts": { "build": "concurrently 'npm:build:*'", - "build:node": "babel src --out-dir dist --extensions '.ts'", + "build:node": "babel src --out-dir dist --extensions '.ts' --ignore src/index.bundle.ts", "build:browser": "webpack", "build:types": "tsc -p tsconfig.types.json", "test": "jest", @@ -42,19 +42,18 @@ }, "homepage": "https://github.com/ArthurFiorette/axios-cache-interceptor#readme", "dependencies": { - "@tusbar/cache-control": "^0.6.0", - "babel-runtime": "^6.26.0", + "@tusbar/cache-control": "^0.6.1", "fast-defer": "^1.1.2" }, "devDependencies": { "@arthurfiorette/prettier-config": "*", "@babel/cli": "^7.16.0", "@babel/core": "^7.16.0", - "@babel/plugin-proposal-class-properties": "^7.16.0", - "@babel/plugin-proposal-object-rest-spread": "^7.16.0", + "@babel/plugin-transform-modules-commonjs": "^7.16.0", "@babel/plugin-transform-runtime": "^7.16.4", "@babel/preset-env": "^7.16.4", "@babel/preset-typescript": "^7.16.0", + "@babel/runtime": "^7.16.3", "@types/jest": "^27.0.2", "@types/node": "^16.7.10", "@types/webpack": "^5.28.0", diff --git a/webpack.config.js b/webpack.config.js index 0520c0f..60941c4 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,9 +28,24 @@ const config = { module: { rules: [ { - test: /\.(tsx?|jsx?)$/, - exclude: /node_modules\/(?!(@tusbar\/cache-control))/, - use: { loader: 'babel-loader' } + test: /\.(ts|js)$/, + exclude: { + and: [/node_modules/], + not: [/@tusbar[\\/]cache-control/] + }, + use: { + loader: 'babel-loader', + options: { + babelrc: false, + presets: ['@babel/preset-env', '@babel/preset-typescript'], + plugins: [ + '@babel/plugin-transform-runtime', + '@babel/plugin-transform-modules-commonjs' + ], + comments: false, + sourceMaps: true + } + } } ] }, diff --git a/yarn.lock b/yarn.lock index fc05d67..5e0ad22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -911,7 +911,7 @@ "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-transform-typescript" "^7.16.0" -"@babel/runtime@^7.8.4": +"@babel/runtime@^7.16.3", "@babel/runtime@^7.8.4": version "7.16.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5" integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ== @@ -1219,15 +1219,15 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== -"@tusbar/cache-control@^0.6.0": +"@tusbar/cache-control@^0.6.1": version "0.6.1" resolved "https://registry.yarnpkg.com/@tusbar/cache-control/-/cache-control-0.6.1.tgz#fb125e23e68a573752b474dd359374bddb796188" integrity sha512-lVONHkx/OviQ8yIJu6sGmdBJVWMKQm7EDtpvM3s2VihmaqHQocFixMd/9rfAqK5IxFL7XQMVzkpRrKjQ/JBS+Q== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14": - version "7.1.16" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.16.tgz#bc12c74b7d65e82d29876b5d0baf5c625ac58702" - integrity sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ== + version "7.1.17" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.17.tgz#f50ac9d20d64153b510578d84f9643f9a3afbe64" + integrity sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -1829,14 +1829,6 @@ babel-preset-jest@^27.4.0: babel-plugin-jest-hoist "^27.4.0" babel-preset-current-node-syntax "^1.0.0" -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - balanced-match@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" @@ -1931,9 +1923,9 @@ camelcase@^6.2.0: integrity sha512-tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA== caniuse-lite@^1.0.30001280: - version "1.0.30001283" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz#8573685bdae4d733ef18f78d44ba0ca5fe9e896b" - integrity sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg== + version "1.0.30001286" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz#3e9debad420419618cfdf52dc9b6572b28a8fff6" + integrity sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ== chalk@^2.0.0: version "2.4.2" @@ -2130,11 +2122,6 @@ core-js-compat@^3.18.0, core-js-compat@^3.19.1: browserslist "^4.18.1" semver "7.0.0" -core-js@^2.4.0: - version "2.6.12" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -2246,9 +2233,9 @@ domexception@^2.0.1: webidl-conversions "^5.0.0" electron-to-chromium@^1.3.896: - version "1.4.9" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.9.tgz#4854fa55f94f18f5d0ad4ac49034ff6443fff5b9" - integrity sha512-7AyB4SiLtGJbLACXezs8BDjDbZizuoiyHTQxbcvzfi5LYWRXVSFdmPvuDjtlWQmsVSONRicZfSBj3xgft0Wvrg== + version "1.4.15" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.15.tgz#4bd144d9d13f8b375c65e1a593e7f4a90bd01b90" + integrity sha512-WDw2IUL3k4QpbzInV3JZK+Zd1NjWJPDZ28oUSchWb/kf6AVj7/niaAlgcJlvojFa1d7pJSyQ/KSZsEtq5W7aGQ== emittery@^0.8.1: version "0.8.1" @@ -3702,11 +3689,6 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - node-releases@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" @@ -3871,11 +3853,9 @@ pify@^4.0.1: integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== pirates@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA== - dependencies: - node-modules-regexp "^1.0.0" + version "4.0.4" + resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.4.tgz#07df81e61028e402735cdd49db701e4885b4e6e6" + integrity sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" @@ -3997,11 +3977,6 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - regenerator-runtime@^0.13.4: version "0.13.9" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"