Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
feat: mangle error codes to error indexes
Added mangleErrors babel script which converts error messages from strings to error code indexes.
  • Loading branch information
andrewmcgivery committed Oct 25, 2020
commit 7ef1246952161ebbccb3fb04cc60e2a078fc9506
18 changes: 18 additions & 0 deletions errors.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"0": "It looks like you are passing several store enhancers to createStore(). This is not supported. Instead, compose them together to a single function.",
"1": "Expected the enhancer to be a function.",
"2": "Expected the reducer to be a function.",
"3": "You may not call store.getState() while the reducer is executing. The reducer has already received the state as an argument. Pass it down from the top reducer instead of reading it from the store.",
"4": "Expected the listener to be a function.",
"5": "You may not call store.subscribe() while the reducer is executing. If you would like to be notified after the store has been updated, subscribe from a component and invoke store.getState() in the callback to access the latest state. See https://redux.js.org/api/store#subscribelistener for more details.",
"6": "You may not unsubscribe from a store listener while the reducer is executing. See https://redux.js.org/api/store#subscribelistener for more details.",
"7": "Actions must be plain objects. Use custom middleware for async actions.",
"8": "Actions may not have an undefined \"type\" property. Have you misspelled a constant?",
"9": "Reducers may not dispatch actions.",
"10": "Expected the nextReducer to be a function.",
"11": "Expected the observer to be an object.",
"12": "bindActionCreators expected an object or a function, instead received . Did you write \"import ActionCreators from\" instead of \"import * as ActionCreators from\"?",
"13": "Dispatching while constructing your middleware is not allowed. Other middleware would not be applied to this dispatch.",
"14": "Reducer \"\" returned undefined during initialization. If the state passed to the reducer is undefined, you must explicitly return the initial state. The initial state may not be undefined. If you don't want to set a value for this reducer, you can use null instead of undefined.",
"15": "Reducer \"\" returned undefined when probed with a random type. Don't try to handle or other actions in \"redux/*\" namespace. They are considered private. Instead, you must return the current state for any unknown actions, unless it is undefined, in which case you must return the initial state, regardless of the action type. The initial state may not be undefined, but can be null."
}
69 changes: 37 additions & 32 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ const babelRuntimeVersion = pkg.dependencies['@babel/runtime'].replace(
''
)

const makeExternalPredicate = (externalArr) => {
const makeExternalPredicate = externalArr => {
if (externalArr.length === 0) {
return () => false
}
const pattern = new RegExp(`^(${externalArr.join('|')})($|/)`)
return (id) => pattern.test(id)
return id => pattern.test(id)
}

export default [
Expand All @@ -29,21 +29,22 @@ export default [
output: { file: 'lib/redux.js', format: 'cjs', indent: false },
external: makeExternalPredicate([
...Object.keys(pkg.dependencies || {}),
...Object.keys(pkg.peerDependencies || {}),
...Object.keys(pkg.peerDependencies || {})
]),
plugins: [
nodeResolve({
extensions,
extensions
}),
typescript({ useTsconfigDeclarationDir: true }),
babel({
extensions,
plugins: [
['@babel/plugin-transform-runtime', { version: babelRuntimeVersion }],
['./scripts/mangleErrors.js', { minify: false }]
],
runtimeHelpers: true,
}),
],
runtimeHelpers: true
})
]
},

// ES
Expand All @@ -52,24 +53,25 @@ export default [
output: { file: 'es/redux.js', format: 'es', indent: false },
external: makeExternalPredicate([
...Object.keys(pkg.dependencies || {}),
...Object.keys(pkg.peerDependencies || {}),
...Object.keys(pkg.peerDependencies || {})
]),
plugins: [
nodeResolve({
extensions,
extensions
}),
typescript({ tsconfigOverride: noDeclarationFiles }),
babel({
extensions,
plugins: [
[
'@babel/plugin-transform-runtime',
{ version: babelRuntimeVersion, useESModules: true },
{ version: babelRuntimeVersion, useESModules: true }
],
['./scripts/mangleErrors.js', { minify: false }]
],
runtimeHelpers: true,
}),
],
runtimeHelpers: true
})
]
},

// ES for Browsers
Expand All @@ -78,25 +80,26 @@ export default [
output: { file: 'es/redux.mjs', format: 'es', indent: false },
plugins: [
nodeResolve({
extensions,
extensions
}),
replace({
'process.env.NODE_ENV': JSON.stringify('production'),
'process.env.NODE_ENV': JSON.stringify('production')
}),
typescript({ tsconfigOverride: noDeclarationFiles }),
babel({
extensions,
exclude: 'node_modules/**',
plugins: [['./scripts/mangleErrors.js', { minify: true }]]
}),
terser({
compress: {
pure_getters: true,
unsafe: true,
unsafe_comps: true,
warnings: false,
},
}),
],
warnings: false
}
})
]
},

// UMD Development
Expand All @@ -106,21 +109,22 @@ export default [
file: 'dist/redux.js',
format: 'umd',
name: 'Redux',
indent: false,
indent: false
},
plugins: [
nodeResolve({
extensions,
extensions
}),
typescript({ tsconfigOverride: noDeclarationFiles }),
babel({
extensions,
exclude: 'node_modules/**',
plugins: [['./scripts/mangleErrors.js', { minify: false }]]
}),
replace({
'process.env.NODE_ENV': JSON.stringify('development'),
}),
],
'process.env.NODE_ENV': JSON.stringify('development')
})
]
},

// UMD Production
Expand All @@ -130,28 +134,29 @@ export default [
file: 'dist/redux.min.js',
format: 'umd',
name: 'Redux',
indent: false,
indent: false
},
plugins: [
nodeResolve({
extensions,
extensions
}),
typescript({ tsconfigOverride: noDeclarationFiles }),
babel({
extensions,
exclude: 'node_modules/**',
plugins: [['./scripts/mangleErrors.js', { minify: true }]]
}),
replace({
'process.env.NODE_ENV': JSON.stringify('production'),
'process.env.NODE_ENV': JSON.stringify('production')
}),
terser({
compress: {
pure_getters: true,
unsafe: true,
unsafe_comps: true,
warnings: false,
},
}),
],
},
warnings: false
}
})
]
}
]
130 changes: 130 additions & 0 deletions scripts/mangleErrors.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
const fs = require('fs')

/**
* Converts an AST type into a javascript string so that it can be added to the error message lookup.
*
* Adapted from React (https://github.com/facebook/react/blob/master/scripts/shared/evalToString.js) with some
* adjustments
*/
const evalToString = ast => {
switch (ast.type) {
case 'StringLiteral':
case 'Literal': // ESLint
return ast.value
case 'BinaryExpression': // `+`
if (ast.operator !== '+') {
throw new Error('Unsupported binary operator ' + ast.operator)
}
return evalToString(ast.left) + evalToString(ast.right)
case 'TemplateLiteral':
return ast.quasis.reduce(
(concatenatedValue, templateElement) =>
concatenatedValue + templateElement.value.raw,
''
)
case 'Identifier':
return ast.name
default:
throw new Error('Unsupported type ' + ast.type)
}
}

/**
* Takes a `throw new error` statement and transforms it depending on the minify argument. Either option results in a
* smaller bundle size in production for consumers.
*
* If minify is enabled, we'll replace the error message with just an index that maps to an arrow object lookup.
*
* If minify is disabled, we'll add in a conditional statement to check the process.env.NODE_ENV which will output a
* an error number index in production or the actual error message in development. This allows consumers using webpak
* or another build tool to have these messages in development but have just the error index in production.
*
* E.g.
* Before:
* throw new Error("This is my error message.");
* throw new Error("This is a second error message.");
*
* After (with minify):
* throw new Error(0);
* throw new Error(1);
*
* After: (without minify):
* throw new Error(node.process.env === 'production' ? 0 : "This is my error message.");
* throw new Error(node.process.env === 'production' ? 1 : "This is a second error message.");
*/
module.exports = babel => {
const t = babel.types
// When the plugin starts up, we'll load in the existing file. This allows us to continually add to it so that the
// indexes do not change between builds.
const errorsFiles = fs.readFileSync('errors.json').toString()
let errors = Object.values(JSON.parse(errorsFiles || '{}'))
// This variable allows us to skip writing back to the file if the errors array hasn't changed
let changeInArray = false

return {
pre: () => {
changeInArray = false
},
visitor: {
ThrowStatement(path, file) {
const arguments = path.node.argument.arguments
const minify = file.opts.minify

if (arguments && arguments[0]) {
// Skip running this logic when certain types come up:
// Identifier comes up when a variable is thrown (E.g. throw new error(message))
// NumericLiteral and ConditionalExpression is code we have already processed
if (
path.node.argument.arguments[0].type === 'Identifier' ||
path.node.argument.arguments[0].type === 'NumericLiteral' ||
path.node.argument.arguments[0].type === 'ConditionalExpression'
) {
return
}

const errorMsgLiteral = evalToString(path.node.argument.arguments[0])

// Attempt to get the existing index of the error. If it is not found, add it to the array as a new error.
let errorIndex = errors.indexOf(errorMsgLiteral)
if (errorIndex === -1) {
errors.push(errorMsgLiteral)
errorIndex = errors.length - 1
changeInArray = true
}

if (minify) {
path.replaceWith(
t.throwStatement(
t.newExpression(t.identifier('Error'), [
t.NumericLiteral(errorIndex)
])
)
)
} else {
path.replaceWith(
t.throwStatement(
t.newExpression(t.identifier('Error'), [
t.conditionalExpression(
t.binaryExpression(
'===',
t.identifier('process.env.NODE_ENV'),
t.stringLiteral('production')
),
t.NumericLiteral(errorIndex),
path.node.argument.arguments[0]
)
])
)
)
}
}
}
},
post: () => {
// If there is a new error in the array, convert it to an indexed object and write it back to the file.
if (changeInArray) {
fs.writeFileSync('errors.json', JSON.stringify({ ...errors }, null, 2))
}
}
}
}