Obsolete babel

Author: cvle

.babelrc

@@ -20,10 +20,9 @@ script:
 - npm run lint
 - npm run test
 - npm run test:coverage
+- npm run build
 after_success:
 - npm run ci:coveralls
-before_deploy:
-- npm run build
 deploy:
   provider: npm
   on:

.travis.yml

@@ -5,16 +5,12 @@ const jsonlint = require("gulp-jsonlint");
 const eslint = require("gulp-eslint");
 const merge = require("merge2");
 const yamllint = require("gulp-yaml-validate");
-const babel = require("gulp-babel");
 const sourcemaps = require("gulp-sourcemaps");
-const fs = require("fs");
-
-const babelConfig = JSON.parse(fs.readFileSync("./.babelrc", "utf8"));
 
 const files = {
   tsWithoutTest: ["./src/**/*.ts", "./src/**/*.tsx", "!./src/**/*.spec.tsx", "!./src/**/*.spec.ts"],
   tsWithTest: ["./src/**/*.ts", "./src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"],
-  json: ["./*.json", "./.babelrc"],
+  json: ["./*.json"],
   yml: ["./*.yml"],
   js: ["./*.js"],
 };
@@ -23,30 +19,29 @@ function onBuildError() {
   this.once("finish", () => process.exit(1));
 }
 
-function build(type) {
+function build(dest, module) {
   return () => {
     const tsProject = ts.createProject("tsconfig.json", {
       noEmitOnError: true,
-      declaration: type === "lib",
-      target: "es6",
-      module: "es6",
+      declaration: dest === "lib",
+      target: "es5",
+      module,
     });
     const tsResult = gulp.src(files.tsWithoutTest)
       .pipe(sourcemaps.init())
       .pipe(tsProject())
       .once("error", onBuildError);
     return merge([
-      tsResult.dts.pipe(gulp.dest(type)),
+      tsResult.dts.pipe(gulp.dest(dest)),
       tsResult.js
-        .pipe(babel(babelConfig.env[`build-${type}`]))
         .pipe(sourcemaps.write("."))
-        .pipe(gulp.dest(type)),
+        .pipe(gulp.dest(dest)),
     ]);
   };
 }
 
-gulp.task("lib", ["lint"], build("lib"));
-gulp.task("commonjs", ["lint"], build("cjs"));
+gulp.task("lib", ["lint"], build("lib", "es6"));
+gulp.task("commonjs", ["lint"], build("cjs", "commonjs"));
 
 gulp.task("tslint", () => {
   return gulp.src(files.tsWithTest)

gulpfile.js

@@ -2,14 +2,14 @@ const path = require("path");
 
 module.exports = (config) => {
   config.set({
-    browsers: ["Chrome"], // run in Chrome
-    singleRun: true, // just run once by default
-    frameworks: ["mocha"], // use the mocha test framework
+    browsers: ["Chrome"],
+    singleRun: true,
+    frameworks: ["mocha"],
     files: [
-      "tests.webpack.js", // just load this file
+      "tests.webpack.js",
     ],
     preprocessors: {
-      "tests.webpack.js": ["webpack", "sourcemap"], // preprocess with webpack and our sourcemap loader
+      "tests.webpack.js": ["webpack", "sourcemap"],
     },
     remapCoverageReporter: {
       "text-summary": null,
@@ -23,7 +23,7 @@ module.exports = (config) => {
     },
     // TODO: enable coverage after https://github.com/deepsweet/istanbul-instrumenter-loader/pull/29.
     reporters: ["dots"], // , "coverage", "remap-coverage"], // report results in this format
-    webpack: { // kind of a copy of your webpack config
+    webpack: {
       resolve: {
         extensions: [".tsx", ".ts", ".js", ".json"],
       },
@@ -33,7 +33,7 @@ module.exports = (config) => {
         "react/lib/ExecutionEnvironment": true,
         "react/lib/ReactContext": true,
       },
-      devtool: "inline-source-map", // just do inline source maps instead of the default
+      devtool: "inline-source-map",
       module: {
         rules: [
           {
@@ -45,8 +45,6 @@ module.exports = (config) => {
             loader: "awesome-typescript",
             query: {
               sourceMap: true,
-              useBabel: true,
-              useCache: false,
               module: "commonjs",
             },
           },

karma.conf.js

@@ -1,4 +1,4 @@
---compilers tsx:ts-babel-node/register,ts:ts-babel-node/register
+--compilers tsx:ts-node/register,ts:ts-node/register
 --reporter dot
 src/**/*.spec.tsx
 src/**/*.spec.ts

mocha.opts

@@ -22,9 +22,12 @@
     "clean": "rm -r -f dist",
     "ci:coveralls": "cat coverage/lcov.info | coveralls",
     "lint": "gulp lint",
-    "test": "cross-env NODE_ENV=test karma start",
-    "test:coverage": "cross-env NODE_ENV=coverage TS_NODE_PROJECT=./tsconfig.coverage.json nyc mocha --opts mocha.opts",
-    "test:watch": "cross-env NODE_ENV=test karma start --single-run=false"
+    "test": "npm run test:unit && npm run test:integration",
+    "test:unit": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --opts mocha.opts",
+    "test:unit:watch": "cross-env TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' mocha --opts mocha.opts --watch",
+    "test:integration": "cross-env NODE_ENV=test karma start",
+    "test:integration:watch": "cross-env NODE_ENV=test karma start --single-run=false",
+    "test:coverage": "cross-env NODE_ENV=test TS_NODE_COMPILER_OPTIONS='{\"module\":\"commonjs\"}' nyc --instrument mocha --opts mocha.opts"
   },
   "engines": {
     "node": ">=4"
@@ -49,15 +52,11 @@
     "@types/enzyme": "^2.5.37",
     "@types/jsdom": "^2.0.29",
     "@types/mocha": "^2.2.32",
+    "@types/object-assign": "^4.0.30",
     "@types/react": "^0.14.43",
+    "@types/rewire": "^2.5.27",
     "@types/sinon": "^1.16.31",
     "awesome-typescript-loader": "^2.2.4",
-    "babel-core": "^6.18.2",
-    "babel-plugin-istanbul": "^2.0.3",
-    "babel-plugin-rewire": "^1.0.0",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-preset-es2015": "^6.18.0",
-    "babel-preset-react": "^6.16.0",
     "cash-rm": "^0.2.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.14",
@@ -67,13 +66,13 @@
     "eslint-config-airbnb-base": "^9.0.0",
     "eslint-plugin-import": "^2.0.1",
     "gulp": "^3.9.1",
-    "gulp-babel": "^6.1.2",
     "gulp-eslint": "^3.0.1",
     "gulp-jsonlint": "^1.1.2",
     "gulp-sourcemaps": "^2.2.0",
     "gulp-tslint": "^6.1.2",
     "gulp-typescript": "^3.0.2",
     "gulp-yaml-validate": "^1.0.2",
+    "istanbul": "^1.1.0-alpha.1",
     "istanbul-instrumenter-loader": "^1.0.0",
     "jsdom": "^9.8.0",
     "json-loader": "^0.5.4",
@@ -88,12 +87,12 @@
     "merge2": "^1.0.2",
     "mocha": "^3.1.2",
     "nyc": "^8.4.0",
+    "object-assign": "^4.1.0",
     "react": "^15.3.2",
     "react-addons-test-utils": "^15.3.2",
     "react-dom": "^15.3.2",
     "rewire": "^2.5.2",
     "sinon": "^2.0.0-pre.2",
-    "ts-babel-node": "git+https://git@github.com/danielmoore/ts-babel-node.git",
     "ts-node": "~1.2.3",
     "tslint": "^3.15.1",
     "typescript": "^2.0.6",

package.json

@@ -7,6 +7,7 @@
  */
 
 import * as React from "react";
+import * as objectAssign from "object-assign";
 
 import { TransitionObserver, TransitionObserverProps } from "./transitionobserver";
 
@@ -41,7 +42,7 @@ export interface CSSTransitionState {
 }
 
 function getRest(props: CSSTransitionProps): any {
-  const rest = Object.assign({}, props);
+  const rest = objectAssign({}, props);
   delete rest.active;
   delete rest.transitionAppear;
   delete rest.onTransitionComplete;

src/csstransition.tsx

@@ -6,6 +6,8 @@
  * of the MIT license. See the LICENSE file for details.
  */
 
+import * as objectAssign from "object-assign";
+
 import { CSSProperties } from "react";
 
 import { TransitionConfig } from "./transit";
@@ -20,7 +22,7 @@ export interface ProcessResult {
 
 export function processStyle(style: CSSProperties): ProcessResult {
   let transition = "";
-  let processedStyle = Object.assign({}, style);
+  let processedStyle = objectAssign({}, style);
   let lastProperty: string;
   let lastPropertyDuration = -1;
   let firstPropertyDelay = 9999999999;

src/processstyle.ts

@@ -8,26 +8,29 @@
 
 /* tslint:disable: variable-name */
 
-declare module "./transit" {
-  export const __RewireAPI__: any;
-}
-
+import * as rewire from "rewire";
 import { assert } from "chai";
-import { TransitionConfig, transit, __RewireAPI__ as transitRewireAPI } from "./transit";
+
+import * as transitModule from "./transit";
+import { TransitionConfig } from "./transit";
+
+const rewireModule = rewire("./transit");
+const { transit } = rewireModule as any as typeof transitModule;
 
 describe("transit.ts", () => {
   let warning: string;
+  let resetRewire: Function;
 
   beforeEach(() => {
-    transitRewireAPI.__Rewire__("warning", (condition: any, message: string) => {
+    resetRewire = rewireModule.__set__("warning", (condition: any, message: string) => {
       if (!condition) {
         warning = message;
       }
     });
   });
 
   afterEach(() => {
-    transitRewireAPI.__ResetDependency__("warning");
+    resetRewire();
     warning = undefined;
   });
 

src/transit.spec.ts

@@ -7,6 +7,7 @@
  */
 
 import * as React from "react";
+import * as objectAssign from "object-assign";
 
 import { processStyle } from "./processstyle";
 import { matchTransitionProperty } from "./utils";
@@ -19,7 +20,7 @@ export interface TransitionObserverProps {
 }
 
 function getRest(props: TransitionObserverProps): any {
-  const rest = Object.assign({}, props);
+  const rest = objectAssign({}, props);
   delete rest.style;
   delete rest.onTransitionBegin;
   delete rest.onTransitionComplete;

src/transitionobserver.tsx

@@ -1,5 +1,2 @@
-const unitContext = require.context("./src", true, /\.tsx?$/);
-unitContext.keys().forEach(unitContext);
-
 const integrationContext = require.context("./test", true, /\.tsx?$/);
 integrationContext.keys().forEach(integrationContext);

tests.webpack.js

@@ -1,9 +1,9 @@
 {
   "compilerOptions": {
-    "target": "es6",
+    "target": "es5",
     "module": "es6",
     "moduleResolution": "node",
-    "jsx": "preserve",
+    "jsx": "react",
     "noImplicitAny": true,
     "baseUrl": "./",
     "paths": {