diff options
4 files changed, 59 insertions, 75 deletions
diff --git a/dox-sequence-diagram-ui/package.json b/dox-sequence-diagram-ui/package.json index d469310e25..cca633cd2c 100644 --- a/dox-sequence-diagram-ui/package.json +++ b/dox-sequence-diagram-ui/package.json @@ -12,7 +12,7 @@ "author": "ONAP", "license": "SEE LICENSE IN LICENSE", "dependencies": { - "d3": "^3.5.16", + "d3": "^4.9.1", "lodash": "^4.12.0", "prop-types": "^15.6.0", "react": "^15.1.0", @@ -32,10 +32,8 @@ "babel-preset-es2015": "^6.3.13", "babel-preset-react": "^6.5.0", "babel-preset-stage-0": "^6.5.0", - "babelify": "^7.2.0", "copy": "^0.2.0", "css-loader": "^0.23.1", - "ejs-html-loader": "^1.2.2", "eslint": "^2.10.2", "eslint-config-airbnb": "^9.0.1", "eslint-loader": "^1.3.0", @@ -44,7 +42,6 @@ "eslint-plugin-react": "^5.1.1", "file-loader": "^0.8.5", "json-loader": "^0.5.4", - "node-http-proxy": "^0.2.3", "node-sass": "^3.7.0", "path": "^0.12.7", "raw-loader": "^0.5.1", @@ -53,8 +50,8 @@ "style-loader": "^0.13.1", "svg-sprite-loader": "0.0.19", "url-loader": "^0.5.7", - "webpack": "^1.13.1", - "webpack-dev-server": "^1.14.1" + "webpack": "^2.2.1", + "webpack-dev-server": "^2.4.2" }, "engines": { "node": ">=5.1", diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss index c2a924edc7..d6bd3f671b 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/common/_typography.scss @@ -1,6 +1,6 @@ /* Fonts */ -$base-font-regular: omnes-regular, Arial, sans-serif; -$base-font-light: omnes-light, Arial, sans-serif; -$base-font-medium: omnes-medium, Arial, sans-serif; -$base-font-bold: omnes-bold, Arial, sans-serif; +$base-font-regular: OpenSans, OpenSans-Regular, 'Open Sans',omnes-regular, Arial, sans-serif; +$base-font-light: OpenSans-Light, 'Open Sans', omnes-light, Arial, sans-serif; +$base-font-medium: OpenSans-Semibold, 'Open Sans', omnes-medium, Arial, sans-serif; +$base-font-bold: OpenSans-Bold, 'Open Sans', omnes-bold, Arial, sans-serif; diff --git a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss index 0d9eef54d2..4a6fd3647d 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss +++ b/dox-sequence-diagram-ui/src/main/webapp/res/ecomp/asdc/sequencer/sequencer-development.scss @@ -4,26 +4,7 @@ html,body { height: 100%; width: 100%; } -@font-face { - font-family: Omnes-Light; - src: url('../common/fonts/omnes-att-light.otf'); -} - -@font-face { - font-family: Omnes-Regular; - src: url('../common/fonts/omnes-att-regular.otf'); -} - -@font-face { - font-family: Omnes-Medium; - src: url('../common/fonts/omnes-att-medium.otf'); -} - -@font-face { - font-family: Omnes-Bold; - src: url('../common/fonts/omnes-att-bold.otf'); -} * { - font-family: "Omnes-Regular", "Helvetiva Neue", Helvetica, Arial, SansSerif; + font-family: OpenSans, OpenSans-Regular, 'Open Sans', Arial, sans-serif; } diff --git a/dox-sequence-diagram-ui/webpack.config.js b/dox-sequence-diagram-ui/webpack.config.js index 94850ec297..72a483724a 100644 --- a/dox-sequence-diagram-ui/webpack.config.js +++ b/dox-sequence-diagram-ui/webpack.config.js @@ -24,53 +24,42 @@ var config = { libraryTarget: 'umd' }, resolve: { - extensions: ['', '.js', '.jsx'] - }, - eslint: { - failOnWarning: false, - failOnError: false, - configFile: 'eslintrc.json' + extensions: ['.js', '.jsx'] }, devtool: 'eval-source-map', module: { - preLoaders: [{ - test: /\.(js|jsx)?$/, - loader: 'eslint-loader', - exclude: /node_modules/ - }], - loaders: [{ - test: /\.(js|jsx)$/, - include: path.join(PATHS.SRC, 'lib'), - loader: 'babel-loader', - exclude: /node_modules/, - query: { - presets: ['es2015', 'react'] - } - }, { - test: /\.css$/, - loaders: ['style', 'css'] - }, { - test: /\.(png|woff|woff2|eot|ttf|otf)$/, - loader: 'url-loader?limit=100000' - }, { - test: /\.scss$/, - include: path.join(PATHS.SRC, 'res'), - loaders: ['style', 'css', 'sass'] - }, { - test: /\.html$/, - include: path.join(PATHS.SRC, 'lib'), - loaders: ['raw'] - }, { - test: /\.json$/, - include: path.join(PATHS.SRC, 'lib'), - loaders: ['json'] - }, { - test: /\.svg$/, - loader: 'svg-sprite?' + JSON.stringify({ - name: '[name]_[hash]', - prefixize: true - }) - }] + rules: [ + {test: /\.(js|jsx)$/, loader: 'eslint-loader', exclude: [/node_modules/], enforce: 'pre'}, + {test: /\.(js|jsx)$/, loader: 'babel-loader', + exclude: /node_modules/, + include: path.join(PATHS.SRC, 'lib')}, + {test: /\.(css)$/, use: [ + {loader: 'style-loader'}, + {loader: 'css-loader'}]}, + {test: /\.(png|woff|woff2|eot|ttf|otf)$/, loader: 'url-loader?limit=100000'}, + { + test: /\.scss$/, + include: path.join(PATHS.SRC, 'res'), + loaders: ['style-loader', 'css-loader', 'sass-loader'] + }, + { + test: /\.html$/, + include: path.join(PATHS.SRC, 'lib'), + loaders: ['raw-loader'] + }, + { + test: /\.json$/, + include: path.join(PATHS.SRC, 'lib'), + loaders: ['json-loader'] + }, + { + test: /\.svg$/, + loader: 'svg-sprite-loader?' + JSON.stringify({ + name: '[name]_[hash]', + prefixize: true + }) + } + ] }, externals: (devmode ? {} : { 'd3': 'd3', @@ -93,7 +82,24 @@ var config = { secure: false } } - } + }, + plugins: [ + new webpack.DefinePlugin({ + DEV: true, + DEBUG: true + }), + new webpack.HotModuleReplacementPlugin(), + new webpack.LoaderOptionsPlugin({ + options: { + eslint: { + failOnWarning: false, + failOnError: false, + configFile: 'eslintrc.json' + }, + context: '/' + } + }) + ] }; module.exports = config; |