yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup after vite hacks in wtr and remove deprecated packages

Browse Source
This commit is contained in:
Jacob Overgaard
2023-08-02 16:54:48 +02:00
parent 1b499762ae
commit 93a86e47cc
3 changed files with 7 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

@@ -45,7 +45,6 @@
"@typescript-eslint/parser": "^6.1.0",
"@web/dev-server-esbuild": "^0.4.1",
"@web/dev-server-import-maps": "^0.1.1",
"@web/dev-server-rollup": "^0.5.2",
"@web/test-runner": "^0.17.0",
"@web/test-runner-playwright": "^0.10.1",
"babel-loader": "^9.1.3",
@@ -70,7 +69,6 @@
"rollup-plugin-dts": "^5.3.0",
"rollup-plugin-esbuild": "^5.0.0",
"rollup-plugin-import-css": "^3.3.1",
"rollup-plugin-url": "^3.0.1",
"rollup-plugin-web-worker-loader": "^1.6.1",
"storybook": "7.2.0",
"tiny-glob": "^0.2.9",
@@ -18952,23 +18950,6 @@
"rollup": "^2.x.x || ^3.x.x"
}
},
"node_modules/rollup-plugin-url": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/rollup-plugin-url/-/rollup-plugin-url-3.0.1.tgz",
"integrity": "sha512-fQVrxlW335snHfPqZ7a0JIkkYEIrLeFobpAxRMQnyv7xQeJOY1yOd84STIdCaLYPoGzwOq8waOdGipNH181kzg==",
"deprecated": "This module has been deprecated and is no longer maintained. Please use @rollup/plugin-url.",
"dev": true,
"dependencies": {
"mime": "^2.4.4",
"rollup-pluginutils": "^2.8.2"
},
"engines": {
"node": ">=10.0.0"
},
"peerDependencies": {
"rollup": ">=0.60.0"
}
},
"node_modules/rollup-plugin-web-worker-loader": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz",
@@ -18978,21 +18959,6 @@
"rollup": "^1.9.2 || ^2.0.0"
}
},
"node_modules/rollup-pluginutils": {
"version": "2.8.2",
"resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
"integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
"dev": true,
"dependencies": {
"estree-walker": "^0.6.1"
}
},
"node_modules/rollup-pluginutils/node_modules/estree-walker": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
"integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
"dev": true
},
"node_modules/router-slot": {
"version": "2.3.0",
"resolved": "file:router-slot-2.3.0.tgz",

2
src/Umbraco.Web.UI.Client/package.json
View File

@@ -159,7 +159,6 @@
"@typescript-eslint/parser": "^6.1.0",
"@web/dev-server-esbuild": "^0.4.1",
"@web/dev-server-import-maps": "^0.1.1",
"@web/dev-server-rollup": "^0.5.2",
"@web/test-runner": "^0.17.0",
"@web/test-runner-playwright": "^0.10.1",
"babel-loader": "^9.1.3",
@@ -184,7 +183,6 @@
"rollup-plugin-dts": "^5.3.0",
"rollup-plugin-esbuild": "^5.0.0",
"rollup-plugin-import-css": "^3.3.1",
"rollup-plugin-url": "^3.0.1",
"rollup-plugin-web-worker-loader": "^1.6.1",
"storybook": "7.2.0",
"tiny-glob": "^0.2.9",

26
src/Umbraco.Web.UI.Client/web-test-runner.config.mjs
View File

@@ -1,30 +1,18 @@
import { esbuildPlugin } from '@web/dev-server-esbuild';
import { playwrightLauncher } from '@web/test-runner-playwright';
import { importMapsPlugin } from '@web/dev-server-import-maps';
import rollupUrl from 'rollup-plugin-url';
import { fromRollup } from '@web/dev-server-rollup';
const url = fromRollup(rollupUrl);
const mode = process.env.MODE || 'dev';
if (!['dev', 'prod'].includes(mode)) {
throw new Error(`MODE must be "dev" or "prod", was "${mode}"`);
}
/** @type {import('@web/dev-server').DevServerConfig} */
export default {
nodeResolve: true,
files: ['src/**/*.test.ts'],
mimeTypes: {
'./public/**/*': 'js',
},
rootDir: '.',
files: ['./src/**/*.test.ts'],
nodeResolve: { exportConditions: mode === 'dev' ? ['development'] : [] },
plugins: [
{
name: 'resolve-umbraco-and-vite-imports',
// Rewrite Vite's root imports to the public folder
transformImport(args) {
if (args.source.match(/^\/.*?\.(png|gif|jpg|jpeg|svg)$/is)) {
return `/public${args.source}`;
}
},
},
// Serve images from the public folder as JS modules
url({ include: ['public/**/*'] }),
esbuildPlugin({ ts: true, tsconfig: './tsconfig.json', target: 'auto', json: true }),
importMapsPlugin({
inject: {