Skip to content

Commit e61636c

Browse files
authored
Upgrade to Next 15 (#245)
* Update all dependencies * update sdks * updates * fix pre-cmmit hok * fix github actions * fix cachis auth token thing, no need for github token for install nix action * fix flake formatteR * fix static export * remove fallback blocking
1 parent 09d359d commit e61636c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+7496
-5206
lines changed

.eslintrc.cjs

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/actions/yarn/action.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@ runs:
1010
using: composite
1111
steps:
1212
# Install Cachix
13-
- uses: cachix/install-nix-action@v17
13+
- uses: cachix/install-nix-action@v30
1414
- name: Setup Cachix
15-
uses: cachix/cachix-action@v10
15+
uses: cachix/cachix-action@v15
1616
with:
1717
name: igm
1818
authToken: ${{ inputs.cachix-auth-token }}
19-
2019
# Install Node
2120
- name: Get yarn cache directory path
2221
id: yarn-cache-dir-path
2322
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
2423
shell: nix develop --command bash {0}
2524
- name: Yarn Cache
26-
uses: actions/cache@v3
25+
uses: actions/cache@v4
2726
with:
2827
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
2928
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build-static:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3.1.0
13+
- uses: actions/checkout@v4
1414
- uses: ./.github/actions/yarn
1515
with:
1616
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -19,7 +19,7 @@ jobs:
1919
lint:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v3.1.0
22+
- uses: actions/checkout@v4
2323
- uses: ./.github/actions/yarn
2424
with:
2525
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}
@@ -28,7 +28,7 @@ jobs:
2828
typecheck:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@v3.1.0
31+
- uses: actions/checkout@v4
3232
- uses: ./.github/actions/yarn
3333
with:
3434
cachix-auth-token: ${{ secrets.CACHIX_AUTH_TOKEN }}

.github/workflows/nix.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,10 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- uses: actions/[email protected]
22-
- uses: cachix/install-nix-action@v17
23-
with:
24-
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
25-
install_options: "--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve"
26-
extra_nix_config: |
27-
experimental-features = nix-command flakes
28-
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
21+
- uses: actions/checkout@v4
22+
- uses: cachix/install-nix-action@v30
2923
- name: Setup Cachix
30-
uses: cachix/cachix-action@v12
24+
uses: cachix/cachix-action@v15
3125
with:
3226
name: igm
3327
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

.husky/pre-commit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
#!/bin/sh
2-
. "$(dirname "$0")/_/husky.sh"
32

43
yarn lint-staged

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.15.0
1+
22

.vscode/settings.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"typescript.tsdk": ".yarn/sdks/typescript/lib",
3+
"eslint.useFlatConfig": true,
34
"files.associations": {
45
"*.md": "mdx"
56
},
6-
"editor.defaultFormatter": "esbenp.prettier-vscode",
7-
"editor.formatOnSave": true,
8-
"editor.codeActionsOnSave": {
9-
"source.fixAll.eslint": true
7+
"eslint.options": {
8+
"cache": true
109
},
10+
"editor.formatOnSave": true,
1111
"search.exclude": {
1212
"**/.yarn": true,
1313
"**/.pnp.*": true
1414
},
1515
"eslint.nodePath": ".yarn/sdks",
16-
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",
16+
"prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
1717
"typescript.enablePromptUseWorkspaceTsdk": true
1818
}

.yarn/releases/yarn-4.0.0-rc.15.cjs

Lines changed: 0 additions & 777 deletions
This file was deleted.

.yarn/releases/yarn-4.5.3.cjs

Lines changed: 934 additions & 0 deletions
Large diffs are not rendered by default.

.yarn/sdks/eslint/bin/eslint.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,32 @@
11
#!/usr/bin/env node
22

33
const {existsSync} = require(`fs`);
4-
const {createRequire} = require(`module`);
4+
const {createRequire, register} = require(`module`);
55
const {resolve} = require(`path`);
6+
const {pathToFileURL} = require(`url`);
67

78
const relPnpApiPath = "../../../../.pnp.cjs";
89

910
const absPnpApiPath = resolve(__dirname, relPnpApiPath);
11+
const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
1012
const absRequire = createRequire(absPnpApiPath);
1113

14+
const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
15+
const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
16+
1217
if (existsSync(absPnpApiPath)) {
1318
if (!process.versions.pnp) {
1419
// Setup the environment to be able to require eslint/bin/eslint.js
1520
require(absPnpApiPath).setup();
21+
if (isPnpLoaderEnabled && register) {
22+
register(pathToFileURL(absPnpLoaderPath));
23+
}
1624
}
1725
}
1826

27+
const wrapWithUserWrapper = existsSync(absUserWrapperPath)
28+
? exports => absRequire(absUserWrapperPath)(exports)
29+
: exports => exports;
30+
1931
// Defer to the real eslint/bin/eslint.js your application uses
20-
module.exports = absRequire(`eslint/bin/eslint.js`);
32+
module.exports = wrapWithUserWrapper(absRequire(`eslint/bin/eslint.js`));

0 commit comments

Comments
 (0)