Skip to content

Swapping to SWC, Updating to M1 MacOS, and updating dependencies #529

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 7, 2023
Merged

Swapping to SWC, Updating to M1 MacOS, and updating dependencies #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69a40b9
test: swap from `ts-jest` and `babel-jest` for `@swc/jest`
CMCDragonkai Sep 26, 2022
ac6f4a0
ci: updating macos CI runner
tegefaulkes Jul 7, 2023
68da4b1
dep: updating `matrixai` dependencies
tegefaulkes Jul 7, 2023
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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,8 @@ integration:linux:
- job: integration:deployment
optional: true
tags:
- shared-macos-amd64
image: macos-11-xcode-12
- saas-macos-medium-m1
image: macos-12-xcode-14
script:
- for f in ./builds/*-macos-x64*; do "$f"; done
rules:
Expand Down
3 changes: 0 additions & 3 deletions babel.config.js
View file
Open in desktop

This file was deleted.

21 changes: 15 additions & 6 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ const moduleNameMapper = pathsToModuleNameMapper(compilerOptions.paths, {
prefix: '<rootDir>/src/',
});

// using panva/jose with jest requires subpath exports
// https://github.com/panva/jose/discussions/105
moduleNameMapper['^jose/(.*)$'] = "<rootDir>/node_modules/jose/dist/node/cjs/$1";

// Global variables that are shared across the jest worker pool
// These variables must be static and serializable
if ((process.env.PK_TEST_PLATFORM != null) !== (process.env.PK_TEST_COMMAND != null)) throw Error('Both PK_TEST_PLATFORM and PK_TEST_COMMAND must be set together.')
Expand Down Expand Up @@ -50,8 +46,21 @@ module.exports = {
roots: ['<rootDir>/tests'],
testMatch: ['**/?(*.)+(spec|test|unit.test).+(ts|tsx|js|jsx)'],
transform: {
'^.+\\.tsx?$': 'ts-jest',
'^.+\\.jsx?$': 'babel-jest',
"^.+\\.(t|j)sx?$": [
"@swc/jest",
{
"jsc": {
"parser": {
"syntax": "typescript",
"dynamicImport": true,
"tsx": true,
"decorators": compilerOptions.experimentalDecorators,
},
"target": compilerOptions.target.toLowerCase(),
"keepClassNames": true,
},
}
],
},
reporters: [
'default',
Expand Down
Loading