Skip to content

Commit

Permalink
Remove Wikit Leftovers (#879)
Browse files Browse the repository at this point in the history
* remove wikit leftovers

* tidy up  indentation
  • Loading branch information
chukarave authored Feb 12, 2024
1 parent 4b2b39c commit c182673
Show file tree
Hide file tree
Showing 6 changed files with 944 additions and 965 deletions.
3 changes: 0 additions & 3 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ module.exports = {
// "import Counter from '@/Counter.vue'"
// (no need for a full path)
"moduleNameMapper": {
'^@wmde/wikit-vue-components$':
'@wmde/wikit-vue-components/dist/wikit-vue-components-vue3compat.common.js',
'^wikit-dist(.*)$': "<rootDir>/node_modules/@wmde/wikit-vue-components/dist$1",
"^@/(.*)$": "<rootDir>/resources/js/$1",
},
// For Vue migration build
Expand Down
1,889 changes: 941 additions & 948 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@
"dependencies": {
"@inertiajs/inertia": "^0.11.0",
"@inertiajs/inertia-vue3": "^0.6.0",
"@wmde/wikit-tokens": "^2.1.0-alpha.15",
"@wmde/wikit-vue-components": "^2.1.0-alpha.16",
"date-fns": "^3.3.1",
"lodash": "^4.17.21",
"pinia": "^2.1.7",
Expand Down
4 changes: 2 additions & 2 deletions resources/js/Components/LoadingOverlay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ $base: '.loading-indicator';
.cdx-progress-bar {
min-width: 432px;
@media (max-width: $width-breakpoint-tablet) {
@media (max-width: $max-width-breakpoint-tablet) {
min-width: 90vw;
}
}
Expand Down
1 change: 0 additions & 1 deletion resources/sass/app.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import 'https://tools-static.wmflabs.org/fontcdn/css2?family=Lato&family=Source+Serif+Pro&display=swap';
@import '~ress';
@import '~wikit-dist/wikit-vue-components-vue3compat.css';
@import "@wikimedia/codex/dist/codex.style.css";
@import "@wikimedia/codex-design-tokens/theme-wikimedia-ui";
@import '../css/custom-variables.css';
Expand Down
10 changes: 1 addition & 9 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,7 @@ const path = require('path');
*/

mix.ts('resources/js/app.ts', 'public/js')
.webpackConfig({
resolve: {
alias: {
'@wmde/wikit-vue-components':
'@wmde/wikit-vue-components/dist/wikit-vue-components-vue3compat.common.js',
'wikit-dist': path.resolve(__dirname, './node_modules/@wmde/wikit-vue-components/dist'),
}
}
})
.webpackConfig({})
.vue({ version: 3})
.sass('resources/sass/app.scss', 'public/css')
.sass('resources/sass/noscript.scss', 'public/css')
Expand Down

0 comments on commit c182673

Please sign in to comment.