From f380ec8626b260d2128c0dca65d9575708a842c2 Mon Sep 17 00:00:00 2001 From: Johan Girod Date: Mon, 18 Mar 2019 19:17:40 +0100 Subject: [PATCH] Ajoute regenerator-runtime plutot que babel/polyfill MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dans le futur, on voudra surement créer une version pour les nav moderne et une version IE, On pourra alors se débarasser de polyfill.io et uniquement utiliser polyfill.io de babel --- package.json | 3 +-- source/.babelrc | 1 - source/webpack.common.js | 4 ++-- yarn.lock | 24 ++++++------------------ 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 816116b8b..436f1218b 100644 --- a/package.json +++ b/package.json @@ -19,8 +19,8 @@ "not ie < 11" ], "dependencies": { - "@babel/runtime": "^7.3.4", "@researchgate/react-intersection-observer": "^0.7.3", + "babel-regenerator-runtime": "^6.5.0", "classnames": "^2.2.5", "color-convert": "^1.9.2", "focus-trap-react": "^3.1.2", @@ -94,7 +94,6 @@ "@babel/plugin-proposal-object-rest-spread": "^7.0.0", "@babel/plugin-proposal-optional-chaining": "^7.0.0", "@babel/plugin-syntax-dynamic-import": "^7.0.0", - "@babel/plugin-transform-runtime": "^7.3.4", "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.1.0", "@babel/preset-flow": "^7.0.0-beta.51", diff --git a/source/.babelrc b/source/.babelrc index 3ef651438..f71827874 100644 --- a/source/.babelrc +++ b/source/.babelrc @@ -19,7 +19,6 @@ "@babel/plugin-proposal-object-rest-spread", "@babel/plugin-syntax-dynamic-import", "react-hot-loader/babel", - "@babel/plugin-transform-runtime", ["webpack-alias", { "config": "./source/webpack.dev.js" }], [ "ramda", diff --git a/source/webpack.common.js b/source/webpack.common.js index 00822e32a..7e9ca7375 100644 --- a/source/webpack.common.js +++ b/source/webpack.common.js @@ -21,8 +21,8 @@ module.exports = { }, entry: { embauche: ['./source/sites/embauche.gouv.fr/entry.js'], - 'mon-entreprise': ['./source/sites/mycompanyinfrance.fr/entry.fr.js'], - infrance: ['./source/sites/mycompanyinfrance.fr/entry.en.js'], + 'mon-entreprise': ['babel-regenerator-runtime', './source/sites/mycompanyinfrance.fr/entry.fr.js'], + infrance: ['babel-regenerator-runtime', './source/sites/mycompanyinfrance.fr/entry.en.js'], // To not introduce breaking into the iframe integration, we serve simulateur.js from a 'dist' subdirectory 'dist/simulateur': ['./source/sites/embauche.gouv.fr/iframe-script.js'], diff --git a/yarn.lock b/yarn.lock index 922fc3e7a..cf228da0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -574,16 +574,6 @@ dependencies: regenerator-transform "^0.13.3" -"@babel/plugin-transform-runtime@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.3.4.tgz#57805ac8c1798d102ecd75c03b024a5b3ea9b431" - integrity sha512-PaoARuztAdd5MgeVjAxnIDAIUet5KpogqaefQvPOmPYCxYoaPhautxDh3aO8a4xHsKgT/b9gSxR0BKK1MIewPA== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@babel/helper-plugin-utils" "^7.0.0" - resolve "^1.8.1" - semver "^5.5.1" - "@babel/plugin-transform-shorthand-properties@^7.2.0": version "7.2.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0" @@ -717,13 +707,6 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.3.4": - version "7.3.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.3.4.tgz#73d12ba819e365fcf7fd152aed56d6df97d21c83" - integrity sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g== - dependencies: - regenerator-runtime "^0.12.0" - "@babel/template@^7.1.0", "@babel/template@^7.1.2", "@babel/template@^7.2.2": version "7.2.2" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.2.2.tgz#005b3fdf0ed96e88041330379e0da9a708eb2907" @@ -1656,6 +1639,11 @@ babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" +babel-regenerator-runtime@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/babel-regenerator-runtime/-/babel-regenerator-runtime-6.5.0.tgz#0e41cd1c9f80442466f015c749fff8ba98f8e110" + integrity sha1-DkHNHJ+ARCRm8BXHSf/4upj44RA= + babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.25.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" @@ -8254,7 +8242,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.3.2, resolve@^1.8.1, resolve@^1.9.0: +resolve@^1.3.2, resolve@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba" integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==