Skip to content

Commit 221ac67

Browse files
authored
Fix/remove fonts (#30)
* Removed inter fonts * Made font names lowercase * Changed variables to default, added iconpath variable * Moved copying fonts to gulp
1 parent 308ebb7 commit 221ac67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2983
-4383
lines changed

gulpfile.js

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,41 @@ const gulp = require('gulp');
44
const sass = require('gulp-sass');
55
sass.compiler = require('sass');
66
const rename = require('gulp-rename');
7-
const ts = require('gulp-typescript');
87

9-
const buildSass = async () => {
8+
const buildCss = async () => {
109
return await gulp.src('./src/style/index.scss')
1110
.pipe(sass().on('error', sass.logError))
12-
.pipe(gulp.dest('./dist/style'));
11+
.pipe(gulp.dest('./dist/css'));
1312
}
1413

15-
gulp.task('sass', buildSass);
14+
gulp.task('css:build', buildCss);
1615

17-
const buildSassMin = async () => {
16+
const copySass = async () => {
17+
return await gulp.src('./src/style/**/*.scss')
18+
.pipe(gulp.dest('./dist/scss'))
19+
}
20+
21+
gulp.task('sass:copy', copySass);
22+
23+
const buildCssMin = async () => {
1824
return await gulp.src('./src/style/index.scss')
1925
.pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
2026
.pipe(rename('index.min.css'))
21-
.pipe(gulp.dest('./dist/style'));
27+
.pipe(gulp.dest('./dist/css'));
28+
}
29+
30+
gulp.task('css:build:min', buildCssMin);
31+
32+
const copyIcons = async () => {
33+
return await gulp.src('./src/icons/*')
34+
.pipe(gulp.dest('./dist/icons'))
2235
}
2336

24-
gulp.task('sass:min', buildSassMin);
37+
gulp.task('icons:copy', copyIcons);
2538

26-
gulp.task('default', gulp.series('sass', 'sass:min'));
39+
gulp.task('default', gulp.series(
40+
'css:build',
41+
'css:build:min',
42+
'sass:copy',
43+
'icons:copy'
44+
));

package-lock.json

Lines changed: 2893 additions & 1072 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"types": "dist/index.d.ts",
77
"typings": "dist/index.d.ts",
88
"scripts": {
9-
"build:css": "rimraf scss && cp -r ./src/style scss && gulp",
9+
"build:css": "gulp",
1010
"build:js": "tsc -p tsconfig-build.json",
1111
"build": "rimraf dist && npm run build:js && npm run build:css",
1212
"test": "jest --config=jest.config.json",
@@ -17,23 +17,23 @@
1717
"license": "ISC",
1818
"repository": "https://github.com/coderan-io/ui",
1919
"devDependencies": {
20-
"@babel/plugin-proposal-class-properties": "^7.10.4",
21-
"@babel/preset-env": "^7.11.0",
22-
"@babel/preset-react": "^7.10.4",
23-
"@babel/preset-typescript": "^7.10.4",
20+
"@babel/plugin-proposal-class-properties": "^7.13.0",
21+
"@babel/preset-env": "^7.13.8",
22+
"@babel/preset-react": "^7.12.13",
23+
"@babel/preset-typescript": "^7.13.0",
2424
"@types/enzyme": "^3.10.8",
2525
"@types/enzyme-adapter-react-16": "^1.0.6",
26-
"@types/react": "^16.9.55",
27-
"@types/react-dom": "^16.9.9",
28-
"@typescript-eslint/eslint-plugin": "^4.6.1",
29-
"@typescript-eslint/parser": "^4.6.1",
26+
"@types/react": "^16.14.4",
27+
"@types/react-dom": "^16.9.11",
28+
"@typescript-eslint/eslint-plugin": "^4.15.2",
29+
"@typescript-eslint/parser": "^4.15.2",
3030
"babel-loader": "^8.2.2",
3131
"css-loader": "^5.1.0",
3232
"dotenv": "^8.2.0",
3333
"enzyme": "^3.11.0",
34-
"enzyme-adapter-react-16": "^1.15.3",
35-
"eslint": "^7.12.1",
36-
"eslint-plugin-react": "^7.20.6",
34+
"enzyme-adapter-react-16": "^1.15.6",
35+
"eslint": "^7.21.0",
36+
"eslint-plugin-react": "^7.22.0",
3737
"file-loader": "^6.2.0",
3838
"gulp": "^4.0.2",
3939
"gulp-rename": "^2.0.0",
@@ -46,16 +46,17 @@
4646
"sass": "^1.32.8",
4747
"sass-loader": "^11.0.1",
4848
"style-loader": "^2.0.0",
49-
"typescript": "^4.0.5",
49+
"typescript": "^4.2.2",
5050
"webpack": "^5.24.2",
5151
"webpack-cli": "^4.5.0",
5252
"webpack-dev-server": "^3.11.2",
5353
"webpack-manifest-plugin": "^3.0.0"
5454
},
5555
"dependencies": {
56-
"@popperjs/core": "^2.6.0",
56+
"@popperjs/core": "^2.8.6",
57+
"bootstrap": "^4.6.0",
5758
"clsx": "^1.1.1",
58-
"framer-motion": "^3.1.1",
59+
"framer-motion": "^3.7.0",
5960
"prop-types": "^15.7.2",
6061
"react": "^16.14.0"
6162
},

src/fonts/inter/inter-v2-latin-100.eot

Whitespace-only changes.

src/fonts/inter/inter-v2-latin-100.svg

Lines changed: 0 additions & 349 deletions
This file was deleted.
-44.6 KB
Binary file not shown.

src/fonts/inter/inter-v2-latin-100.woff

Whitespace-only changes.

src/fonts/inter/inter-v2-latin-100.woff2

Whitespace-only changes.

src/fonts/inter/inter-v2-latin-200.eot

Whitespace-only changes.

src/fonts/inter/inter-v2-latin-200.svg

Lines changed: 0 additions & 350 deletions
This file was deleted.

0 commit comments

Comments
 (0)