IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Make sure grafana/e2e cypress config file is in correct location (#54588)

Browse Source 
* fix(grafana-e2e): make sure cypress can find config file

* chore(yarn): refresh lock file
This commit is contained in:
Jack Westbrook
2022-09-02 10:37:50 +02:00
committed by GitHub
parent 5e4fd94413
commit 4179f94959
3 changed files with 17 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/grafana-e2e/package.json
View File

@@ -17,23 +17,22 @@
},
"main": "src/index.ts",
"types": "src/index.ts",
"publishConfig": {
"main": "dist/index.js",
"module": "dist/esm/index.js",
"types": "dist/index.d.ts",
"bin": {
"grafana-e2e": "dist/bin/grafana-e2e.js"
},
"access": "public"
},
"files": [
"dist",
"CHANGELOG.md",
"LICENSE_APACHE2"
],
"bin": {
"grafana-e2e": "bin/grafana-e2e.js"
},
"publishConfig": {
"main": "dist/index.js",
"types": "dist/index.d.ts",
"access": "public"
},
"files": [
"cypress",
"dist",
"cli.js",
"cypress.json",
"CHANGELOG.md",
"LICENSE_APACHE2"
],
"scripts": {
"build": "tsc -p ./tsconfig.build.json && rollup -c rollup.config.ts",
"bundle": "rollup -c rollup.config.ts",
@@ -52,7 +51,6 @@
"@types/uuid": "8.3.4",
"esbuild": "^0.14.47",
"rollup": "2.77.2",
"rollup-plugin-copy": "3.4.0",
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-esbuild": "^4.9.1",
"rollup-plugin-node-externals": "^4.1.0",

16
packages/grafana-e2e/rollup.config.ts
View File

@@ -1,6 +1,5 @@
import resolve from '@rollup/plugin-node-resolve';
import path from 'path';
import copy from 'rollup-plugin-copy';
import dts from 'rollup-plugin-dts';
import esbuild from 'rollup-plugin-esbuild';
import { externals } from 'rollup-plugin-node-externals';
@@ -10,20 +9,7 @@ const pkg = require('./package.json');
export default [
{
input: 'src/index.ts',
plugins: [
copy({
flatten: false,
targets: [
{ src: 'bin/**/*.*', dest: 'dist/bin/' },
{ src: 'cli.js', dest: 'dist/' },
{ src: 'cypress.json', dest: 'dist/' },
{ src: 'cypress/**/*.*', dest: 'dist/cypress/' },
],
}),
externals({ deps: true, packagePath: './package.json' }),
resolve(),
esbuild({ target: 'node16' }),
],
plugins: [externals({ deps: true, packagePath: './package.json' }), resolve(), esbuild({ target: 'node16' })],
output: [
{
format: 'cjs',

63
yarn.lock
View File

@@ -4895,7 +4895,6 @@ __metadata:
resolve-as-bin: 2.1.0
rimraf: 3.0.2
rollup: 2.77.2
rollup-plugin-copy: 3.4.0
rollup-plugin-dts: ^4.2.2
rollup-plugin-esbuild: ^4.9.1
rollup-plugin-node-externals: ^4.1.0
@@ -10988,15 +10987,6 @@ __metadata:
languageName: node
linkType: hard
"@types/fs-extra@npm:^8.0.1":
version: 8.1.2
resolution: "@types/fs-extra@npm:8.1.2"
dependencies:
"@types/node": "*"
checksum: 7277198ded9caea5750c82e569ba1e6fbac28cdb4a95e5d52d24e7c4c2ac90bf45fbe89e08fc21de8f9d3c9b302e30680566eb04e460c30ceac66ad24c161b37
languageName: node
linkType: hard
"@types/fs-extra@npm:^9.0.13":
version: 9.0.13
resolution: "@types/fs-extra@npm:9.0.13"
@@ -15985,7 +15975,7 @@ __metadata:
languageName: node
linkType: hard
"colorette@npm:^1.1.0, colorette@npm:^1.2.2":
"colorette@npm:^1.2.2":
version: 1.4.0
resolution: "colorette@npm:1.4.0"
checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3
@@ -20234,7 +20224,7 @@ __metadata:
languageName: node
linkType: hard
"fast-glob@npm:3.2.7, fast-glob@npm:^3.0.3, fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.5":
"fast-glob@npm:3.2.7, fast-glob@npm:^3.1.1, fast-glob@npm:^3.2.5":
version: 3.2.7
resolution: "fast-glob@npm:3.2.7"
dependencies:
@@ -20895,17 +20885,6 @@ __metadata:
languageName: node
linkType: hard
"fs-extra@npm:^8.1.0":
version: 8.1.0
resolution: "fs-extra@npm:8.1.0"
dependencies:
graceful-fs: ^4.2.0
jsonfile: ^4.0.0
universalify: ^0.1.0
checksum: bf44f0e6cea59d5ce071bba4c43ca76d216f89e402dc6285c128abc0902e9b8525135aa808adad72c9d5d218e9f4bcc63962815529ff2f684ad532172a284880
languageName: node
linkType: hard
"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1, fs-extra@npm:^9.1.0":
version: 9.1.0
resolution: "fs-extra@npm:9.1.0"
@@ -21505,22 +21484,6 @@ __metadata:
languageName: node
linkType: hard
"globby@npm:10.0.1":
version: 10.0.1
resolution: "globby@npm:10.0.1"
dependencies:
"@types/glob": ^7.1.1
array-union: ^2.1.0
dir-glob: ^3.0.1
fast-glob: ^3.0.3
glob: ^7.1.3
ignore: ^5.1.1
merge2: ^1.2.3
slash: ^3.0.0
checksum: a16754b93eff58c1070ca9b0a92c69d9d97a184870fbc7dcb1b99a3ff202311ae66dd5662cbec874deaa888d0172024332e14d04d038c23949d5f8e29341dad2
languageName: node
linkType: hard
"globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.0.4":
version: 11.0.4
resolution: "globby@npm:11.0.4"
@@ -22849,7 +22812,7 @@ __metadata:
languageName: node
linkType: hard
"ignore@npm:^5.1.1, ignore@npm:^5.1.4, ignore@npm:^5.1.8":
"ignore@npm:^5.1.4, ignore@npm:^5.1.8":
version: 5.1.8
resolution: "ignore@npm:5.1.8"
checksum: 967abadb61e2cb0e5c5e8c4e1686ab926f91bc1a4680d994b91947d3c65d04c3ae126dcdf67f08e0feeb8ff8407d453e641aeeddcc47a3a3cca359f283cf6121
@@ -23667,13 +23630,6 @@ __metadata:
languageName: node
linkType: hard
"is-plain-object@npm:^3.0.0":
version: 3.0.1
resolution: "is-plain-object@npm:3.0.1"
checksum: d13fe75db350d4ac669595cdfe0242ae87fcecddf2bca858d2dd443a6ed6eb1f69951fac8c2fa85b16106c6b0d7738fea86c2aca2ecee7fd61de15c1574f2cc5
languageName: node
linkType: hard
"is-potential-custom-element-name@npm:^1.0.1":
version: 1.0.1
resolution: "is-potential-custom-element-name@npm:1.0.1"
@@ -33366,19 +33322,6 @@ __metadata:
languageName: node
linkType: hard
"rollup-plugin-copy@npm:3.4.0":
version: 3.4.0
resolution: "rollup-plugin-copy@npm:3.4.0"
dependencies:
"@types/fs-extra": ^8.0.1
colorette: ^1.1.0
fs-extra: ^8.1.0
globby: 10.0.1
is-plain-object: ^3.0.0
checksum: 6eed5b2498fbe44d694f65ae9a9287b13a606b98a232b5a144a94140e8631efae5f5953b573ba68bf2dc59ab11c223ad3ea6f6cd15b51f42287f4bcc234f0e8b
languageName: node
linkType: hard
"rollup-plugin-dts@npm:^4.2.2":
version: 4.2.2
resolution: "rollup-plugin-dts@npm:4.2.2"