From ed6aa1a0c1240a2af2cc33ca9b690b2614bf1d77 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Wed, 22 Nov 2017 13:27:18 +0000 Subject: [PATCH] fix check bundles and copy i18n and assets --- lib/package.json | 4 ++-- scripts/npm-check-bundles.sh | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/package.json b/lib/package.json index acba3192ec..d3bf3f32bc 100644 --- a/lib/package.json +++ b/lib/package.json @@ -21,8 +21,8 @@ "doc": "npm run toc && npm run markdownlint && npm run webpack -- --config config/webpack.doc.js --progress --profile --bail", "docindex": "node config/buildFullDocIndex.js", "mv-es5": "mv core/dist/@alfresco core/dist/esm5 && mv content-services/dist/@alfresco content-services/dist/esm5 && mv process-services/dist/@alfresco process-services/dist/esm5 && mv insights/dist/@alfresco insights/dist/esm5 ", - "copy-i18n": "mkdir -p core/dist/bundles/assets/adf-core/i18n && cp -R core/i18n/ core/dist/bundles/assets/adf-core/i18n && mkdir -p content-services/dist/bundles/assets/adf-content-services/i18n && cp -R content-services/i18n/ content-services/dist/bundles/assets/adf-content-services/i18n && mkdir -p process-services/dist/bundles/assets/adf-process-services/i18n && cp -R process-services/i18n/ process-services/dist/bundles/assets/adf-process-services/i18n && mkdir -p insights/dist/bundles/assets/adf-insights/i18n && cp -R insights/i18n/ insights/dist/bundles/assets/adf-insights/i18n", - "copy-assets": "cp -R core/assets/ core/dist/bundles/assets && cp -R content-services/assets/ content-services/dist/bundles/assets && cp -R process-services/assets/ process-services/dist/bundles/assets", + "copy-i18n": "mkdir -p core/dist/bundles/assets/adf-core/i18n && cp -R core/i18n/* core/dist/bundles/assets/adf-core/i18n && mkdir -p content-services/dist/bundles/assets/adf-content-services/i18n && cp -R content-services/i18n/* content-services/dist/bundles/assets/adf-content-services/i18n && mkdir -p process-services/dist/bundles/assets/adf-process-services/i18n && cp -R process-services/i18n/* process-services/dist/bundles/assets/adf-process-services/i18n && mkdir -p insights/dist/bundles/assets/adf-insights/i18n && cp -R insights/i18n/* insights/dist/bundles/assets/adf-insights/i18n", + "copy-assets": "cp -R core/assets/* core/dist/bundles/assets && cp -R content-services/assets/* content-services/dist/bundles/assets && cp -R process-services/assets/* process-services/dist/bundles/assets", "new-build": "npm run build-bundles && npm run bundle-scss-new && npm run copy-i18n && npm run copy-assets && npm run mv-es5", "build-bundles": "npm run build-core && mkdir -p ./node_modules/@alfresco/adf-core/ && cp -R ./core/dist/* ./node_modules/@alfresco/adf-core/ && npm run build-content && npm run build-process && npm run build-insights", "build-core": "ng-packagr -p ./ng-package/ng-package-core.json", diff --git a/scripts/npm-check-bundles.sh b/scripts/npm-check-bundles.sh index 4cce3551c3..5599a5dff1 100755 --- a/scripts/npm-check-bundles.sh +++ b/scripts/npm-check-bundles.sh @@ -58,14 +58,14 @@ do npm pack '@alfresco/'$PACKAGE@$VERSION tar zxf 'alfresco-'$PACKAGE-$VERSION.tgz - if [ ! -f package/bundles/$PACKAGE.js ]; then + if [ ! -f package/bundles/$PACKAGE'.umd.js' ]; then error_out '31;1' "$PACKAGE bundles not found!" >&2 exit 1 else echo "bundles ok!" fi - if [ ! -f package/bundles/$PACKAGE.js.map ]; then + if [ ! -f package/bundles/$PACKAGE'.umd.js.map' ]; then error_out '31;1' "$PACKAGE js.map not found!" >&2 exit 1 else @@ -97,7 +97,6 @@ do done cd .. -rm -rf temp set_npm_registry