From 26017eba7575ecdd4c6ab44e67add2fd8e74b4c9 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Fri, 6 Oct 2017 09:21:47 -0700 Subject: [PATCH] Fix tests --- .gitignore | 1 + package.json | 10 +++++----- scripts/build-data.js | 5 +---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index efd3173..aa5572e 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules/ dist/ dist-es/ bundle.js +/src/data/data.js \ No newline at end of file diff --git a/package.json b/package.json index a95a61c..a2e89af 100644 --- a/package.json +++ b/package.json @@ -62,12 +62,12 @@ "webpack": "^3.6.0" }, "scripts": { - "clean": "rm -rf dist/ dist-es/", + "clean": "rm -rf dist/ dist-es/ src/data/data.js", "build:data": "node scripts/build-data", - "build:dist": "npm run clean && npm run build:cjs && npm run build:es", + "build:dist": "npm run build:cjs && npm run build:es", "build:cjs": "BABEL_ENV=cjs babel src --out-dir dist --copy-files --ignore webpack.config.js", "build:es": "babel src --out-dir dist-es --copy-files --ignore webpack.config.js", - "build": "npm run build:dist && npm run build:data", + "build": "npm run clean && npm run build:data && npm run build:dist", "watch": "BABEL_ENV=cjs babel src --watch --out-dir dist --copy-files --ignore webpack.config.js", "start": "npm run watch", "stats": "webpack --config ./src/webpack.config.js --json > stats.json", @@ -75,13 +75,13 @@ "react:14": "npm run react:clean && npm i react@^0.14 react-dom@^0.14 react-addons-test-utils@^0.14 --save-dev", "react:15": "npm run react:clean && npm i react@^15 react-dom@^15 react-addons-test-utils@^15 --save-dev", "test": "NODE_ENV=test karma start && size-limit", - "prepublish": "npm run clean && npm run build", + "prepublish": "npm run build", "storybook": "start-storybook -p 6006", "build-storybook": "build-storybook" }, "size-limit": [ { - "path": "dist/index.js", + "path": "dist-es/index.js", "limit": "80 KB" } ] diff --git a/scripts/build-data.js b/scripts/build-data.js index a692b7c..8f6ad06 100644 --- a/scripts/build-data.js +++ b/scripts/build-data.js @@ -141,9 +141,6 @@ flags.emojis = flags.emojis.filter((flag) => { }).sort() const stringified = JSON.stringify(data).replace(/\"([A-Za-z_]+)\":/g, '$1:') -fs.writeFile('dist/data/data.js', `module.exports = ${stringified}`, (err) => { +fs.writeFile('src/data/data.js', `export default ${stringified}`, (err) => { if (err) throw err - fs.writeFile('dist-es/data/data.js', `export default ${stringified}`, (err) => { - if (err) throw err - }) })