Skip to content
This repository was archived by the owner on Mar 27, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"plugins": [
"transform-class-properties",
"transform-runtime",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-transform-runtime",
"dynamic-import-node"
],
"presets": [
"stage-3",
"react",
"env"
"@babel/preset-stage-3",
"@babel/preset-react",
"@babel/preset-env"
]
}
47 changes: 33 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
"name": "hn-react",
"version": "0.0.0-development",
"description": "The React implementation of Headless Ninja.",
"main": "lib/index.js",
"main": "lib/es5/index.js",
"esnext": "lib/es2015/index.js",
"repository": {
"url": "https://github.com/headless-ninja/hn-react"
},
"author": "Bart Langelaan",
"license": "MIT",
"dependencies": {
"babel-runtime": "^6.25.0",
"@babel/runtime": "7.0.0-beta.40",
"get-nested": "^4.0.0",
"prop-types": "^15.5.10",
"react-async-bootstrapper": "^1.1.2",
Expand All @@ -20,13 +21,17 @@
"react": "^16.0.0"
},
"devDependencies": {
"babel-cli": "^6.24.1",
"@babel/cli": "7.0.0-beta.40",
"@babel/core": "7.0.0-beta.40",
"@babel/plugin-proposal-class-properties": "7.0.0-beta.40",
"@babel/plugin-transform-runtime": "7.0.0-beta.40",
"@babel/preset-env": "7.0.0-beta.40",
"@babel/preset-react": "7.0.0-beta.40",
"@babel/preset-stage-3": "7.0.0-beta.40",
"@types/jest": "^22.2.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^22.4.3",
"babel-plugin-dynamic-import-node": "^1.2.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.0",
"babel-preset-react": "^6.24.1",
"babel-preset-stage-3": "^6.24.1",
"coveralls": "^3.0.0",
"hn": "^0.6.1",
"jest": "^22.3.0",
Expand All @@ -37,30 +42,44 @@
"rimraf": "^2.6.2",
"semantic-release": "^12.4.1",
"travis-deploy-once": "^4.3.4",
"ts-jest": "^22.4.2",
"tslint": "^5.9.1",
"tslint-config-airbnb": "^5.7.0",
"tslint-config-prettier": "^1.8.0",
"tslint-react": "^3.5.1",
"typescript": "^2.7.2"
},
"scripts": {
"start": "npm run build -- -w",
"build": "rimraf lib && babel src -d lib --ignore test.js",
"start": "rimraf lib && tsc -w & babel src -d lib/es5 -w",
"build": "rimraf lib && tsc && babel lib/es2015 -d lib/es5",
"travis-deploy-once": "travis-deploy-once",
"semantic-release": "semantic-release",
"test": "yarn test:unit && yarn test:lint",
"test": "yarn test:types && yarn test:unit && yarn test:lint",
"test:types": "tsc --noEmit",
"test:unit": "jest --coverage",
"test:unit:update": "yarn test:unit -- -u",
"test:lint": "prettier 'src/**/*.js' -l && tslint 'src/**/*.js'",
"format": "prettier 'src/**/*.js' --write -l && tslint 'src/**/*.js' --fix"
"test:lint": "prettier 'src/**/*.{js,ts,tsx}' -l && tslint 'src/**/*.{js,ts,tsx}'",
"format": "prettier 'src/**/*.{js,ts,tsx}' --write -l && tslint 'src/**/*.{js,ts,tsx}' --fix"
},
"jest": {
"collectCoverageFrom": [
"src/**/*.js"
"src/**/*.{js,ts,tsx}"
],
"coverageReporters": [
"lcov",
"text"
],
"mapCoverage": true,
"transform": {
"^.+\\.(j|t)sx?$": "ts-jest"
},
"testRegex": "src/.*(/__tests__/.*|(\\.|/)(test|spec))\\.(j|t)sx?$",
"moduleFileExtensions": [
"ts",
"tsx",
"js",
"json",
"node"
]
},
"prettier": {
Expand Down
6 changes: 3 additions & 3 deletions src/index.test.js → src/index.test.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {
DrupalPage,
site,
EntityListMapper,
EntityMapper,
Paragraph,
EntityListMapper,
Paragraphs,
site,
waitForHnData,
} from './';
} from './index';

test('exports', () => {
expect(typeof DrupalPage).toBe('function');
Expand Down
9 changes: 4 additions & 5 deletions src/index.js → src/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import React from 'react';
import DrupalPage from './components/DrupalPage';
import site from './utils/site';
import EntityMapper from './components/EntityMapper';
import EntityListMapper from './components/EntityListMapper';
import Paragraph from './components/deprecated/Paragraph';
import Paragraphs from './components/deprecated/Paragraphs';
import DrupalPage from './components/DrupalPage';
import EntityListMapper from './components/EntityListMapper';
import EntityMapper from './components/EntityMapper';
import site from './utils/site';
import waitForHnData from './utils/waitForHnData';

export {
Expand Down
6 changes: 3 additions & 3 deletions src/utils/tests/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ export const mapper = {
/* tslint:disable */
export const asyncMapper = {
unique_type_1__unique_bundle_1: jest.fn(() =>
import('./components/MapperComponent'),
Promise.resolve(MapperComponent),
),
unique_type_2__unique_bundle_2: jest.fn(() =>
import('./components/MapperComponentWithHOC'),
Promise.resolve(MapperComponentWithHOC),
),
unique_type_3__unique_bundle_3: jest.fn(() =>
import('./components/MapperComponentWithHOC2'),
Promise.resolve(MapperComponentWithHOC2),
),
};
/* tslint:enable */
Expand Down
18 changes: 18 additions & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"include": [
"src/**/*"
],
"exclude": [
"**/*.test.{t,j}s"
],
"compilerOptions": {
"target": "ES2015",
"allowJs": true,
"jsx": "react",
//"declaration": true,
"outDir": "./lib/es2015",
"rootDir": "./src",
"strict": true,
"allowSyntheticDefaultImports": true
}
}
6 changes: 5 additions & 1 deletion tslint.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
{
"extends": ["tslint:latest", "tslint-react", "tslint-config-airbnb", "tslint-config-prettier"]
"extends": ["tslint:latest", "tslint-react", "tslint-config-airbnb", "tslint-config-prettier"],
"rules": {
"import-name": false,
"no-submodule-imports": false
}
}
Loading