Commit 5de5e5e

committed

get tests running

We had to pin the `colors` library (used by live-server)because the author wilfully broke it to disrupt millions of users. Marak/colors.js#285

1 parent badcf91 commit 5de5e5eCopy full SHA for 5de5e5e

File tree

+10636

-15225

lines changed

+10636

-15225

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,12 @@ WORKDIR /app`
`3`	`3`	`COPY . .`
`4`	`4`	`RUN rm package-lock.json`
`5`	`5`	`RUN npm install`
`6`		`-RUN npx playwright install`
	`6`	`+RUN npx playwright install`
	`7`	`+`
	`8`	`+RUN npm install jsdom --no-save`
	`9`	`+RUN rm -rf node_modules/jest-environment-jsdom/node_modules/jsdom/`
	`10`	`+RUN mv node_modules/jsdom node_modules/jest-environment-jsdom/node_modules/jsdom`
	`11`	`+`
`7`	`12`	`RUN npm run build`
`8`	`13`	`ENTRYPOINT ["npm", "run"]`
`9`		`-CMD ["test"]`
	`14`	`+CMD ["test"]`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,6 @@`
`1`	`1`	`module.exports = {`
`2`	`2`	`presets: [`
`3`		`- [`
`4`		`- '@babel/preset-env',`
`5`		`- {`
`6`		`- targets: {`
`7`		`- node: 'current',`
`8`		`- },`
`9`		`- },`
`10`		`- ],`
	`3`	`+ ['babel-preset-solid', { generate: 'dom', hydratable: true }],`
	`4`	`+ ['@babel/preset-env', { targets: { node: 'current' } }],`
`11`	`5`	`],`
`12`	`6`	`};`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`var rollup = require('rollup')`
`2`	`2`	`var babel = require('@rollup/plugin-babel').default`
`3`		`-var async = require('rollup-plugin-async')`
`4`	`3`	`var replace = require('@rollup/plugin-replace')`
`5`	`4`
`6`	`5`	`rollup`
`7`	`6`	`.rollup({`
`8`	`7`	`input: 'packages/docsify-server-renderer/index.js',`
`9`	`8`	`plugins: [`
`10`		`- async(),`
`11`	`9`	`replace({`
`12`	`10`	`__VERSION__: process.env.VERSION \|\| require('../package.json').version,`
`13`	`11`	`'process.env.SSR': true`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ module.exports = {`
`20`	`20`	`// Unit Tests (Jest)`
`21`	`21`	`{`
`22`	`22`	`...sharedConfig,`
	`23`	`+ preset: 'solid-jest/preset/browser',`
`23`	`24`	`displayName: 'unit',`
`24`	`25`	`setupFilesAfterEnv: ['<rootDir>/test/config/jest.setup-tests.js'],`
`25`	`26`	`testMatch: ['<rootDir>/test/unit/*.test.js'],`
`@@ -28,6 +29,7 @@ module.exports = {`
`28`	`29`	`// Integration Tests (Jest)`
`29`	`30`	`{`
`30`	`31`	`...sharedConfig,`
	`32`	`+ preset: 'solid-jest/preset/browser',`
`31`	`33`	`displayName: 'integration',`
`32`	`34`	`setupFilesAfterEnv: ['<rootDir>/test/config/jest.setup-tests.js'],`
`33`	`35`	`testMatch: ['<rootDir>/test/integration/*.test.js'],`

Comments

(0)