[SDC-29] Amdocs OnBoard 1707 initial commit.
Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>
diff --git a/openecomp-ui/tools/gulp/deployment/gulpfile.js b/openecomp-ui/tools/gulp/deployment/gulpfile.js
index 9938910..bf127e6 100644
--- a/openecomp-ui/tools/gulp/deployment/gulpfile.js
+++ b/openecomp-ui/tools/gulp/deployment/gulpfile.js
@@ -1,23 +1,18 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
* 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
- *
+ *
+ * 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.
- * ============LICENSE_END=========================================================
+ * 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 i18nUpdateTask = require('./tools/gulp/tasks/i18nUpdate');
diff --git a/openecomp-ui/tools/gulp/deployment/package.json b/openecomp-ui/tools/gulp/deployment/package.json
index 3bad037..5f04905 100644
--- a/openecomp-ui/tools/gulp/deployment/package.json
+++ b/openecomp-ui/tools/gulp/deployment/package.json
@@ -10,7 +10,7 @@
"gulp-replace": "^0.5.4",
"prompt": "^0.2.14"
},
- "author": "ECOMP",
+ "author": "OPENECOMP",
"license": "LicenseRef-LICENSE",
"scripts": {
"start": "gulp run",
diff --git a/openecomp-ui/tools/gulp/deployment/tools/gulp/tasks/i18nUpdate.js b/openecomp-ui/tools/gulp/deployment/tools/gulp/tasks/i18nUpdate.js
index a3cae5b..d35ae2d 100644
--- a/openecomp-ui/tools/gulp/deployment/tools/gulp/tasks/i18nUpdate.js
+++ b/openecomp-ui/tools/gulp/deployment/tools/gulp/tasks/i18nUpdate.js
@@ -1,23 +1,18 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
* 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
- *
+ *
+ * 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.
- * ============LICENSE_END=========================================================
+ * 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, replace, rename, fs, prompt, Promise;
function mergePromptOptions(options) {
@@ -168,4 +163,4 @@
-module.exports = update;
+module.exports = update;
\ No newline at end of file
diff --git a/openecomp-ui/tools/gulp/tasks/i18n.js b/openecomp-ui/tools/gulp/tasks/i18n.js
index 38b2a02..a17e846 100644
--- a/openecomp-ui/tools/gulp/tasks/i18n.js
+++ b/openecomp-ui/tools/gulp/tasks/i18n.js
@@ -1,23 +1,18 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
* 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
- *
+ *
+ * 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.
- * ============LICENSE_END=========================================================
+ * 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');
@@ -26,19 +21,17 @@
/**
*
- * @param options.outputPath
* @param options.localesPath
* @param options.lang = options.lang
*
* @returns {string}
*/
function composeLocalesDirPath(options) {
- return options.outputPath + options.localesPath + options.lang;
+ return options.localesPath + options.lang;
}
/**
*
- * @param options.outputPath
* @param options.localesPath
* @param options.lang
*
@@ -50,11 +43,9 @@
/**
- * @param options
- * @param options.outputPath
+ *
* @param options.localesPath
* @param options.lang = options.lang
- *
*/
function ensureLocalesDir(options) {
@@ -68,7 +59,6 @@
}
});
});
-
}
/**
@@ -106,8 +96,8 @@
else resolve();
});
}).on('error', function (err) {
- reject(err);
- });
+ reject(err);
+ });
});
});
}
diff --git a/openecomp-ui/tools/gulp/tasks/prod.js b/openecomp-ui/tools/gulp/tasks/prod.js
index d66b841..cb6e251 100644
--- a/openecomp-ui/tools/gulp/tasks/prod.js
+++ b/openecomp-ui/tools/gulp/tasks/prod.js
@@ -1,30 +1,27 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
* 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
- *
+ *
+ * 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.
- * ============LICENSE_END=========================================================
+ * 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';
-var gulp, replace, Promise, webpack, webpackProductionConfig;
+let gulp, replace, Promise, webpack, webpackProductionConfig;
-var supportedLanguages = ['en'];
+const supportedLanguages = ['en'];
function start(options) {
- var promises = [buildIndex(options)];
+ let promises = [buildIndex(options)];
supportedLanguages.forEach(function (lang) {
promises.push(bundleJS(options, lang));
});
@@ -33,7 +30,7 @@
function bundleJS(options, lang) {
return new Promise(function (resolve, reject) {
- var prodConfig = webpackProductionConfig;
+ let prodConfig = webpackProductionConfig;
prodConfig.resolve.alias.i18nJson = options.outDir + '/i18n/' + lang + '/locale.json';
prodConfig.output.filename = jsFileByLang(options.outFileName, lang);
webpack(prodConfig, function (err, stats) {
@@ -54,9 +51,9 @@
return new Promise(function (resolve, reject) {
- var stream = gulp.src(options.outDir + '/index.html');
-
- stream.pipe(replace(/\/\/<!--prod:delete-->(.|[\r\n])*?<!--\/prod:delete-->/g, ''))//in script occurrences.
+ // gulp.src returns a stream object
+ gulp.src(options.outDir + '/index.html')
+ .pipe(replace(/\/\/<!--prod:delete-->(.|[\r\n])*?<!--\/prod:delete-->/g, ''))//in script occurrences.
.pipe(replace(/<!--prod:delete-->(.|[\r\n])*?<!--\/prod:delete-->/g, ''))//out of script occurrences.
.pipe(replace(/<!--prod:add(-->)?/g, ''))
.pipe(replace(/\/\/<!--prod:supported-langs-->(.|[\r\n])*?<!--\/prod:supported-langs-->/g, supportedLanguages.map(function (val) {
@@ -84,12 +81,21 @@
* @param options.outFileName optional <default build>
*/
function prodTask(options) {
-
gulp = require('gulp');
replace = require('gulp-replace');
Promise = require('bluebird');
webpack = require('webpack');
- webpackProductionConfig = options.webpackProductionConfig;
+
+ webpackProductionConfig = require('../../../webpack.production');
+ webpackProductionConfig.module.rules = webpackProductionConfig.module.rules.filter(rule => ((rule.enforce !== 'pre') || (rule.enforce === 'pre' && rule.loader !== 'source-map-loader')));
+ webpackProductionConfig.module.rules.forEach(loader => {
+ if (loader.use && loader.use[0].loader === 'style-loader') {
+ loader.use = loader.use.map(loaderObj => loaderObj.loader.replace('?sourceMap', ''));
+ }
+ });
+
+
+ webpackProductionConfig.module.rules.push({test: /config.json$/, use: [{loader:'config-json-loader'}]});
return start({
outFileName: options.outFileName || '[name].js',