Skip to content

Commit

Permalink
upgrade greenwood v0.31.0-alpha.6
Browse files Browse the repository at this point in the history
  • Loading branch information
thescientist13 committed Jan 26, 2025
1 parent 22186f8 commit c8ae4da
Show file tree
Hide file tree
Showing 11 changed files with 878 additions and 2,389 deletions.
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

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

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/ci-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
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
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
Loading

0 comments on commit c8ae4da

Please sign in to comment.