Skip to content

Commit

Permalink
Merge branch 'release/v7'
Browse files Browse the repository at this point in the history
  • Loading branch information
saltyshiomix committed Sep 24, 2021
2 parents 9e6da97 + 58dcd1a commit f268182
Show file tree
Hide file tree
Showing 17 changed files with 509 additions and 270 deletions.
8 changes: 4 additions & 4 deletions examples/custom-build-options/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/custom-main-entry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/custom-renderer-port/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/ipc-communication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/store-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
12 changes: 6 additions & 6 deletions examples/with-javascript-ant-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@babel/core": "^7.14.8",
"@babel/core": "^7.15.5",
"@zeit/next-css": "^1.0.1",
"antd": "^4.16.8",
"antd": "^4.16.13",
"babel-loader": "^8.2.2",
"babel-plugin-import": "^1.13.3",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"null-loader": "^4.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
Expand Down
10 changes: 5 additions & 5 deletions examples/with-javascript-emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.3.0",
"@emotion/react": "^11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
10 changes: 5 additions & 5 deletions examples/with-javascript-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@material-ui/core": "^4.12.2",
"electron": "^13.1.7",
"@material-ui/core": "^4.12.3",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
14 changes: 7 additions & 7 deletions examples/with-javascript-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"autoprefixer": "^10.3.1",
"electron": "^13.1.7",
"autoprefixer": "^10.3.5",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"postcss": "^8.3.6",
"next": "^11.1.2",
"nextron": "^7.1.0",
"postcss": "^8.3.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tailwindcss": "^2.2.7"
"tailwindcss": "^2.2.15"
}
}
8 changes: 4 additions & 4 deletions examples/with-javascript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
}
Expand Down
14 changes: 7 additions & 7 deletions examples/with-typescript-ant-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,24 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@babel/core": "^7.14.8",
"@babel/core": "^7.15.5",
"@types/node": "^14.14.31",
"@types/react": "^16.9.49",
"@zeit/next-css": "^1.0.1",
"antd": "^4.16.8",
"antd": "^4.16.13",
"babel-loader": "^8.2.2",
"babel-plugin-import": "^1.13.3",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"null-loader": "^4.0.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"typescript": "^4.3.5",
"typescript": "^4.4.3",
"webpack": "^4.46.0"
}
}
12 changes: 6 additions & 6 deletions examples/with-typescript-emotion/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@emotion/babel-plugin": "^11.3.0",
"@emotion/react": "^11.4.0",
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@types/node": "^14.14.31",
"@types/react": "^16.9.49",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"typescript": "^4.3.5"
"typescript": "^4.4.3"
}
}
12 changes: 6 additions & 6 deletions examples/with-typescript-material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@material-ui/core": "^4.12.2",
"@material-ui/core": "^4.12.3",
"@types/node": "^14.14.31",
"@types/react": "^16.9.49",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"typescript": "^4.3.5"
"typescript": "^4.4.3"
}
}
16 changes: 8 additions & 8 deletions examples/with-typescript-tailwindcss/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@types/node": "^14.14.31",
"@types/react": "^17.0.0",
"autoprefixer": "^10.3.1",
"electron": "^13.1.7",
"autoprefixer": "^10.3.5",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"postcss": "^8.3.6",
"next": "^11.1.2",
"nextron": "^7.1.0",
"postcss": "^8.3.7",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"tailwindcss": "^2.2.7",
"typescript": "^4.3.5"
"tailwindcss": "^2.2.15",
"typescript": "^4.4.3"
}
}
10 changes: 5 additions & 5 deletions examples/with-typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
},
"dependencies": {
"electron-serve": "^1.1.0",
"electron-store": "^8.0.0"
"electron-store": "^8.0.1"
},
"devDependencies": {
"@types/node": "^14.14.31",
"@types/react": "^16.9.49",
"electron": "^13.1.7",
"electron": "^15.0.0",
"electron-builder": "^22.11.7",
"next": "^11.0.1",
"nextron": "^7.0.0",
"next": "^11.1.2",
"nextron": "^7.1.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"typescript": "^4.3.5"
"typescript": "^4.4.3"
}
}
30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nextron",
"version": "7.0.0",
"version": "7.1.0",
"description": "⚡ NEXT.js + Electron ⚡",
"repository": "[email protected]:saltyshiomix/nextron.git",
"author": "Shiono Yoshihide <[email protected]>",
Expand Down Expand Up @@ -35,34 +35,34 @@
"prepublishOnly": "NODE_ENV=production npm run build"
},
"dependencies": {
"@babel/core": "7.14.8",
"@babel/core": "7.15.5",
"@babel/plugin-proposal-class-properties": "7.14.5",
"@babel/plugin-proposal-object-rest-spread": "7.14.7",
"@babel/plugin-proposal-object-rest-spread": "7.15.6",
"@babel/plugin-proposal-optional-chaining": "7.14.5",
"@babel/plugin-transform-runtime": "7.14.5",
"@babel/preset-env": "7.14.8",
"@babel/preset-typescript": "7.14.5",
"@babel/runtime": "7.14.8",
"@babel/runtime-corejs3": "7.14.8",
"arg": "5.0.0",
"@babel/plugin-transform-runtime": "7.15.0",
"@babel/preset-env": "7.15.6",
"@babel/preset-typescript": "7.15.0",
"@babel/runtime": "7.15.4",
"@babel/runtime-corejs3": "7.15.4",
"arg": "5.0.1",
"babel-loader": "8.2.2",
"chalk": "4.1.1",
"chalk": "4.1.2",
"delay": "5.0.0",
"execa": "5.1.1",
"fs-extra": "10.0.0",
"webpack": "5.46.0",
"webpack": "5.53.0",
"webpack-merge": "5.8.0"
},
"devDependencies": {
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^19.0.1",
"@rollup/plugin-node-resolve": "^13.0.2",
"@rollup/plugin-commonjs": "^20.0.0",
"@rollup/plugin-node-resolve": "^13.0.5",
"@types/fs-extra": "^9.0.12",
"@types/node": "^14.14.31",
"rimraf": "^3.0.2",
"rollup": "^2.53.3",
"rollup": "^2.57.0",
"rollup-plugin-auto-external": "^2.0.0",
"rollup-plugin-terser": "^7.0.2",
"typescript": "^4.3.5"
"typescript": "^4.4.3"
}
}
Loading

0 comments on commit f268182

Please sign in to comment.