Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch laravel mix to vite #423

Merged
merged 11 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ module.exports = {
'plugin:import/errors',
'plugin:import/typescript',
],
globals: {
Lang: 'readonly',
TSMLReactConfig: 'readonly',
Translation: 'readonly',
},
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i could not get jest to recognize the global types defined in index.d.ts so they're no longer global - also TSMLReactConfig got renamed to Settings

'overrides': [
{
'env': {
Expand Down
23 changes: 21 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
/node_modules
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
mix-manifest.json
npm-debug.log
coverage
Expand All @@ -7,4 +21,9 @@ playwright-report/
public/custom
.vscode
.DS_Store
.idea
.idea
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
7 changes: 0 additions & 7 deletions babel.config.js

This file was deleted.

28 changes: 28 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import js from '@eslint/js'
import globals from 'globals'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'
import tseslint from 'typescript-eslint'

export default tseslint.config(
{ ignores: ['dist'] },
{
extends: [js.configs.recommended, ...tseslint.configs.recommended],
files: ['**/*.{ts,tsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
},
plugins: {
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...reactHooks.configs.recommended.rules,
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
)
2 changes: 1 addition & 1 deletion public/tests/aasanjose.html → example.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@
: {},
};
</script>
<script src="/app.js" async></script>
<script src="/src/app.tsx" type="module" async></script>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is just the example - the actual embed codes haven't changed

</body>
</html>
File renamed without changes.
14 changes: 0 additions & 14 deletions jest.config.js

This file was deleted.

19 changes: 19 additions & 0 deletions jest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
export default {
preset: 'ts-jest',
testEnvironment: 'jest-environment-jsdom',
transform: {
'^.+\\.tsx?$': 'ts-jest',
// process `*.tsx` files with `ts-jest`
},
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
collectCoverageFrom: [
'<rootDir>/src/**/*.(j|t)s*',
'!<rootDir>/src/(types|i18n)/*',
'!<rootDir>/**/__snapshots__/*',
'!<rootDir>/src/**/index.ts',
],
moduleNameMapper: {
'\\.(css)$': '<rootDir>/test/__mocks__/styleMock.js',
'\\.(gif|ttf|eot|svg|png)$': '<rootDir>/test/__mocks__/fileMock.js',
},
};
24 changes: 0 additions & 24 deletions jest.setup.js

This file was deleted.

39 changes: 39 additions & 0 deletions jest.setup.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import '@testing-library/jest-dom';
import React from 'react';

global.React = React;

const savedLocation = window.location;
const savedHistory = window.history;

beforeEach(() => {
Object.defineProperties(window, {
ga: {
value: jest.fn(),
writable: true,
},
gtag: {
value: jest.fn(),
writable: true,
},
history: {
value: {
back: jest.fn(),
forward: jest.fn(),
go: jest.fn(),
pushState: jest.fn(),
replaceState: jest.fn(),
},
writable: true,
},
location: {
value: new URL('https://test.com'),
writable: true,
},
});
});

afterEach(() => {
window.location = savedLocation;
window.history = savedHistory;
});
4 changes: 2 additions & 2 deletions netlify.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build]
publish = "public/"
command = "npx mix --production"
publish = "dist/"
command = "npm run build"

Loading
Loading