Skip to content

Commit 3dffcb4

Browse files
committed
fix(css): removed css modules and use with regular scss to increase customizability
1 parent aa002ce commit 3dffcb4

File tree

7 files changed

+35
-77
lines changed

7 files changed

+35
-77
lines changed

.npmignore

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1-
src/assets
1+
node_modules
2+
tests
3+
.docz
4+
.github
5+
.storybook
6+
.vscode
7+
config
8+
assets
9+
examples
10+
lib
11+
scripts
12+
*.stories.js
13+
*-story.js
14+
*.snap
15+
*-test.js
16+
*.tgz
17+
*.md
18+
.cfignore
19+
.editorconfig
20+
.eslintrc
21+
.prettierignore
22+
.watchmanconfig
23+
storybook-static
24+
jest-test-results.json

package.json

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "1.5.0",
44
"description": "WFP UI Kit Next",
55
"license": "Apache-2",
6-
"main": "dist/index.js",
6+
"main": "dist/bundle.js",
77
"main:scss": "source/globals/styles.scss",
8-
"module": "es/index.js",
8+
"module": "src/index.js",
99
"sideEffects": false,
1010
"scripts": {
1111
"build:legacy": "node scripts/build.js && yarn build:css && yarn build:cssmin",
1212
"build:storybook": "rm -r -f docs && build-storybook -s ./src/assets -o docs",
13-
"build": "webpack --mode production",
13+
"build": "webpack --mode development",
1414
"ci-check": "yarn prettier:diff && yarn lint && yarn test --runInBand && yarn test-ssr",
1515
"build:cssmin": "node-sass ./src/globals/scss/styles.scss ./assets/css/styles.min.css --output-style compressed && postcss ./assets/css/styles.min.css --no-map -u autoprefixer -rs",
1616
"build:css": "node-sass ./src/globals/scss -o ./assets/css --output-style compressed --source-map true && postcss ./assets/css/styles.css -d ./assets/css/ --use autoprefixer",
@@ -42,13 +42,6 @@
4242
"ui-kit",
4343
"components"
4444
],
45-
"files": [
46-
"lib/**/*",
47-
"es/**/*",
48-
"umd/**/*",
49-
"source/**/*",
50-
"assets/**/*"
51-
],
5245
"eslintConfig": {
5346
"parser": "babel-eslint",
5447
"extends": [

src/components/TextInput/TextInput.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import classNames from 'classnames';
44
import settings from '../../globals/js/settings';
55
import FormItem from '../FormItem';
66
import Input from '../Input/Input';
7-
import styles from './text-input.module.scss';
87

98
const { prefix } = settings;
109

@@ -34,7 +33,6 @@ const TextInput = (props) => {
3433
[`${prefix}--text--light`]: light,
3534
[`${prefix}--text--helpertext`]: helperText,
3635
[`${prefix}--text--nolabel`]: hideLabel,
37-
[styles.text]: true,
3836
});
3937

4038
const newProps = {

src/components/TextInput/text-input.module.scss renamed to src/components/TextInput/_text-input.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@import '../Form/form';
1313

1414
@include exports('text-input') {
15-
.text input {
15+
.#{$prefix}--text input {
1616
@include typescale('zeta');
1717
@include font-family;
1818
@include input-base;

src/globals/scss/styles.scss

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -63,53 +63,28 @@ $deprecations--message: 'Deprecated code was found, this code will be removed be
6363
@import '../../components/InfoBar/info-bar';
6464
@import '../../components/Input/input';
6565
@import '../../components/Checkbox/checkbox.scss';
66-
/*
67-
@import '../../components/combo-box/combo-box';
68-
*/
6966
@import '../../components/RadioButton/radio-button';
7067
@import '../../components/Toggle/toggle.scss';
7168
@import '../../components/Search/search.scss';
7269
@import '../../components/Select/select.scss';
7370
@import '../../components/ReactDropzone/react-dropzone.scss';
7471
@import '../../components/ReactSelect/react-select.scss';
75-
//@import '../../components/TextInput/text-input.scss';
72+
@import '../../components/TextInput/text-input.scss';
7673
@import '../../components/TextArea/text-area.scss';
7774
@import '../../components/NumberInput/number-input.scss';
7875
@import '../../components/Form/form.scss';
7976
@import '../../components/FormGroup/form-group.scss';
8077
@import '../../components/FormHint/form-hint.scss';
81-
8278
//@import '../../components/Link/link';
83-
/*
84-
/*@import '../../components/list-box/list-box';
85-
@import '../../components/list/list';
86-
@import '../../components/data-table/data-table';
87-
@import '../../components/data-table-v2/data-table-v2';
88-
@import '../../components/structured-list/structured-list';
89-
@import '../../components/code-snippet/code-snippet';
90-
@import '../../components/overflow-menu/overflow-menu';
91-
@import '../../components/card/card';
92-
*/
9379
@import '../../components/Card/card';
9480
@import '../../components/ContentSwitcher/content-switcher';
95-
/*
96-
@import '../../components/date-picker/date-picker';
97-
@import '../../components/detail-page-header/detail-page-header';
98-
@import '../../components/dropdown/dropdown';
99-
*/
10081
@import '../../components/List/list';
10182
@import '../../components/Loading/loading';
10283
@import '../../components/Modal/modal';
10384
@import '../../components/Module/module';
10485
@import '../../components/Notification/notification';
10586
@import '../../components/User/user';
10687
@import '../../components/Value/value';
107-
/*
108-
@import '../../components/multi-select/multi-select';
109-
@import '../../components/notification/inline-notification';
110-
@import '../../components/notification/toast-notification';
111-
*/
112-
11388
@import '../../components/InlineLoading/inline-loading';
11489
@import '../../components/StepNavigation/step-navigation';
11590
@import '../../components/StepNavigationItem/step-navigation-item';
@@ -118,15 +93,8 @@ $deprecations--message: 'Deprecated code was found, this code will be removed be
11893
@import '../../components/Tooltip/tooltip';
11994
@import '../../components/Tabs/tabs';
12095
@import '../../components/Tag/tag';
121-
/*@import '../../components/unified-header/unified-header';
122-
@import '../../components/interior-left-nav/interior-left-nav';
123-
*/
124-
@import '../../components/Pagination/pagination';
125-
/*
126-
@import '../../components/accordion/accordion';
127-
@import '../../components/progress-indicator/progress-indicator';
128-
*/
12996

97+
@import '../../components/Pagination/pagination';
13098
@import '../../components/ReadMore/read-more';
13199
@import '../../components/Story/story';
132100
@import '../../components/Breadcrumb/breadcrumb.scss';

src/vendorOnly.js

Whitespace-only changes.

webpack.config.js

Lines changed: 5 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const reControlChars = /[\u0000-\u001f\u0080-\u009f]/g;
1515
const reRelativePath = /^\.+/;
1616
const reFileName = /([^\/]+)(?=\.\w+$)/g;
1717

18-
1918
function getLocalIdent(loaderContext, localIdentName, localName, options) {
2019
if (!options.context) {
2120
// eslint-disable-next-line no-param-reassign
@@ -50,9 +49,11 @@ function getLocalIdent(loaderContext, localIdentName, localName, options) {
5049
return name;
5150
}
5251

53-
module.exports = {
52+
module.exports = ['source-map'].map((devtool) => ({
5453
entry: './src/index.js',
54+
mode: 'development',
5555
output: {
56+
library: '@wfp/ui',
5657
path: path.resolve(__dirname, 'dist'),
5758
filename: 'bundle.js',
5859
},
@@ -97,35 +98,10 @@ module.exports = {
9798
},
9899
require.resolve('sass-loader'),
99100
],
100-
}
101-
/*{
102-
test: /\.scssa$/,
103-
use: [
104-
{
105-
loader: MiniCssExtractPlugin.loader,
106-
options: {
107-
publicPath: '/public/path/to/',
108-
},
109-
},
110-
{
111-
loader: require.resolve('css-loader'),
112-
options: {
113-
importLoaders: 1,
114-
modules: {
115-
mode: 'local',
116-
localIdentName: 'wfp--[name]__[local]',
117-
// localIdentName: '[sha1:hash:hex:4]',
118-
context: path.resolve(__dirname, 'src'),
119-
hashPrefix: 'my-custom-hash',
120-
},
121-
},
122-
},
123-
require.resolve('sass-loader'),
124-
],
125-
},*/
101+
},
126102
],
127103
},
128104
optimization: {
129105
// minimizer: [new UglifyJsPlugin()],
130106
},
131-
};
107+
}));

0 commit comments

Comments
 (0)