mirror/lowdefy
2
0
Fork 0
mirror of https://github.com/lowdefy/lowdefy.git synced 2025-01-06 13:15:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge

Browse Source
This commit is contained in:
Gervwyk 2020-10-15 16:50:50 +02:00
commit 0c6b6aa862
12 changed files with 69 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.pnp.js generated
View File

@ -3751,7 +3751,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["express", "npm:4.17.1"],
["graphql", "npm:15.3.0"],
["html-webpack-plugin", "virtual:acf8ebf79a461c4f9f2ee32d35604720e52d54fc65cacbf3e944b2ad79cd4f17f95a2cb60cf4b37ca284c4f89981c732c25542cf20e548286d7eb31af1a6edda#npm:4.5.0"],
["nodemon", "npm:2.0.4"],
["nodemon", "npm:2.0.5"],
["react", "npm:17.0.0-rc.3"],
["react-dom", "virtual:acf8ebf79a461c4f9f2ee32d35604720e52d54fc65cacbf3e944b2ad79cd4f17f95a2cb60cf4b37ca284c4f89981c732c25542cf20e548286d7eb31af1a6edda#npm:17.0.0-rc.3"],
["style-loader", "virtual:acf8ebf79a461c4f9f2ee32d35604720e52d54fc65cacbf3e944b2ad79cd4f17f95a2cb60cf4b37ca284c4f89981c732c25542cf20e548286d7eb31af1a6edda#npm:2.0.0"],
@ -9517,24 +9517,24 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
],
"linkType": "HARD",
}],
["virtual:6618ab6046111bda0b9a733e34fec5329265b155b4408a2345f36333ccbe1a86dfc9efc447e5134e4156dde98ed737f5efbe42b5378f22c09197bf46e2cdab17#npm:3.1.0", {
"packageLocation": "./.yarn/$$virtual/debug-virtual-77b911398e/0/cache/debug-npm-3.1.0-9f0accb99b-1295acd5e0.zip/node_modules/debug/",
["virtual:6270a546157caed63d8b56e4ed9791229a856613db952ee40c891e8f3ff27123192631c8ba52fb5e23b769858a587af9f365a84ad416052ef8b3d512477eaf57#npm:3.2.6", {
"packageLocation": "./.yarn/$$virtual/debug-virtual-a1981b7d13/0/cache/debug-npm-3.2.6-6214e40f12-619feb53b1.zip/node_modules/debug/",
"packageDependencies": [
["debug", "virtual:6618ab6046111bda0b9a733e34fec5329265b155b4408a2345f36333ccbe1a86dfc9efc447e5134e4156dde98ed737f5efbe42b5378f22c09197bf46e2cdab17#npm:3.1.0"],
["ms", "npm:2.0.0"],
["supports-color", null]
["debug", "virtual:6270a546157caed63d8b56e4ed9791229a856613db952ee40c891e8f3ff27123192631c8ba52fb5e23b769858a587af9f365a84ad416052ef8b3d512477eaf57#npm:3.2.6"],
["ms", "npm:2.1.2"],
["supports-color", "npm:5.5.0"]
],
"packagePeers": [
"supports-color"
],
"linkType": "HARD",
}],
["virtual:6cfc557b1b3ed98544cad13ffd74462797496fe01d0dd9649602e1c1359d7df7fba294f2ac2939dc40ca1a1f18a3b7641601422c7b242c5785fec1a2e013a42b#npm:3.2.6", {
"packageLocation": "./.yarn/$$virtual/debug-virtual-041eb3a673/0/cache/debug-npm-3.2.6-6214e40f12-619feb53b1.zip/node_modules/debug/",
["virtual:6618ab6046111bda0b9a733e34fec5329265b155b4408a2345f36333ccbe1a86dfc9efc447e5134e4156dde98ed737f5efbe42b5378f22c09197bf46e2cdab17#npm:3.1.0", {
"packageLocation": "./.yarn/$$virtual/debug-virtual-77b911398e/0/cache/debug-npm-3.1.0-9f0accb99b-1295acd5e0.zip/node_modules/debug/",
"packageDependencies": [
["debug", "virtual:6cfc557b1b3ed98544cad13ffd74462797496fe01d0dd9649602e1c1359d7df7fba294f2ac2939dc40ca1a1f18a3b7641601422c7b242c5785fec1a2e013a42b#npm:3.2.6"],
["ms", "npm:2.1.2"],
["supports-color", "npm:5.5.0"]
["debug", "virtual:6618ab6046111bda0b9a733e34fec5329265b155b4408a2345f36333ccbe1a86dfc9efc447e5134e4156dde98ed737f5efbe42b5378f22c09197bf46e2cdab17#npm:3.1.0"],
["ms", "npm:2.0.0"],
["supports-color", null]
],
"packagePeers": [
"supports-color"
@ -16323,12 +16323,12 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["nodemon", [
["npm:2.0.4", {
"packageLocation": "./.yarn/unplugged/nodemon-npm-2.0.4-6cfc557b1b/node_modules/nodemon/",
["npm:2.0.5", {
"packageLocation": "./.yarn/unplugged/nodemon-npm-2.0.5-6270a54615/node_modules/nodemon/",
"packageDependencies": [
["nodemon", "npm:2.0.4"],
["nodemon", "npm:2.0.5"],
["chokidar", "npm:3.4.3"],
["debug", "virtual:6cfc557b1b3ed98544cad13ffd74462797496fe01d0dd9649602e1c1359d7df7fba294f2ac2939dc40ca1a1f18a3b7641601422c7b242c5785fec1a2e013a42b#npm:3.2.6"],
["debug", "virtual:6270a546157caed63d8b56e4ed9791229a856613db952ee40c891e8f3ff27123192631c8ba52fb5e23b769858a587af9f365a84ad416052ef8b3d512477eaf57#npm:3.2.6"],
["ignore-by-default", "npm:1.0.1"],
["minimatch", "npm:3.0.4"],
["pstree.remy", "npm:1.1.8"],

BIN
.yarn/cache/nodemon-npm-2.0.4-6cfc557b1b-b5f32e7fee.zip → .yarn/cache/nodemon-npm-2.0.5-6270a54615-ffc5a1163b.zip vendored
View File

Binary file not shown.

9
packages/blockTools/package.json
View File

@ -26,12 +26,13 @@
"dist/*"
],
"scripts": {
"start": "webpack serve",
"build": "babel src --copy-files --out-dir dist",
"test": "jest --coverage",
"dev": "webpack serve",
"npm-publish": "npm publish --access public",
"prepare": "yarn build",
"prepublishOnly": "yarn build",
"npm-publish": "npm publish --access public"
"start": "webpack serve",
"test": "jest --coverage"
},
"dependencies": {
"@lowdefy/helpers": "1.0.0",
@ -70,4 +71,4 @@
"yaml-jest": "1.0.5",
"yaml-loader": "0.6.0"
}
}
}

2
packages/express/package.json
View File

@ -34,7 +34,7 @@
"apollo-server-express": "2.18.2",
"express": "4.17.1",
"graphql": "15.3.0",
"nodemon": "2.0.4",
"nodemon": "2.0.5",
"react": "17.0.0-rc.3",
"react-dom": "17.0.0-rc.3"
},

8
packages/express/webpack.dev.js
View File

@ -1,4 +1,5 @@
const { merge } = require('webpack-merge');
const webpack = require('webpack');
const common = require('./webpack.common.js');
const path = require('path');
@ -7,6 +8,11 @@ module.exports = merge(common, {
devtool: 'eval-source-map',
devServer: {
contentBase: path.join(__dirname, 'dist'),
port: 3001,
port: 3000,
},
plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development'),
}),
],
});

6
packages/express/webpack.prod.js
View File

@ -1,6 +1,12 @@
const { merge } = require('webpack-merge');
const webpack = require('webpack');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'production',
plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('production'),
}),
],
});

9
packages/layout/package.json
View File

@ -26,12 +26,13 @@
"dist/*"
],
"scripts": {
"start": "webpack serve",
"build": "babel src --out-dir dist",
"test": "jest --coverage",
"dev": "webpack serve",
"npm-publish": "npm publish --access public",
"prepare": "yarn build",
"prepublishOnly": "yarn build",
"npm-publish": "npm publish --access public"
"start": "webpack serve",
"test": "jest --coverage"
},
"dependencies": {
"@lowdefy/type": "1.0.1",
@ -68,4 +69,4 @@
"yaml-jest": "1.0.5",
"yaml-loader": "0.6.0"
}
}
}

6
packages/renderer/package.json
View File

@ -29,8 +29,8 @@
"build": "webpack --config webpack.prod.js",
"clean": "rm -rf dist",
"prepublishOnly": "yarn build",
"serve": "serve dist -p 3001",
"start": "webpack serve --config webpack.dev.js"
"start": "serve dist -p 3001",
"dev": "webpack serve --config webpack.dev.js"
},
"dependencies": {
"@apollo/client": "3.2.4",
@ -64,4 +64,4 @@
"webpack-dev-server": "3.11.0",
"webpack-merge": "5.2.0"
}
}
}

2
packages/renderer/src/utils/graphql/useGqlClient.js
View File

@ -31,7 +31,7 @@ const retryLink = new RetryLink();
// TODO: make uri configurable
const httpLink = new HttpLink({
uri: '/api/graphql',
uri: process.env.GRAPHQL_URI,
});
// TODO: Handle errors

11
packages/renderer/webpack.dev.js
View File

@ -1,7 +1,9 @@
const { merge } = require('webpack-merge');
const common = require('./webpack.common.js');
const webpack = require('webpack');
const path = require('path');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'development',
devtool: 'eval-source-map',
@ -9,4 +11,11 @@ module.exports = merge(common, {
contentBase: path.join(__dirname, 'dist'),
port: 3001,
},
plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('development'),
'process.env.GRAPHQL_URI': JSON.stringify('http://localhost:3000/api/graphql'),
}),
],
});

7
packages/renderer/webpack.prod.js
View File

@ -1,6 +1,13 @@
const { merge } = require('webpack-merge');
const webpack = require('webpack');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'production',
plugins: [
new webpack.DefinePlugin({
'process.env.NODE_ENV': JSON.stringify('production'),
'process.env.GRAPHQL_URI': JSON.stringify('/api/graphql'),
}),
],
});

18
yarn.lock
View File

@ -2929,7 +2929,7 @@ __metadata:
express: 4.17.1
graphql: 15.3.0
html-webpack-plugin: 4.5.0
nodemon: 2.0.4
nodemon: 2.0.5
react: 17.0.0-rc.3
react-dom: 17.0.0-rc.3
style-loader: 2.0.0
@ -13394,9 +13394,9 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"nodemon@npm:2.0.4":
version: 2.0.4
resolution: "nodemon@npm:2.0.4"
"nodemon@npm:2.0.5":
version: 2.0.5
resolution: "nodemon@npm:2.0.5"
dependencies:
chokidar: ^3.2.2
debug: ^3.2.6
@ -13406,11 +13406,11 @@ fsevents@^1.2.7:
semver: ^5.7.1
supports-color: ^5.5.0
touch: ^3.1.0
undefsafe: ^2.0.2
update-notifier: ^4.0.0
undefsafe: ^2.0.3
update-notifier: ^4.1.0
bin:
nodemon: bin/nodemon.js
checksum: b5f32e7feea11cc2e3ae6603f2ed9229f3d13d01e0d7d54aab47d0dac3b5759b07a0f00d0a46de7379a8ca8e5705940508dee6d06e4a22b3f31c57ce52faa936
checksum: ffc5a1163b0ad993bacb15a2372f18d7c0287fc9a66ccc704a56fe4656911ca48609861a0403bd4aad5780eb4442954fc5b323cd438e654f70057f06e43baec3
languageName: node
linkType: hard
@ -18445,7 +18445,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"undefsafe@npm:^2.0.2":
"undefsafe@npm:^2.0.3":
version: 2.0.3
resolution: "undefsafe@npm:2.0.3"
dependencies:
@ -18681,7 +18681,7 @@ fsevents@^1.2.7:
languageName: node
linkType: hard
"update-notifier@npm:^4.0.0":
"update-notifier@npm:^4.1.0":
version: 4.1.3
resolution: "update-notifier@npm:4.1.3"
dependencies: