Skip to content

Commit

Permalink
Let's try this again.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Anderson committed Jun 17, 2020
1 parent bef00b4 commit 282d27e
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 23 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ jobs:
github_token: ${{ secrets.github_token }}
mac_certs: ${{ secrets.mac_cert }}
mac_certs_password: ${{ secrets.mac_cert_password }}
build_script_name: nothing
# Don't worry about
skip_build: true
# If the commit is tagged with a version (e.g. "1.0.0"),
# release the app after building
release: true
Expand All @@ -103,3 +104,6 @@ jobs:
GOOGLE_SHEETS_SECRET: ${{ secrets.GOOGLE_SHEETS_SECRET }}
GOOGLE_SHEETS_CLIENT_ID: ${{ secrets.GOOGLE_SHEETS_CLIENT_ID }}
GH_ISSUE_TOKEN: ${{ secrets.GH_ISSUE_TOKEN }}
- name: Setup tmate session
uses: mxschmitt/action-tmate@v2
if: failure()
35 changes: 25 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
},
"proxy": "http://localhost:3001",
"nodemonConfig": {
"watch": ["server/"],
"watch": [
"server/"
],
"ignore": [
".git",
"./src/*",
Expand All @@ -88,8 +90,12 @@
}
},
"lint-staged": {
"*.{js,jsx,ts,tsx}": ["eslint"],
"*.{css,scss}": ["stylelint"],
"*.{js,jsx,ts,tsx}": [
"eslint"
],
"*.{css,scss}": [
"stylelint"
],
"**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
"prettier --write"
]
Expand All @@ -106,11 +112,13 @@
"directories": {
"output": "./packages"
},
"publish": { "provider": "github" },
"publish": {
"provider": "github"
},
"files": [
"electron/**/*",
"!**/node_modules/**/*",
"**/node_modules/{uuid,electron,@electron/get,debug,ms,env-paths,fs-extra,graceful-fs,jsonfile,klaw,path-is-absolute,rimraf,glob,fs.realpath,inflight,once,wrappy,inherits,minimatch,brace-expansion,balanced-match,concat-map,got,create-error-class,capture-stack-trace,duplexer3,get-stream,is-redirect,is-retry-allowed,is-stream,lowercase-keys,safe-buffer,timed-out,unzip-response,url-parse-lax,prepend-http,progress,sanitize-filename,truncate-utf8-bytes,utf8-byte-length,sumchecker,@types/node,extract-zip,concat-stream,buffer-from,readable-stream,core-util-is,isarray,process-nextick-args,string_decoder,util-deprecate,typedarray,mkdirp,minimist,yauzl,fd-slicer,pend,bonjour,array-flatten,deep-equal,is-arguments,is-date-object,is-regex,has,function-bind,object-is,object-keys,regexp.prototype.flags,define-properties,es-abstract,es-to-primitive,is-callable,is-symbol,has-symbols,object-inspect,object.assign,string.prototype.trimleft,string.prototype.trimright,dns-equal,dns-txt,buffer-indexof,multicast-dns,dns-packet,ip,thunky,multicast-dns-service-types,electron-is-dev,electron-settings,clone,is-linux,is-osx,is-windows,semver,electron-updater,@types/semver,builder-util-runtime,sax,js-yaml,argparse,sprintf-js,esprima,lazy-val,lodash.isequal,pako,universalify,usb-detection,bindings,file-uri-to-path,eventemitter2,nan,prebuild-install,detect-libc,expand-template,github-from-package,napi-build-utils,node-abi,noop-logger,npmlog,are-we-there-yet,delegates,console-control-strings,gauge,aproba,has-unicode,object-assign,signal-exit,string-width,code-point-at,is-fullwidth-code-point,number-is-nan,strip-ansi,ansi-regex,wide-align,set-blocking,pump,end-of-stream,rc,deep-extend,ini,strip-json-comments,simple-get,decompress-response,mimic-response,simple-concat,tar-fs,chownr,mkdirp-classic,tar-stream,bl,buffer,base64-js,ieee754,fs-constants,tunnel-agent,which-pm-runs,dmx,serialport,@serialport/binding-mock,@serialport/binding-abstract,@serialport/bindings,@serialport/parser-readline,@serialport/parser-delimiter,@serialport/parser-byte-length,@serialport/parser-cctalk,@serialport/parser-ready,@serialport/parser-regex,@serialport/stream,socket.io,engine.io,accepts,mime-types,mime-db,negotiator,base64id,cookie,engine.io-parser,after,arraybuffer.slice,base64-arraybuffer,blob,has-binary2,ws,async-limiter,socket.io-adapter,socket.io-client,backo2,component-bind,component-emitter,engine.io-client,component-inherit,has-cors,indexof,parseqs,better-assert,callsite,parseuri,xmlhttprequest-ssl,yeast,object-component,socket.io-parser,to-array,e131}/**/*",
"**/node_modules/{uuid,electron,@electron/get,debug,ms,env-paths,fs-extra,at-least-node,graceful-fs,jsonfile,universalify,got,create-error-class,capture-stack-trace,duplexer3,get-stream,is-redirect,is-retry-allowed,is-stream,lowercase-keys,safe-buffer,timed-out,unzip-response,url-parse-lax,prepend-http,progress,sanitize-filename,truncate-utf8-bytes,utf8-byte-length,sumchecker,@types/node,extract-zip,concat-stream,buffer-from,inherits,readable-stream,core-util-is,isarray,process-nextick-args,string_decoder,util-deprecate,typedarray,mkdirp,minimist,yauzl,buffer-crc32,fd-slicer,pend,bonjour,array-flatten,deep-equal,is-arguments,is-date-object,is-regex,has-symbols,object-is,define-properties,object-keys,es-abstract,es-to-primitive,is-callable,is-symbol,function-bind,has,object-inspect,object.assign,string.prototype.trimend,string.prototype.trimstart,regexp.prototype.flags,dns-equal,dns-txt,buffer-indexof,multicast-dns,dns-packet,ip,thunky,multicast-dns-service-types,electron-is-dev,electron-settings,clone,is-windows,semver,electron-updater,@types/semver,builder-util-runtime,sax,js-yaml,argparse,sprintf-js,esprima,lazy-val,lodash.isequal,usb-detection,bindings,file-uri-to-path,eventemitter2,nan,prebuild-install,detect-libc,expand-template,github-from-package,napi-build-utils,node-abi,noop-logger,npmlog,are-we-there-yet,delegates,console-control-strings,gauge,aproba,has-unicode,object-assign,signal-exit,string-width,code-point-at,is-fullwidth-code-point,number-is-nan,strip-ansi,ansi-regex,wide-align,set-blocking,pump,end-of-stream,once,wrappy,rc,deep-extend,ini,strip-json-comments,simple-get,decompress-response,mimic-response,simple-concat,tar-fs,chownr,mkdirp-classic,tar-stream,bl,buffer,base64-js,ieee754,fs-constants,tunnel-agent,which-pm-runs,dmx,serialport,@serialport/binding-mock,@serialport/binding-abstract,@serialport/bindings,@serialport/parser-readline,@serialport/parser-delimiter,@serialport/parser-byte-length,@serialport/parser-cctalk,@serialport/parser-ready,@serialport/parser-regex,@serialport/stream,socket.io,engine.io,accepts,mime-types,mime-db,negotiator,base64id,cookie,engine.io-parser,after,arraybuffer.slice,base64-arraybuffer,blob,has-binary2,ws,async-limiter,socket.io-adapter,socket.io-client,backo2,component-bind,component-emitter,engine.io-client,component-inherit,has-cors,indexof,parseqs,better-assert,callsite,parseuri,xmlhttprequest-ssl,yeast,object-component,socket.io-parser,to-array,e131}/**/*",
"!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}",
"!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}",
"!**/node_modules/*.d.ts",
Expand All @@ -135,10 +143,15 @@
]
},
"win": {
"target": ["zip", "portable"],
"target": [
"zip",
"portable"
],
"icon": "./public/icon.ico"
},
"linux": { "category": "Utility" }
"linux": {
"category": "Utility"
}
},
"bin": "./server/index.js",
"pkg": {
Expand All @@ -158,7 +171,9 @@
]
},
"release": {
"branches": ["main"],
"branches": [
"main"
],
"tagFormat": "${version}",
"plugins": [
"@semantic-release/commit-analyzer",
Expand Down Expand Up @@ -315,10 +330,10 @@
"canvas": "^2.6.0",
"centered-pan-zoom": "^2.0.0",
"cross-env": "^7.0.0",
"electron": "^8.0.0",
"electron": "^9.0.4",
"electron-builder": "^22.1.0",
"electron-builder-notarize": "^1.1.2",
"electron-notarize": "^0.3.0",
"electron-notarize": "^1.0.0",
"eslint-config-prettier": "^6.4.0",
"get-graphql-schema": "^2.1.2",
"graphql-tag.macro": "^2.0.1",
Expand Down
16 changes: 14 additions & 2 deletions scripts/getNeededPackages.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ const needed = [
"e131",
];

const memo = {};

function getNeededPackages(pkg) {
if (memo[pkg]) return memo[pkg];
const packageName = Object.keys(packages.object).find(key => {
return key.split("@")[key[0] === "@" ? 1 : 0] === pkg.replace("@", "");
});
Expand All @@ -28,8 +31,17 @@ function getNeededPackages(pkg) {
return [];
}
const packageObj = packages.object[packageName];
if (!packageObj.dependencies) return [pkg];
return [pkg, ...Object.keys(packageObj.dependencies).map(getNeededPackages)];
if (!packageObj.dependencies) {
memo[pkg] = [pkg];
return [pkg];
}
memo[pkg] = [pkg];

memo[pkg] = [
pkg,
...Object.keys(packageObj.dependencies).map(getNeededPackages),
];
return memo[pkg];
}

console.info(
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9650,13 +9650,13 @@ electron-notarize@^0.2.0:
debug "^4.1.1"
fs-extra "^8.1.0"

electron-notarize@^0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-0.3.0.tgz#b93c606306eac558b250c78ff95273ddb9fedf0a"
integrity sha512-tuDw8H0gcDOalNLv6RM2CwGvUXU60MPGZRDEmd0ppX+yP5XqL8Ec2DuXyz9J7WQSA3aRCfzIgH8C5CAivDYWMw==
electron-notarize@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.0.0.tgz#bc925b1ccc3f79e58e029e8c4706572b01a9fd8f"
integrity sha512-dsib1IAquMn0onCrNMJ6gtEIZn/azG8hZMCYOuZIMVMUeRMgBYHK1s5TK9P8xAcrAjh/2aN5WYHzgVSWX314og==
dependencies:
debug "^4.1.1"
fs-extra "^8.1.0"
fs-extra "^9.0.1"

electron-publish@22.7.0:
version "22.7.0"
Expand Down Expand Up @@ -9713,10 +9713,10 @@ electron-updater@^4.2.0:
lodash.isequal "^4.5.0"
semver "^7.1.3"

electron@^8.0.0:
version "8.3.2"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.3.2.tgz#4b0c02e6e1b2194c37220e42d13d08f7b74fd2ea"
integrity sha512-U4JrglY8X2bED0R1BRX8ovGYDk2cpR1vFn0aIsYbrCbHLGfAXdNuAcs40s3yBhiknvvaqQV+wu4Becokv1hs7A==
electron@^9.0.4:
version "9.0.4"
resolved "https://registry.yarnpkg.com/electron/-/electron-9.0.4.tgz#5aa72c1576c82c19f6e087311ffe1d7b74358d25"
integrity sha512-QzkeZNAiNB7KxcdoQKSoaiVT/GQdB4Vt0/ZZOuU8tIKABAsni2I7ztiAbUzxcsnQsqEBSfChuPuDQ5A4VbbzPg==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
Expand Down Expand Up @@ -11000,7 +11000,7 @@ fs-constants@^1.0.0:
resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==

fs-extra@9.0.1, fs-extra@^9.0.0:
fs-extra@9.0.1, fs-extra@^9.0.0, fs-extra@^9.0.1:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
Expand Down

0 comments on commit 282d27e

Please sign in to comment.