From ccfdad297bd2d9fde251816260e19e091db04db5 Mon Sep 17 00:00:00 2001 From: James Gillmore Date: Mon, 14 Aug 2017 00:39:41 -0700 Subject: [PATCH 1/2] add babel-plugin-syntax-dynamic-import + all prestets to babel-regiser --- src/development.js | 11 +++++++++-- yarn.lock | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/development.js b/src/development.js index 0eeed4d..1a395b6 100644 --- a/src/development.js +++ b/src/development.js @@ -1,8 +1,15 @@ require('babel-polyfill'); require('babel-core/register')({ - plugins: [ - 'dynamic-import-webpack', + "presets": [ + "es2015", + "react", + "stage-0" ], + "plugins": [ + "transform-async-to-generator", + "universal-import", + "syntax-dynamic-import" + ] }); __ROOT__ = require('path').resolve(__dirname, '../'); diff --git a/yarn.lock b/yarn.lock index f808885..304b9d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -722,7 +722,7 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-plugin-universal-import@^1.2.5: version "1.2.5" - resolved "http://registry.npm.taobao.org/babel-plugin-universal-import/download/babel-plugin-universal-import-1.2.5.tgz#1c2576dfb80250e735db1770515f7264fdcac9d3" + resolved "https://registry.yarnpkg.com/babel-plugin-universal-import/-/babel-plugin-universal-import-1.2.5.tgz#1c2576dfb80250e735db1770515f7264fdcac9d3" babel-polyfill@^6.23.0: version "6.23.0" From 9a838eb63b5a98d05ec890131c8c792927ef601d Mon Sep 17 00:00:00 2001 From: James Gillmore Date: Mon, 14 Aug 2017 00:47:54 -0700 Subject: [PATCH 2/2] update deps --- package.json | 3 +-- yarn.lock | 19 ++----------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index bbede13..3eeaf3c 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,7 @@ "devDependencies": { "babel-core": "^6.25.0", "babel-loader": "^7.1.1", - "babel-plugin-dynamic-import-node": "^1.0.2", - "babel-plugin-dynamic-import-webpack": "^1.0.1", + "babel-plugin-syntax-dynamic-import": "^6.18.0", "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-plugin-universal-import": "^1.2.5", "babel-polyfill": "^6.23.0", diff --git a/yarn.lock b/yarn.lock index 304b9d5..7695289 100644 --- a/yarn.lock +++ b/yarn.lock @@ -354,21 +354,6 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-dynamic-import-node@^1.0.2: - version "1.0.2" - resolved "http://registry.npm.taobao.org/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-1.0.2.tgz#adb5bc8f48a89311540395ae9f0cc3ed4b10bb2e" - dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - babel-template "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-dynamic-import-webpack@^1.0.1: - version "1.0.1" - resolved "http://registry.npm.taobao.org/babel-plugin-dynamic-import-webpack/download/babel-plugin-dynamic-import-webpack-1.0.1.tgz#26c24a1c1c9bf49184b30d5867562a4cbfa530d1" - dependencies: - babel-plugin-syntax-dynamic-import "^6.18.0" - babel-template "^6.16.0" - babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "http://registry.npm.taobao.org/babel-plugin-syntax-async-functions/download/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" @@ -395,7 +380,7 @@ babel-plugin-syntax-do-expressions@^6.8.0: babel-plugin-syntax-dynamic-import@^6.18.0: version "6.18.0" - resolved "http://registry.npm.taobao.org/babel-plugin-syntax-dynamic-import/download/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" babel-plugin-syntax-exponentiation-operator@^6.8.0: version "6.13.0" @@ -832,7 +817,7 @@ babel-runtime@^6.18.0, babel-runtime@^6.22.0: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.25.0: +babel-template@^6.24.1, babel-template@^6.25.0: version "6.25.0" resolved "http://registry.npm.taobao.org/babel-template/download/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071" dependencies: