Skip to content
This repository was archived by the owner on Sep 20, 2023. It is now read-only.

Commit ba9d59c

Browse files
rpearcerpearce
committed
fix CJS budle. bump to 4.1.2
1 parent 6931ab9 commit ba9d59c

File tree

6 files changed

+176
-155
lines changed

6 files changed

+176
-155
lines changed

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
55
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
66

7+
## [4.1.2] - 2020-01-01
8+
9+
### Changed
10+
* fixed commonjs bundle
11+
712
## [4.1.1] - 2019-12-29
813

914
### Changed

‎docs/app.js

+117-116
Original file line numberDiff line numberDiff line change
@@ -1,146 +1,147 @@
11
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
22
"use strict";
33

4-
Object.defineProperty(exports, "__esModule", {
5-
value: true
6-
});
7-
exports["default"] = void 0;
8-
9-
var _react = require("react");
10-
11-
var _reactWithForwardedRef = _interopRequireDefault(require("react-with-forwarded-ref"));
12-
13-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
14-
15-
function _defineProperty(obj, key, value) {
16-
if (key in obj) {
17-
Object.defineProperty(obj, key, {
18-
value: value,
19-
enumerable: true,
20-
configurable: true,
21-
writable: true
22-
});
23-
} else {
24-
obj[key] = value;
25-
}
26-
27-
return obj;
28-
}
29-
30-
function ownKeys(object, enumerableOnly) {
31-
var keys = Object.keys(object);
32-
33-
if (Object.getOwnPropertySymbols) {
34-
var symbols = Object.getOwnPropertySymbols(object);
35-
if (enumerableOnly) symbols = symbols.filter(function (sym) {
36-
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
37-
});
38-
keys.push.apply(keys, symbols);
39-
}
4+
function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
405

41-
return keys;
42-
}
6+
(function (global, factory) {
7+
(typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('react-with-forwarded-ref')) : typeof define === 'function' && define.amd ? define(['exports', 'react', 'react-with-forwarded-ref'], factory) : (global = global || self, factory(global['rba-umd'] = {}, global.React, global.withForwardedRef));
8+
})(void 0, function (exports, react, withForwardedRef) {
9+
'use strict';
4310

44-
function _objectSpread2(target) {
45-
for (var i = 1; i < arguments.length; i++) {
46-
var source = arguments[i] != null ? arguments[i] : {};
11+
withForwardedRef = withForwardedRef && withForwardedRef.hasOwnProperty('default') ? withForwardedRef['default'] : withForwardedRef;
4712

48-
if (i % 2) {
49-
ownKeys(Object(source), true).forEach(function (key) {
50-
_defineProperty(target, key, source[key]);
13+
function _defineProperty(obj, key, value) {
14+
if (key in obj) {
15+
Object.defineProperty(obj, key, {
16+
value: value,
17+
enumerable: true,
18+
configurable: true,
19+
writable: true
5120
});
52-
} else if (Object.getOwnPropertyDescriptors) {
53-
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
5421
} else {
55-
ownKeys(Object(source)).forEach(function (key) {
56-
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
57-
});
22+
obj[key] = value;
5823
}
24+
25+
return obj;
5926
}
6027

61-
return target;
62-
}
28+
function ownKeys(object, enumerableOnly) {
29+
var keys = Object.keys(object);
6330

64-
function _objectWithoutPropertiesLoose(source, excluded) {
65-
if (source == null) return {};
66-
var target = {};
67-
var sourceKeys = Object.keys(source);
68-
var key, i;
31+
if (Object.getOwnPropertySymbols) {
32+
var symbols = Object.getOwnPropertySymbols(object);
33+
if (enumerableOnly) symbols = symbols.filter(function (sym) {
34+
return Object.getOwnPropertyDescriptor(object, sym).enumerable;
35+
});
36+
keys.push.apply(keys, symbols);
37+
}
6938

70-
for (i = 0; i < sourceKeys.length; i++) {
71-
key = sourceKeys[i];
72-
if (excluded.indexOf(key) >= 0) continue;
73-
target[key] = source[key];
39+
return keys;
7440
}
7541

76-
return target;
77-
}
42+
function _objectSpread2(target) {
43+
for (var i = 1; i < arguments.length; i++) {
44+
var source = arguments[i] != null ? arguments[i] : {};
7845

79-
function _objectWithoutProperties(source, excluded) {
80-
if (source == null) return {};
81-
82-
var target = _objectWithoutPropertiesLoose(source, excluded);
46+
if (i % 2) {
47+
ownKeys(Object(source), true).forEach(function (key) {
48+
_defineProperty(target, key, source[key]);
49+
});
50+
} else if (Object.getOwnPropertyDescriptors) {
51+
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
52+
} else {
53+
ownKeys(Object(source)).forEach(function (key) {
54+
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
55+
});
56+
}
57+
}
8358

84-
var key, i;
59+
return target;
60+
}
8561

86-
if (Object.getOwnPropertySymbols) {
87-
var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
62+
function _objectWithoutPropertiesLoose(source, excluded) {
63+
if (source == null) return {};
64+
var target = {};
65+
var sourceKeys = Object.keys(source);
66+
var key, i;
8867

89-
for (i = 0; i < sourceSymbolKeys.length; i++) {
90-
key = sourceSymbolKeys[i];
68+
for (i = 0; i < sourceKeys.length; i++) {
69+
key = sourceKeys[i];
9170
if (excluded.indexOf(key) >= 0) continue;
92-
if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
9371
target[key] = source[key];
9472
}
73+
74+
return target;
9575
}
9676

97-
return target;
98-
}
77+
function _objectWithoutProperties(source, excluded) {
78+
if (source == null) return {};
9979

100-
var isSelect = function isSelect(e) {
101-
return e.key === 'Enter' || e.key === ' ' || e.key === 'Spacebar' || e.keyCode === 13 || e.keyCode === 32;
102-
};
80+
var target = _objectWithoutPropertiesLoose(source, excluded);
81+
82+
var key, i;
83+
84+
if (Object.getOwnPropertySymbols) {
85+
var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
10386

104-
var ButtonA11y = function ButtonA11y(_ref) {
105-
var children = _ref.children,
106-
element = _ref.element,
107-
forwardedRef = _ref.forwardedRef,
108-
onClick = _ref.onClick,
109-
onKeyDown = _ref.onKeyDown,
110-
strictMode = _ref.strictMode,
111-
rest = _objectWithoutProperties(_ref, ["children", "element", "forwardedRef", "onClick", "onKeyDown", "strictMode"]);
87+
for (i = 0; i < sourceSymbolKeys.length; i++) {
88+
key = sourceSymbolKeys[i];
89+
if (excluded.indexOf(key) >= 0) continue;
90+
if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
91+
target[key] = source[key];
92+
}
93+
}
11294

113-
if (strictMode && !children && !rest['aria-label']) {
114-
throw new Error('react-button-a11y: `aria-label` required for accessibility');
95+
return target;
11596
}
11697

117-
var handleKeyDown = (0, _react.useCallback)(function (e) {
118-
onKeyDown(e);
98+
var isSelect = function isSelect(e) {
99+
return e.key === 'Enter' || e.key === ' ' || e.key === 'Spacebar' || e.keyCode === 13 || e.keyCode === 32;
100+
};
119101

120-
if (isSelect(e)) {
121-
e.preventDefault();
122-
onClick(e);
123-
}
124-
}, [onClick, onKeyDown]);
125-
return (0, _react.createElement)(element, _objectSpread2({}, rest, {
126-
children: children,
127-
onClick: onClick,
128-
onKeyDown: handleKeyDown,
129-
ref: forwardedRef,
130-
role: 'button',
131-
tabIndex: '0'
132-
}));
133-
};
102+
var ButtonA11y = function ButtonA11y(_ref) {
103+
var children = _ref.children,
104+
element = _ref.element,
105+
forwardedRef = _ref.forwardedRef,
106+
onClick = _ref.onClick,
107+
onKeyDown = _ref.onKeyDown,
108+
strictMode = _ref.strictMode,
109+
rest = _objectWithoutProperties(_ref, ["children", "element", "forwardedRef", "onClick", "onKeyDown", "strictMode"]);
110+
111+
if (strictMode && !children && !rest['aria-label']) {
112+
throw new Error('react-button-a11y: `aria-label` required for accessibility');
113+
}
114+
115+
var handleKeyDown = react.useCallback(function (e) {
116+
onKeyDown(e);
117+
118+
if (isSelect(e)) {
119+
e.preventDefault();
120+
onClick(e);
121+
}
122+
}, [onClick, onKeyDown]);
123+
return react.createElement(element, _objectSpread2({}, rest, {
124+
children: children,
125+
onClick: onClick,
126+
onKeyDown: handleKeyDown,
127+
ref: forwardedRef,
128+
role: 'button',
129+
tabIndex: '0'
130+
}));
131+
};
134132

135-
ButtonA11y.defaultProps = {
136-
element: 'span',
137-
onClick: Function.prototype,
138-
onKeyDown: Function.prototype,
139-
strictMode: true
140-
};
141-
var index = (0, _react.memo)((0, _reactWithForwardedRef["default"])(ButtonA11y));
142-
var _default = index;
143-
exports["default"] = _default;
133+
ButtonA11y.defaultProps = {
134+
element: 'span',
135+
onClick: Function.prototype,
136+
onKeyDown: Function.prototype,
137+
strictMode: true
138+
};
139+
var index = react.memo(withForwardedRef(ButtonA11y));
140+
exports["default"] = index;
141+
Object.defineProperty(exports, '__esModule', {
142+
value: true
143+
});
144+
});
144145

145146
},{"react":13,"react-with-forwarded-ref":10}],2:[function(require,module,exports){
146147
"use strict";
@@ -151,7 +152,7 @@ var _react = _interopRequireWildcard(require("react"));
151152

152153
var _reactDom = _interopRequireDefault(require("react-dom"));
153154

154-
var _esm = _interopRequireDefault(require("../dist/esm"));
155+
var _cjs = _interopRequireDefault(require("../dist/cjs"));
155156

156157
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
157158

@@ -192,10 +193,10 @@ var App = function App() {
192193
var btn1Class = 'btn--words'.concat(isBtn1Pressed ? ' btn--pressed' : '');
193194
var btn2Label = isBtn2Pressed ? 'Pressed' : 'Press me';
194195
var btn2Class = 'btn--noWords'.concat(isBtn2Pressed ? ' btn--pressed' : '');
195-
return _react["default"].createElement("div", null, _react["default"].createElement("section", null, _react["default"].createElement("h2", null, "Button with children"), _react["default"].createElement(_esm["default"], {
196+
return _react["default"].createElement("div", null, _react["default"].createElement("section", null, _react["default"].createElement("h2", null, "Button with children"), _react["default"].createElement(_cjs["default"], {
196197
className: btn1Class,
197198
onClick: handleBtn1Click
198-
}, btn1Label)), _react["default"].createElement("section", null, _react["default"].createElement("h2", null, "Button without children"), _react["default"].createElement(_esm["default"], {
199+
}, btn1Label)), _react["default"].createElement("section", null, _react["default"].createElement("h2", null, "Button without children"), _react["default"].createElement(_cjs["default"], {
199200
"aria-label": btn2Label,
200201
className: btn2Class,
201202
onClick: handleBtn2Click
@@ -206,7 +207,7 @@ var container = document.querySelector('[data-app]');
206207

207208
_reactDom["default"].render(_react["default"].createElement(App, null), container);
208209

209-
},{"../dist/esm":1,"react":13,"react-dom":9}],3:[function(require,module,exports){
210+
},{"../dist/cjs":1,"react":13,"react-dom":9}],3:[function(require,module,exports){
210211
/*
211212
object-assign
212213
(c) Sindre Sorhus

‎example/app.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useCallback, useState } from 'react'
22
import ReactDOM from 'react-dom'
3-
import ButtonA11y from '../dist/esm'
3+
import ButtonA11y from '../dist/cjs'
44

55
const App = () => {
66
const [isBtn1Pressed, pressBtn1] = useState(false)

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-button-a11y",
3-
"version": "4.1.1",
3+
"version": "4.1.2",
44
"description": "Make non-button elements accessible in React",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",
@@ -76,6 +76,7 @@
7676
"react": "^16.12.0",
7777
"react-dom": "^16.12.0",
7878
"rollup": "^1.27.14",
79+
"rollup-plugin-auto-external": "^3.0.0-alpha.0",
7980
"rollup-plugin-babel": "^4.3.3"
8081
},
8182
"peerDependencies": {

‎rollup.config.js

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,15 @@
11
import { dirname } from 'path'
22

3-
import React from 'react'
4-
import ReactDOM from 'react-dom'
5-
import propTypes from 'prop-types'
6-
73
import babel from 'rollup-plugin-babel'
84
import commonjs from '@rollup/plugin-commonjs'
5+
import external from 'rollup-plugin-auto-external'
96
import resolve from '@rollup/plugin-node-resolve'
107
import pkg from './package.json'
118

129
const plugins = [
1310
resolve(),
14-
commonjs({
15-
include: /node_modules/,
16-
17-
// https://github.com/rollup/rollup-plugin-commonjs/issues/407#issuecomment-527837831
18-
namedExports: {
19-
react: Object.keys(React),
20-
'react-dom': Object.keys(ReactDOM),
21-
'prop-types': Object.keys(propTypes)
22-
}
23-
}),
11+
external(),
12+
commonjs({ include: /node_modules/ }),
2413
babel({
2514
configFile: './babel.config.js',
2615
only: ['./source'],
@@ -48,8 +37,7 @@ const config = [
4837
sourcemap: true
4938
}
5039
],
51-
plugins,
52-
external: ['react', 'react-with-forwarded-ref']
40+
plugins
5341
},
5442
{
5543
input: './source/index.js',
@@ -59,7 +47,11 @@ const config = [
5947
exports: 'named',
6048
format: 'umd',
6149
name: 'rba-umd',
62-
sourcemap: true
50+
sourcemap: true,
51+
globals: {
52+
react: 'React',
53+
'react-with-forwarded-ref': 'withForwardedRef'
54+
}
6355
}
6456
],
6557
plugins

0 commit comments

Comments
 (0)