diff options
author | Einav Weiss Keidar <einavw@amdocs.com> | 2018-05-30 18:12:02 +0300 |
---|---|---|
committer | Vitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com> | 2018-07-08 08:58:48 +0000 |
commit | f2c47232959536b878b1db64a8a5ffb63a1d7f1f (patch) | |
tree | db73f6396a089bbc74ee7372180a01286bf3b3a0 /openecomp-ui/tools | |
parent | d4cc2beaef58a4fc95bdc281efd879b1d1edf279 (diff) |
webpack 4 upgrade
Issue-ID: SDC-1388
Change-Id: I44d61491ef802187baa4beb3b4fc2c9f1e8405e5
Signed-off-by: Einav Weiss Keidar <einavw@amdocs.com>
Diffstat (limited to 'openecomp-ui/tools')
-rw-r--r-- | openecomp-ui/tools/getDevConfig.js | 10 | ||||
-rw-r--r-- | openecomp-ui/tools/gulp/tasks/i18n.js | 97 | ||||
-rw-r--r-- | openecomp-ui/tools/gulp/tasks/prod.js | 97 | ||||
-rw-r--r-- | openecomp-ui/tools/webpack/config-json-loader/index.js | 22 |
4 files changed, 10 insertions, 216 deletions
diff --git a/openecomp-ui/tools/getDevConfig.js b/openecomp-ui/tools/getDevConfig.js new file mode 100644 index 0000000000..6563311ed2 --- /dev/null +++ b/openecomp-ui/tools/getDevConfig.js @@ -0,0 +1,10 @@ +module.exports = function () { + let localDevConfig = {}; + try { + localDevConfig = require('../devConfig'); + } catch (e) {} + const devConfig = Object.assign({}, require('../devConfig.defaults'), localDevConfig); + let devPort = process.env.PORT || devConfig.port; + devConfig.port = devPort; + return devConfig; +}(); diff --git a/openecomp-ui/tools/gulp/tasks/i18n.js b/openecomp-ui/tools/gulp/tasks/i18n.js deleted file mode 100644 index 85d5c37734..0000000000 --- a/openecomp-ui/tools/gulp/tasks/i18n.js +++ /dev/null @@ -1,97 +0,0 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -var gulp = require('gulp'); -var fs = require('fs'); -var replace = require('gulp-replace'); -var clean = require('gulp-clean'); -var tap = require('gulp-tap'); -/** - * - * @param options - * @param options.outDir - * @param options.srcDir - * @param options.i18nBundles - optional. if given will check the that all keys from js are mapped - * - */ -function i18nTask(options) { - - var i18nJson = {}; - - function addWord(expr) { - var word = expr.substring('i18n(\''.length, expr.length - 1); - if (word !== '') { - i18nJson[word] = word; - } - return expr; - } - - let createBundle = new Promise(function(resolve, reject) { - gulp.src(options.srcDir + '**/*.{js,jsx}', {base: './'}) - .pipe(replace(/i18n\('.*?'/g, addWord)) - .pipe(clean()) - .pipe(gulp.dest('./')) - .on('end', function () { - console.log('Retrieved keys from static references.'); - if (options.i18nBundles === undefined) { - // creating the file from the words saved during the replace - let outfile = options.outDir + '/bundleForStaticKeys.json'; - fs.writeFile(outfile,JSON.stringify(i18nJson, null, '\t'), function (err) { - if (err) { - reject(err); - } - else resolve(); - }); - console.log('Bundle with static keys was created under: ' + outfile); - } - resolve(); - }).on('error', function (err) { - reject(err); - }); - }); - - - if (options.i18nBundles === undefined) { - return createBundle; - } else { - return createBundle.then(() => { - new Promise(function (resolve, reject) { - gulp.src(options.i18nBundles) - .pipe(tap(function (file) { - console.log('Checking against bundle: ' + file.path); - let bundle = JSON.parse(file.contents.toString()); - for (entry in i18nJson) { - if (!bundle[entry]) { - console.log('Missing Key: ' + entry); - } else { - delete bundle[entry]; - } - } - for (entry in bundle) { - console.log('Unused in static files: ' + entry); - } - })) - .pipe(gulp.dest('./')) - .on('end', function () { - console.log('done'); - }).on('error', function (err) { - reject(err); - }); - }); - }); - } -} - -module.exports = i18nTask; diff --git a/openecomp-ui/tools/gulp/tasks/prod.js b/openecomp-ui/tools/gulp/tasks/prod.js deleted file mode 100644 index 509bec857a..0000000000 --- a/openecomp-ui/tools/gulp/tasks/prod.js +++ /dev/null @@ -1,97 +0,0 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ -'use strict'; - -let gulp, replace, Promise, webpack, webpackProductionConfig,cloneDeep, tap; -let langs = []; - -/* -Runs the webpack build. -Will first seach for the resource bundles to see how many languages are supported and then run a build per langauage - */ -function buildWebPackForLanguage(prodConfig, lang) { - return new Promise(function (resolve, reject) { - webpack(prodConfig, function (err, stats) { - console.log('[webpack:build ' + prodConfig.output.filename + ']', stats.toString()); - if (err || stats.hasErrors()) { - console.log('webpack:build : Failure!! ' + prodConfig.output.filename + ']'); - reject(err || stats.toJson().errors); - } - else { - console.log('webpack:build : Done ' + prodConfig.output.filename + ']'); - resolve(); - } - }); - }); -} -/* - // this will check in the src directory which language bundles we have and will - // create the array to that we can run a webpack build per language afterwards - */ -function getSupportedLanguages(options) { - return new Promise((resolve, reject) => { - gulp.src(options.i18nBundles) - .pipe(tap(function(file) { - let languageStartIndex = file.path.lastIndexOf('i18n') + 5; - let languageStr = file.path.indexOf('.json') - languageStartIndex; - let currentLang = file.path.substr(languageStartIndex, languageStr); - console.log('Found bundle ' + file.path + ' for [' + currentLang + ']'); - langs[currentLang] = file.path; - })) - .pipe(gulp.dest(options.outDir)) - .on('end', function () { - resolve(); - }) - .on('error', function (e) { - console.log('getLanguages : Failure!!'); - reject(e); - }); - }); -} - -/** - * @param options - * @param options.outFileName optional <default build> - */ -function prodTask(options) { - gulp = require('gulp'); - replace = require('gulp-replace'); - Promise = require('bluebird'); - webpack = require('webpack'); - cloneDeep = require('lodash/cloneDeep'); - tap = require('gulp-tap'); - - - // updating webpack for the production build. no need for sourcemaps in this case. - webpackProductionConfig = require('../../../webpack.production'); - - // get the languages so that we can bulid per language with the correct bundle - let getLanguages =getSupportedLanguages(options); - // this will run a webpack build per language - return getLanguages.then(() => { - let promises = []; - for (var lang in langs) { - let prodConfig = cloneDeep(webpackProductionConfig); - prodConfig.resolve.alias.i18nJson = langs[lang]; - prodConfig.output.filename = (options.outFileName || '[name].js').replace(/.js$/, '_' + lang + '.js'); - promises.push(buildWebPackForLanguage(prodConfig, lang)); - } - return Promise.all(promises); - }); - -} - -module.exports = prodTask; diff --git a/openecomp-ui/tools/webpack/config-json-loader/index.js b/openecomp-ui/tools/webpack/config-json-loader/index.js deleted file mode 100644 index a0d28db125..0000000000 --- a/openecomp-ui/tools/webpack/config-json-loader/index.js +++ /dev/null @@ -1,22 +0,0 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -module.exports = function(content) { - var build = process.env.BUILD_NUMBER || '0'; - var config = JSON.parse(content); - config.build = build; - return "module.exports = " + JSON.stringify(config, undefined, "\t") + ";"; -}; |