Skip to content

Commit

Permalink
Support Node 18 (#249)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinwcyu committed Oct 27, 2023
1 parent 177f8e7 commit 2933157
Show file tree
Hide file tree
Showing 7 changed files with 792 additions and 571 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/detect-breaking-changes.yml
Expand Up @@ -8,10 +8,10 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: "16"
node-version-file: '.nvmrc'
- name: Install dependencies
run: yarn install
- name: Build plugin
run: yarn build
- name: Compatibility check
run: npx @grafana/levitate@latest is-compatible --path src/module.ts --target @grafana/data,@grafana/ui,@grafana/runtime
run: npx @grafana/levitate@latest is-compatible --path src/module.ts --target @grafana/data,@grafana/ui,@grafana/runtime
2 changes: 1 addition & 1 deletion .nvmrc
@@ -1 +1 @@
16
18
4 changes: 2 additions & 2 deletions cypress/integration/smoke.spec.ts
Expand Up @@ -95,8 +95,8 @@ e2e.scenario({

// click run and wait for loading
cy.contains('button', 'Run').click();
cy.get('.panel-loading');
cy.get('.panel-loading', { timeout: 10000 }).should('not.exist');
cy.get('[aria-label="Panel loading bar"]');
cy.get('[aria-label="Panel loading bar"]', { timeout: 10000 }).should('not.exist');

e2eSelectors.QueryEditor.TableView.input().click({ force: true });
// check that the table content contains at least an entry
Expand Down
10 changes: 4 additions & 6 deletions cypress/tsconfig.json
@@ -1,10 +1,8 @@
{
"extends": "@grafana/toolkit/src/config/tsconfig.plugin.json",
"extends": "@grafana/tsconfig",
"compilerOptions": {
"baseUrl": "../node_modules",
"types": [
"cypress",
"@grafana/e2e/cypress/support"
]
"types": ["cypress", "@grafana/e2e/cypress/support"],
"resolveJsonModule": true
}
}
}
2 changes: 1 addition & 1 deletion docker-compose.yaml
Expand Up @@ -6,7 +6,7 @@ services:
build:
context: ./.config
args:
grafana_version: ${GRAFANA_VERSION:-9.1.2}
grafana_version: ${GRAFANA_VERSION:-10.0.0}
ports:
- 3000:3000/tcp
volumes:
Expand Down
13 changes: 8 additions & 5 deletions package.json
Expand Up @@ -30,9 +30,9 @@
"@emotion/css": "^11.1.3",
"@grafana/aws-sdk": "0.1.2",
"@grafana/data": "9.3.2",
"@grafana/e2e": "9.3.2",
"@grafana/e2e-selectors": "9.3.2",
"@grafana/eslint-config": "^2.5.0",
"@grafana/e2e": "10.0.0",
"@grafana/e2e-selectors": "10.0.0",
"@grafana/eslint-config": "^6.0.1",
"@grafana/runtime": "9.3.2",
"@grafana/tsconfig": "^1.2.0-rc1",
"@grafana/ui": "9.3.2",
Expand All @@ -54,7 +54,7 @@
"cypress": "7.7.0",
"eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jsdoc": "^37.7.0",
"eslint-plugin-jsdoc": "^46.7.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.26.1",
"eslint-plugin-react-hooks": "^4.2.0",
Expand All @@ -80,7 +80,10 @@
"webpack-cli": "^4.9.2",
"webpack-livereload-plugin": "^3.0.2"
},
"resolutions": {
"@grafana/e2e-selectors": "10.0.0"
},
"engines": {
"node": ">=14"
"node": ">=18"
}
}
1,328 changes: 774 additions & 554 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 2933157

Please sign in to comment.