Skip to content
Open
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
12 changes: 11 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,15 @@
],
"plugins": [
"add-module-exports"
]
],
"env": {
"test": {
"plugins": [
[ "babel-plugin-webpack-alias", {
"config": "webpack.config.js",
"findConfig": true
} ]
]
}
}
}
4 changes: 2 additions & 2 deletions client/components/payment/credit-card-selector.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
require( './credit-card-selector.scss' );

/**
* External dependencies
*/
Expand All @@ -16,6 +14,8 @@ var StoredCard = require( './stored-card' ),
ScreenReaderText = require( '../screen-reader-text' );
// upgradesActions = require( 'lib/upgrades/actions' );

require( './credit-card-selector.scss' );

var CreditCardSelector = React.createClass( {
propTypes: {
onSelectPayment: React.PropTypes.func.isRequired,
Expand Down
2 changes: 1 addition & 1 deletion client/demo.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require( 'babel/polyfill' );
require( 'babel-polyfill' );
var Demo,
Tabs = require( './components/tabs' ),
Sidebar = require( './components/sidebar' ),
Expand Down
2 changes: 1 addition & 1 deletion client/lib/credit-card-details/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var creditcards = require( 'creditcards' ),
isArray = require( 'lodash/isArray' ),
isEmpty = require( 'lodash/isEmpty' ),
toArray = require( 'lodash/toArray' ),
inRange = require( 'lodash/number/inRange' ),
inRange = require( 'lodash/inRange' ),
capitalize = require( 'lodash/capitalize' );

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This utility function allows us to use a standardized method of loading remote s

### Usage
```js
loadScript = require( 'load-script' );
loadScript = require( '@automattic/dops-components/client/lib/load-script' );
loadScript.loadScript( REMOTE_SCRIPT_URL, function( error ) {
if ( error ) {
debug( 'Script ' + error.src + ' failed to load.' );
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion client/lib/paygate-loader/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var debug = require( 'debug' )( 'calypso:paygate' );
/**
* Internal dependencies
*/
var loadScript = require( 'load-script' ),
var loadScript = require( '../load-script' ),
config = require( 'config' );

var PAYGATE_URL = 'https://pay-js.automattic.com/v1/paygate.js';
Expand Down
2 changes: 1 addition & 1 deletion client/lib/wpcom-undocumented/lib/undocumented.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var debug = require( 'debug' )( 'calypso:wpcom-undocumented:undocumented' ),
isPlainObject = require( 'lodash/isPlainObject' ),
clone = require( 'lodash/clone' ),
omit = require( 'lodash/object/omit' ),
omit = require( 'lodash/omit' ),
camelCase = require( 'lodash/camelCase' ),
snakeCase = require( 'lodash/snakeCase' );

Expand Down
2 changes: 1 addition & 1 deletion dist/demo.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/demo.css.map

Large diffs are not rendered by default.

33 changes: 17 additions & 16 deletions dist/demo.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/demo.js.map

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"babel-eslint": "4.1.7",
"babel-loader": "6.2.4",
"babel-plugin-add-module-exports": "0.2.1",
"babel-plugin-webpack-alias": "^2.1.1",
"babel-preset-es2015": "^6.6.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-1": "^6.5.0",
Expand Down Expand Up @@ -36,11 +37,12 @@
"webpack-dev-server": "^1.10.1"
},
"dependencies": {
"babel-polyfill": "^6.16.0",
"bounding-client-rect": "^1.0.5",
"classnames": "^2.1.3",
"click-outside": "1.0.4",
"color": "^0.10.1",
"clipboard": "1.5.3",
"color": "^0.10.1",
"component-uid": "0.0.2",
"creditcards": "^2.0.0",
"debug": "^2.2.0",
Expand Down
5 changes: 5 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ module.exports = {
},
resolve: {
extensions: [ '', '.js', '.jsx' ],
alias: {
components: path.resolve( __dirname, 'client/components' ),
lib: path.resolve( __dirname, 'client/lib' ),
config: path.resolve( __dirname, '../AkismetReact/calypso/config' )
},
root: path.resolve( __dirname, 'client' )
},
stats: {
Expand Down