From 466e9fbe513808d0e47b560f2297b837a336157f Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Thu, 25 Apr 2019 14:40:43 +0300 Subject: [PATCH] build: generalize ignore patter to include all '__*__' dirs --- .babelrc.js | 5 +++++ package.json | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.babelrc.js b/.babelrc.js index d35eff79a4..4119a3b9da 100644 --- a/.babelrc.js +++ b/.babelrc.js @@ -1,3 +1,6 @@ +//ignore all "__*__" directories, e.g. __tests__, __fixtures__ +const ignore = [/\/__[^/]*__\//]; // **/__*__ + module.exports = { presets: ['@babel/preset-env'], plugins: [ @@ -12,11 +15,13 @@ module.exports = { presets: [ ['@babel/preset-env', { modules: 'commonjs' }], ], + ignore, }, mjs: { presets: [ ['@babel/preset-env', { modules: false }], ], + ignore, }, }, }; diff --git a/package.json b/package.json index 5a9af7a59a..303e0fc6f7 100644 --- a/package.json +++ b/package.json @@ -36,10 +36,9 @@ "build:clean": "rm -rf ./dist && mkdir ./dist", "build:cp": "cp README.md LICENSE ./dist", "build:package-json": "node ./resources/copy-package-json.js", - "build:js": "babel src --ignore 'src/__fixtures__,**/__tests__'", - "build:cjs": "npm run build:js -- --env-name cjs --out-dir dist/", - "build:mjs": "npm run build:js -- --env-name mjs --out-dir dist/module && for file in $(find dist/module -name '*.js'); do mv \"$file\" `echo \"$file\" | sed 's/dist\\/module/dist/g; s/.js$/.mjs/g'`; done && rm -rf dist/module", - "build:flow": "for file in $(find ./src -name '*.js' -not -path '*/__fixtures__*' -not -path '*/__tests__*'); do cp \"$file\" `echo \"$file\" | sed 's/\\/src\\//\\/dist\\//g'`.flow; done", + "build:cjs": "babel src --env-name cjs --out-dir dist/", + "build:mjs": "babel src --env-name mjs --out-dir dist/module && for file in $(find dist/module -name '*.js'); do mv \"$file\" `echo \"$file\" | sed 's/dist\\/module/dist/g; s/.js$/.mjs/g'`; done && rm -rf dist/module", + "build:flow": "for file in $(find ./src -name '*.js' -not -path '*/__*__*'); do cp \"$file\" `echo \"$file\" | sed 's/\\/src\\//\\/dist\\//g'`.flow; done", "preversion": ". ./resources/checkgit.sh && npm test", "prepublishOnly": ". ./resources/prepublish.sh", "gitpublish": ". ./resources/gitpublish.sh"