Skip to content

Commit

Permalink
Merge pull request #732 from open-formulieren/chore/prepare-for-vite-…
Browse files Browse the repository at this point in the history
…switch

Cleanup: prepare to switch from CRA to Vite
  • Loading branch information
sergei-maertens authored Nov 17, 2024
2 parents 3fe8367 + bd02c25 commit 5a418c4
Show file tree
Hide file tree
Showing 290 changed files with 50 additions and 48 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@
da2e122014505a98100a4aa1eaece3cfb3801d01
# Added prettier for MDX
f9cc5c1e174ee56c806c3fb39a28ac9d1f9f5b32
# Renamed from .js to .jsx
22519e9605414212773bc25d63e894319835c01a
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions src/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Note: the styles here are only relevant in dev mode with `npm start`
@import '~microscope-sass/lib/color';
@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/color';
@import 'microscope-sass/lib/responsive';
@import 'scss/settings';

// Only for dev with 'npm start'!
Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_card.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_co-sign.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_columns.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:math';

@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/responsive';

$col-sizes: 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12;
$col-sizes--mobile: 1, 2, 3, 4;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_content.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'microscope-sass/lib/bem';
@use './anchor';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_data-list.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/responsive';

@mixin component-type-overrides($component-type) {
.utrecht-data-list__item-key {
Expand Down
8 changes: 4 additions & 4 deletions src/scss/components/_deprecated-select.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@use 'sass:math';

@import '~microscope-sass/lib/color';
@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/transform';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/color';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/transform';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
10 changes: 5 additions & 5 deletions src/scss/components/_fa-icon.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
@use 'sass:math';

@import '~@fortawesome/fontawesome-free/scss/fontawesome';
@import '~@fortawesome/fontawesome-free/scss/brands';
@import '~@fortawesome/fontawesome-free/scss/regular';
@import '~@fortawesome/fontawesome-free/scss/solid';
@import '~microscope-sass/lib/typography';
@import '@fortawesome/fontawesome-free/scss/fontawesome';
@import '@fortawesome/fontawesome-free/scss/brands';
@import '@fortawesome/fontawesome-free/scss/regular';
@import '@fortawesome/fontawesome-free/scss/solid';
@import 'microscope-sass/lib/typography';

.fa-icon {
vertical-align: middle;
Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_fieldset.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~microscope-sass/lib/typography';
@import '~microscope-sass/lib/color';
@import 'microscope-sass/lib/typography';
@import 'microscope-sass/lib/color';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_file-upload.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ we don't have strict BEM naming here.
@use 'sass:math';
@use './anchor';

@import '~microscope-sass/lib/typography';
@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/typography';
@import 'microscope-sass/lib/responsive';

@import '../mixins/prefix';
@import '../mixins/bootstrap';
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_formio-component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@use '@utrecht/components/form-field/css/mixin' as form-field;
@use '@utrecht/components/form-fieldset/css/mixin' as form-fieldset;

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_language-selection.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '@utrecht/components/dist/alternate-lang-nav/css/index.css';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@import '@utrecht/components/dist/unordered-list/css/index';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
6 changes: 3 additions & 3 deletions src/scss/components/_login-button-logo.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use '~microscope-sass/lib/bem';
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/responsive';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_login-button.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'sass:math';

@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/responsive';

.openforms-login-button {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_login-options.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_multi-value-row.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~microscope-sass/lib/color';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/color';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_multi-value-table.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~microscope-sass/lib/color';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/color';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_price.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '~microscope-sass/lib/color';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/color';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
6 changes: 3 additions & 3 deletions src/scss/components/_react-modal.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@use 'sass:math' as math;

@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/typography';
@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/typography';
@import 'microscope-sass/lib/responsive';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_signature.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

.signature-pad-body {
@include margin(auto, $value-mobile: 0.5em);
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_soft-required-errors.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/typography';

.openforms-soft-required-errors {
// apply all wysiwyg styling
Expand Down
2 changes: 1 addition & 1 deletion src/scss/components/_summary.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/responsive';
@import 'microscope-sass/lib/responsive';

/**
* Open Forms extension for summary page context.
Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_toolbar.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use 'microscope-sass/lib/bem';

@import '~microscope-sass/lib/responsive';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/responsive';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
4 changes: 2 additions & 2 deletions src/scss/components/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@use 'microscope-sass/lib/bem';
@use './anchor';

@import '~microscope-sass/lib/grid';
@import '~microscope-sass/lib/typography';
@import 'microscope-sass/lib/grid';
@import 'microscope-sass/lib/typography';

@import '../mixins/prefix';

Expand Down
2 changes: 1 addition & 1 deletion src/scss/mixins/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use 'sass:math';

@import '~microscope-sass/lib/grid';
@import 'microscope-sass/lib/grid';

$bootstrap-ratio-mobile: math.div(12, $grid-columns-mobile);
$bootstrap-ratio-tablet: math.div(12, $grid-columns-tablet);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/sdk.spec.js → src/sdk.spec.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {BASE_URL, buildForm, mockAnalyticsToolConfigGet, mockFormGet} from 'api-
import mswServer from 'api-mocks/msw-server';
import {mockFormioTranslations, mockLanguageInfoGet} from 'components/LanguageSelection/mocks';

import {OpenForm} from './sdk.js';
import {OpenForm} from './sdk';

// scrollIntoView is not supported in Jest
let scrollIntoViewMock = jest.fn();
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 5a418c4

Please sign in to comment.