Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore/upgrade greenwood v0.31.0 #73

Merged
merged 5 commits into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

220 changes: 0 additions & 220 deletions .eslintrc.cjs

This file was deleted.

11 changes: 0 additions & 11 deletions .github/workflows/chromium-lib-install.sh

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/ci-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ jobs:

strategy:
matrix:
node: [18]
node: [22]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Installing project dependencies
run: |
yarn install --frozen-lockfile
npm ci
- name: Lint
run: |
yarn lint
npm run lint
- name: Build
run: |
yarn clean && yarn build:win
npm run build:win
17 changes: 7 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,24 @@ on: [pull_request]
jobs:

build:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

strategy:
matrix:
node: [18]
node: [22]

steps:
- uses: actions/checkout@v2
- name: Install Chromium Library Dependencies
run: |
sh ./.github/workflows/chromium-lib-install.sh
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- name: Installing project dependencies
run: |
yarn install --frozen-lockfile
npm ci
- name: Lint
run: |
yarn lint
npm run lint
- name: Build
run: |
yarn clean && yarn build
npm run build
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.20.2
22.13.0
35 changes: 35 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import js from "@eslint/js";
import globals from "globals";

export default [
{
// https://github.com/eslint/eslint/discussions/18304#discussioncomment-9069706
ignores: [
".greenwood/*",
"node_modules/*",
"public/*",
"reports/*",
"storybook-static/**",
"patches/**",
],
},
{
languageOptions: {
parserOptions: {
ecmaVersion: 2022,
sourceType: "module",
},
globals: {
...globals.browser,
...globals.mocha,
...globals.chai,
...globals.node,
},
},
rules: {
...js.configs.recommended.rules,
// turn this off for Prettier
"no-irregular-whitespace": "off"
},
},
];
1 change: 0 additions & 1 deletion greenwood.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ class MyThemePackDevelopmentResource extends ResourceInterface {
}

async shouldResolve(url) {
// eslint-disable-next-line no-underscore-dangle
return process.env.__GWD_COMMAND__ === 'develop' && url.pathname.indexOf(`/node_modules/${packageName}/`) >= 0;
}

Expand Down
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class GraphJsonResolverLoader extends ResourceInterface {
}

shouldResolve(url) {
return url.pathname === '/graph.json' && process.env.__GWD_COMMAND__ === 'develop'; // eslint-disable-line no-underscore-dangle
return url.pathname === '/graph.json' && process.env.__GWD_COMMAND__ === 'develop';
}

resolve() {
Expand All @@ -21,7 +21,7 @@ const greenwoodThemeStarterPresentation = (options = {}) => [{
type: 'context',
name: `${packageJson.name}:context`,
provider: (compilation) => {
const layoutsLocation = options.__isDevelopment // eslint-disable-line no-underscore-dangle
const layoutsLocation = options.__isDevelopment
? new URL('./templates/', compilation.context.userWorkspace)
: new URL('./dist/templates/', import.meta.url);

Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
skip_processing = true

[build.environment]
NODE_VERSION = "18.12.1"
NODE_VERSION = "22.x"
Loading
Loading