From b258d34c7305dad50214c03f015956b2f75baa70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 13 May 2015 10:52:51 -0700 Subject: [PATCH 1/3] Don't run non-existant fbtransform tests --- package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 330ad340ec..35c12d946c 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,7 @@ "/.module-cache/" ], "testPathDirs": [ - "/src", - "/vendor/fbtransform" + "/src" ], "unmockedModulePathPatterns": [ "" From 9769f9697419aae351e4fd31f679c0bf2ba7e7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 13 May 2015 10:57:47 -0700 Subject: [PATCH 2/3] [docs] Move pre-compiled JS files --- docs/{_js => js}/es5-sham.min.js | 0 docs/{_js => js}/es5-shim.min.js | 0 docs/{_js => js}/html5shiv.min.js | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename docs/{_js => js}/es5-sham.min.js (100%) rename docs/{_js => js}/es5-shim.min.js (100%) rename docs/{_js => js}/html5shiv.min.js (100%) diff --git a/docs/_js/es5-sham.min.js b/docs/js/es5-sham.min.js similarity index 100% rename from docs/_js/es5-sham.min.js rename to docs/js/es5-sham.min.js diff --git a/docs/_js/es5-shim.min.js b/docs/js/es5-shim.min.js similarity index 100% rename from docs/_js/es5-shim.min.js rename to docs/js/es5-shim.min.js diff --git a/docs/_js/html5shiv.min.js b/docs/js/html5shiv.min.js similarity index 100% rename from docs/_js/html5shiv.min.js rename to docs/js/html5shiv.min.js From 76d016c6f1c7d0ba394b15ba3d99b25606ac3b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 13 May 2015 11:08:45 -0700 Subject: [PATCH 3/3] Use Babel to transform JS in docs, update other calls --- bin/jsx-internal | 2 +- docs/Rakefile | 4 ++-- jest/preprocessor.js | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/jsx-internal b/bin/jsx-internal index 6e62b6993d..b642f9bed3 100755 --- a/bin/jsx-internal +++ b/bin/jsx-internal @@ -3,7 +3,7 @@ // vim: set ft=javascript : "use strict"; -var babel = require('babel-core'); +var babel = require('babel'); var constants = require('../vendor/constants')(babel); diff --git a/docs/Rakefile b/docs/Rakefile index 6a7454bad1..a454da6fde 100644 --- a/docs/Rakefile +++ b/docs/Rakefile @@ -4,12 +4,12 @@ require('yaml') desc "generate js from jsx" task :js do - system "../bin/jsx --harmony _js js" + system "../node_modules/.bin/babel _js --out-dir=js" end desc "watch js" task :watch do - Process.spawn "../bin/jsx --watch --harmony _js js" + Process.spawn "../node_modules/.bin/babel _js --out-dir=js --watch" Process.waitall end diff --git a/jest/preprocessor.js b/jest/preprocessor.js index ab2ce32141..29fee899b0 100644 --- a/jest/preprocessor.js +++ b/jest/preprocessor.js @@ -1,6 +1,6 @@ 'use strict'; -var babel = require('babel-core'); +var babel = require('babel'); var coffee = require('coffee-script'); var tsPreprocessor = require('./ts-preprocessor'); diff --git a/package.json b/package.json index 35c12d946c..87e1013ea4 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "jstransform": "^11.0.0" }, "devDependencies": { - "babel-core": "^5.2.7", + "babel": "^5.3.3", "benchmark": "~1.0.0", "browserify": "^9.0.3", "bundle-collapser": "^1.1.1",