Commit a53c9b8f by Ari Rizzitano

naming is hard

parent 996a9434
coverage/* coverage/*
dist
node_modules node_modules
static
themeable
...@@ -4,5 +4,5 @@ node_modules ...@@ -4,5 +4,5 @@ node_modules
npm-debug.log npm-debug.log
coverage coverage
jest* jest*
dist static
scoped themeable
...@@ -2,8 +2,8 @@ const path = require('path'); ...@@ -2,8 +2,8 @@ const path = require('path');
const merge = require('webpack-merge'); const merge = require('webpack-merge');
const MinifyPlugin = require('babel-minify-webpack-plugin'); const MinifyPlugin = require('babel-minify-webpack-plugin');
const scopedConfig = require('./webpack.scoped.config'); const staticConfig = require('./webpack.static.config');
const unscopedConfig = require('./webpack.unscoped.config'); const themeableConfig = require('./webpack.themeable.config');
const commonConfig = { const commonConfig = {
// 'source-map' raises errors (something about the combination) // 'source-map' raises errors (something about the combination)
...@@ -63,6 +63,6 @@ const commonConfig = { ...@@ -63,6 +63,6 @@ const commonConfig = {
}; };
module.exports = [ module.exports = [
merge(commonConfig, scopedConfig), merge(commonConfig, staticConfig),
merge(commonConfig, unscopedConfig), merge(commonConfig, themeableConfig),
]; ];
...@@ -3,12 +3,12 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); ...@@ -3,12 +3,12 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = { module.exports = {
output: { output: {
filename: 'scoped/index.js', filename: 'static/index.js',
library: 'paragon', library: 'paragon',
libraryTarget: 'umd', libraryTarget: 'umd',
}, },
plugins: [ plugins: [
new ExtractTextPlugin('scoped/paragon.min.css'), new ExtractTextPlugin('static/paragon.min.css'),
], ],
module: { module: {
rules: [ rules: [
...@@ -42,7 +42,7 @@ module.exports = { ...@@ -42,7 +42,7 @@ module.exports = {
test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/, test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
loader: 'file-loader', loader: 'file-loader',
options: { options: {
outputPath: 'scoped/', outputPath: 'static/',
}, },
}, },
], ],
......
...@@ -3,12 +3,12 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin'); ...@@ -3,12 +3,12 @@ const ExtractTextPlugin = require('extract-text-webpack-plugin');
module.exports = { module.exports = {
output: { output: {
filename: 'dist/paragon.min.js', filename: 'themeable/paragon.min.js',
library: 'paragon', library: 'paragon',
libraryTarget: 'umd', libraryTarget: 'umd',
}, },
plugins: [ plugins: [
new ExtractTextPlugin('dist/paragon.min.css'), new ExtractTextPlugin('themeable/paragon.min.css'),
], ],
module: { module: {
rules: [ rules: [
...@@ -40,7 +40,7 @@ module.exports = { ...@@ -40,7 +40,7 @@ module.exports = {
test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/, test: /\.(woff2?|ttf|svg|eot)(\?v=\d+\.\d+\.\d+)?$/,
loader: 'file-loader', loader: 'file-loader',
options: { options: {
outputPath: 'dist/', outputPath: 'themeable/',
}, },
}, },
], ],
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"name": "@edx/paragon", "name": "@edx/paragon",
"version": "0.0.0-development", "version": "0.0.0-development",
"description": "Accessible, responsive UI component library based on Bootstrap.", "description": "Accessible, responsive UI component library based on Bootstrap.",
"main": "dist/paragon.min.js", "main": "themeable/paragon.min.js",
"license": "MIT", "license": "MIT",
"repository": { "repository": {
"type": "git", "type": "git",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment