mirror of
https://github.com/quine-global/hyper.git
synced 2026-01-17 22:18:41 -09:00
fix things
This commit is contained in:
parent
cd2c73b40f
commit
1565ca06e5
10 changed files with 1249 additions and 16330 deletions
Binary file not shown.
|
|
@ -12,3 +12,10 @@ npmRegistryServer: "https://registry.yarnpkg.com"
|
||||||
|
|
||||||
yarnPath: .yarn/releases/yarn-4.9.1.cjs
|
yarnPath: .yarn/releases/yarn-4.9.1.cjs
|
||||||
|
|
||||||
|
packageExtensions:
|
||||||
|
react@*:
|
||||||
|
peerDependencies:
|
||||||
|
react: "*"
|
||||||
|
react-dom@*:
|
||||||
|
peerDependencies:
|
||||||
|
react-dom: "*"
|
||||||
|
|
|
||||||
10535
app/.pnp.cjs
generated
10535
app/.pnp.cjs
generated
File diff suppressed because one or more lines are too long
2126
app/.pnp.loader.mjs
generated
2126
app/.pnp.loader.mjs
generated
File diff suppressed because it is too large
Load diff
2458
app/yarn.lock
2458
app/yarn.lock
File diff suppressed because it is too large
Load diff
5
bin/notarize.js
vendored
5
bin/notarize.js
vendored
|
|
@ -1,11 +1,12 @@
|
||||||
const { notarize } = require("@electron/notarize");
|
|
||||||
|
|
||||||
exports.default = async function notarizing(context) {
|
exports.default = async function notarizing(context) {
|
||||||
|
|
||||||
const { electronPlatformName, appOutDir } = context;
|
const { electronPlatformName, appOutDir } = context;
|
||||||
if (electronPlatformName !== "darwin" || !process.env.APPLE_ID || !process.env.APPLE_PASSWORD) {
|
if (electronPlatformName !== "darwin" || !process.env.APPLE_ID || !process.env.APPLE_PASSWORD) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const { notarize } = await import('@electron/notarize');
|
||||||
|
|
||||||
const appName = context.packager.appInfo.productFilename;
|
const appName = context.packager.appInfo.productFilename;
|
||||||
return await notarize({
|
return await notarize({
|
||||||
appBundleId: "com.quineglobal.hyper",
|
appBundleId: "com.quineglobal.hyper",
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,7 @@
|
||||||
"email": "team@zeit.co"
|
"email": "team@zeit.co"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@electron/notarize": "^3.0.1",
|
||||||
"@react-icons/all-files": "4.1.0",
|
"@react-icons/all-files": "4.1.0",
|
||||||
"@redux-devtools/extension": "^3.3.0",
|
"@redux-devtools/extension": "^3.3.0",
|
||||||
"@xterm/addon-canvas": "0.7.0",
|
"@xterm/addon-canvas": "0.7.0",
|
||||||
|
|
@ -85,12 +86,14 @@
|
||||||
"@ava/typescript": "^4.1.0",
|
"@ava/typescript": "^4.1.0",
|
||||||
"@babel/cli": "7.25.9",
|
"@babel/cli": "7.25.9",
|
||||||
"@babel/core": "7.26.0",
|
"@babel/core": "7.26.0",
|
||||||
|
"@babel/parser": "7.27.0",
|
||||||
"@babel/plugin-proposal-class-properties": "^7.18.6",
|
"@babel/plugin-proposal-class-properties": "^7.18.6",
|
||||||
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
|
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
|
||||||
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
|
"@babel/plugin-proposal-object-rest-spread": "^7.20.7",
|
||||||
"@babel/plugin-proposal-optional-chaining": "7.21.0",
|
"@babel/plugin-proposal-optional-chaining": "7.21.0",
|
||||||
"@babel/preset-react": "7.25.9",
|
"@babel/preset-react": "7.25.9",
|
||||||
"@babel/preset-typescript": "7.26.0",
|
"@babel/preset-typescript": "7.26.0",
|
||||||
|
"@babel/types": "^7.27.6",
|
||||||
"@electron/rebuild": "^3.7.1",
|
"@electron/rebuild": "^3.7.1",
|
||||||
"@electron/remote": "2.1.2",
|
"@electron/remote": "2.1.2",
|
||||||
"@types/args": "5.0.3",
|
"@types/args": "5.0.3",
|
||||||
|
|
@ -166,10 +169,14 @@
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"@types/retry": "0.12.5",
|
"@types/retry": "0.12.5",
|
||||||
"node-abi": "^3.67.0"
|
"node-abi": "^3.67.0",
|
||||||
|
"@types/node": "22.15.30"
|
||||||
},
|
},
|
||||||
"packageManager": "yarn@4.9.1",
|
"packageManager": "yarn@4.9.1",
|
||||||
"dependenciesMeta": {
|
"dependenciesMeta": {
|
||||||
|
"@react-icons/all-files@4.1.0": {
|
||||||
|
"unplugged": true
|
||||||
|
},
|
||||||
"color@4.2.3": {
|
"color@4.2.3": {
|
||||||
"unplugged": true
|
"unplugged": true
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,16 @@ import webpack from 'webpack';
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
import PnpWebpackPlugin from 'pnp-webpack-plugin';
|
import PnpWebpackPlugin from 'pnp-webpack-plugin';
|
||||||
|
|
||||||
|
import { createRequire } from 'module';
|
||||||
|
|
||||||
const nodeEnv = process.env.NODE_ENV || 'development';
|
const nodeEnv = process.env.NODE_ENV || 'development';
|
||||||
const isProd = nodeEnv === 'production';
|
const isProd = nodeEnv === 'production';
|
||||||
|
|
||||||
|
const { resolveRequest } = require('pnpapi');
|
||||||
|
const pathToReact = resolveRequest('react', __filename);
|
||||||
|
console.log('Resolved react via pnpapi:', pathToReact);
|
||||||
|
|
||||||
|
|
||||||
const config: webpack.Configuration[] = [
|
const config: webpack.Configuration[] = [
|
||||||
{
|
{
|
||||||
mode: 'none',
|
mode: 'none',
|
||||||
|
|
@ -19,7 +26,7 @@ const config: webpack.Configuration[] = [
|
||||||
plugins: [PnpWebpackPlugin],
|
plugins: [PnpWebpackPlugin],
|
||||||
alias: {
|
alias: {
|
||||||
react: require.resolve('react'),
|
react: require.resolve('react'),
|
||||||
'react-dom': require.resolve('react-dom'),
|
//'react-dom': require.resolve('react-dom'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
resolveLoader: {
|
resolveLoader: {
|
||||||
|
|
@ -58,10 +65,6 @@ const config: webpack.Configuration[] = [
|
||||||
globOptions: {ignore: ['**/node_modules/**']},
|
globOptions: {ignore: ['**/node_modules/**']},
|
||||||
to: './config/[name][ext]'
|
to: './config/[name][ext]'
|
||||||
},
|
},
|
||||||
{
|
|
||||||
from: './app/yarn.lock',
|
|
||||||
to: 'yarn.lock'
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
from: './app/keymaps/*.json',
|
from: './app/keymaps/*.json',
|
||||||
globOptions: {ignore: ['**/node_modules/**']},
|
globOptions: {ignore: ['**/node_modules/**']},
|
||||||
|
|
@ -80,11 +83,15 @@ const config: webpack.Configuration[] = [
|
||||||
{
|
{
|
||||||
mode: 'none',
|
mode: 'none',
|
||||||
name: 'hyper',
|
name: 'hyper',
|
||||||
|
infrastructureLogging: {
|
||||||
|
level: 'verbose',
|
||||||
|
debug: true
|
||||||
|
},
|
||||||
resolve: {
|
resolve: {
|
||||||
plugins: [PnpWebpackPlugin],
|
plugins: [PnpWebpackPlugin],
|
||||||
alias: {
|
alias: {
|
||||||
react: path.resolve(__dirname, 'node_modules/react'),
|
react: require.resolve('react'),
|
||||||
'react-dom': path.resolve(__dirname, 'node_modules/react-dom')
|
//'react-dom': require.resolve('react-dom')
|
||||||
},
|
},
|
||||||
extensions: ['.js', '.jsx', '.ts', '.tsx', '.d.ts']
|
extensions: ['.js', '.jsx', '.ts', '.tsx', '.d.ts']
|
||||||
},
|
},
|
||||||
|
|
@ -102,7 +109,7 @@ const config: webpack.Configuration[] = [
|
||||||
{
|
{
|
||||||
test: /\.(js|jsx|ts|tsx)$/,
|
test: /\.(js|jsx|ts|tsx)$/,
|
||||||
exclude: /node_modules/,
|
exclude: /node_modules/,
|
||||||
loader: 'babel-loader'
|
loader: require.resolve('babel-loader')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
test: /\.json/,
|
test: /\.json/,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue