From 7247b08a55ffb4db0a2a697c3dd2b3249156c9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Doll=C3=A9?= Date: Fri, 1 Jul 2022 11:41:00 +0200 Subject: [PATCH] build(cjs): adapt script for converting js to cjs files to run in multiple platform --- package.json | 2 +- scripts/convert-to-cjs.sh | 11 ----------- scripts/convert_to_cjs.sh | 38 ++++++++++++++++++++++++++++++++++++++ tsconfig.build.cjs.json | 3 +-- tsconfig.build.json | 2 +- 5 files changed, 41 insertions(+), 15 deletions(-) delete mode 100755 scripts/convert-to-cjs.sh create mode 100755 scripts/convert_to_cjs.sh diff --git a/package.json b/package.json index ef75cde..ebcd8f7 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "types": "./lib/types/index.d.ts", "scripts": { "build": "yarn clean && yarn build:cjs && yarn build:esm", - "build:cjs": "tsc -b tsconfig.build.cjs.json && ./scripts/convert-to-cjs.sh", + "build:cjs": "tsc -b tsconfig.build.cjs.json && ./scripts/convert_to_cjs.sh lib", "build:esm": "tsc -b tsconfig.build.esm.json", "clean": "rm -rfv reports coverage build dist lib .eslintcache", "commit": "cz", diff --git a/scripts/convert-to-cjs.sh b/scripts/convert-to-cjs.sh deleted file mode 100755 index de9bc31..0000000 --- a/scripts/convert-to-cjs.sh +++ /dev/null @@ -1,11 +0,0 @@ -echo "Converting .js files to .cjs" - -FILES=$(find "./lib" -name "*.js") - -for path in $FILES -do - echo "Editing $path" - sed -r -i "" "s/(require ?[^\"]+\"([^\"]+))\.js/\1.cjs/" "$path" - mv "$path" "${path/%.js/.cjs}" -done -echo "Done converting files to .cjs" diff --git a/scripts/convert_to_cjs.sh b/scripts/convert_to_cjs.sh new file mode 100755 index 0000000..d9c27e8 --- /dev/null +++ b/scripts/convert_to_cjs.sh @@ -0,0 +1,38 @@ +echo "" +echo "Converting .js files to .cjs" +echo "" + +build_folder="$1" + +if [ -z "${build_folder}" ]; then + echo "\033[0;31mYou must provide a path to aim your build folder" + exit 125 +fi + +if [ ! -d "${build_folder}" ]; then + echo "\033[0;31m${build_folder} folder does not exist" + exit 125 +fi + +files=$(find ${build_folder} -name "*.js") + +if [ $? -ne 0 ]; then + echo "\033[0;31m find command failed" + exit 125 +fi + +for path in $files; do + echo "Converting $path" + + if [[ "$OSTYPE" == "linux-gnu"* ]]; then + sed -r -i'' "s/(require ?[^\"]+\"([^\"]+))\.js/\1.cjs/" "$path" + elif [[ "$OSTYPE" == "darwin"* ]]; then + sed -r -i '' "s/(require ?[^\"]+\"([^\"]+))\.js/\1.cjs/" "$path" + fi + + mv "$path" "${path/%.js/.cjs}" +done + +echo "" +echo "Done converting files to .cjs" +echo "" diff --git a/tsconfig.build.cjs.json b/tsconfig.build.cjs.json index a7f7dcf..9b1276c 100644 --- a/tsconfig.build.cjs.json +++ b/tsconfig.build.cjs.json @@ -4,8 +4,7 @@ "outDir": "./lib/cjs", "target": "ES2015", "module": "CommonJS", - "declaration": false, - "declarationMap": false + "declaration": false }, "include": ["./src/**/*"] } diff --git a/tsconfig.build.json b/tsconfig.build.json index 1e04dcf..7fc6c4c 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -3,7 +3,7 @@ "compilerOptions": { "baseUrl": ".", "declaration": true, - "declarationMap": true, + "declarationMap": false, "removeComments": false, "sourceMap": false, "noEmit": false,