Skip to content

Commit 17fed4b

Browse files
committed
Maybe really fix dist tests
1 parent 37ca279 commit 17fed4b

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.github/workflows/tests.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,21 @@ jobs:
114114
- name: Erase path aliases
115115
run: sed -i -e /@remap-prod-remove-line/d ./tsconfig.base.json
116116

117-
- name: Run tests, against dist
118-
env:
119-
TEST_DIST: true
120-
run: yarn test
121-
122117
- name: Run type tests with `moduleResolution Bundler`
123118
run: rm -rf dist && yarn tsc -p . --moduleResolution Bundler --module ESNext --noEmit false --declaration --emitDeclarationOnly --outDir dist --target ESNext && rm -rf dist
124119

120+
- name: Ensure there's no dist folder
121+
run: rm -rf dist
122+
123+
- name: Change RTK package name to ensure node_modules is used
124+
run: sed -i -e 's|@reduxjs/toolkit|@reduxjs/toolkit-test|' ./package.json
125+
126+
- name: Run tests, against installed artifact
127+
env:
128+
TEST_DIST: true
129+
working-directory: ./packages/toolkit
130+
run: ../../node_modules/.bin/vitest --run --typecheck
131+
125132
test-types:
126133
name: 'Test Types: TS ${{ matrix.ts }} and React ${{ matrix.react.version }}'
127134

packages/toolkit/vitest.config.mts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,15 @@ const __dirname = path.dirname(__filename)
1010
export default defineConfig({
1111
plugins: [tsconfigPaths({ root: __dirname })],
1212
test: {
13-
alias: process.env.TEST_DIST
14-
? {
15-
'@reduxjs/toolkit': new URL(
16-
'node_modules/@reduxjs/toolkit',
17-
import.meta.url,
18-
).pathname,
19-
}
20-
: undefined,
2113
globals: true,
2214
environment: 'jsdom',
2315
setupFiles: ['./vitest.setup.ts'],
2416
include: ['./src/**/*.(spec|test).[jt]s?(x)'],
25-
server: { deps: { inline: ['redux', '@reduxjs/toolkit'] } },
17+
server: {
18+
deps: {
19+
inline: ['redux', '@reduxjs/toolkit'],
20+
},
21+
},
2622
unstubEnvs: true,
2723
},
28-
resolve: {
29-
mainFields: ['module'],
30-
},
3124
})

0 commit comments

Comments
 (0)