From a1d3958fb5c5479262ae81721053bcd8744ce75a Mon Sep 17 00:00:00 2001 From: reya Date: Mon, 27 Nov 2023 12:26:13 +0700 Subject: [PATCH] improve build and package --- .gitignore | 8 ++- build.js | 31 +++++++-- extension/{ => chrome}/manifest.json | 2 +- extension/firefox/manifest.json | 41 ++++++++++++ extension/output/.keep | 0 extension/releases/.keep | 0 package.json | 4 +- pnpm-lock.yaml | 97 +++++++++++++++++++--------- 8 files changed, 143 insertions(+), 40 deletions(-) rename extension/{ => chrome}/manifest.json (97%) create mode 100644 extension/firefox/manifest.json create mode 100644 extension/output/.keep create mode 100644 extension/releases/.keep diff --git a/.gitignore b/.gitignore index 8cdc8fd..179803e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,10 @@ node_modules *.build.js *.zip -/extension/build/style.css \ No newline at end of file +*.xpi +/extension/releases/*.zip +/extension/releases/*.xpi +/extension/output/*.js +/extension/output/*.html +/extension/output/*.css +/extension/output/*.json \ No newline at end of file diff --git a/build.js b/build.js index 17d0fe2..e72878f 100755 --- a/build.js +++ b/build.js @@ -1,8 +1,9 @@ #!/usr/bin/env node - +const {copy} = require('esbuild-plugin-copy') const esbuild = require('esbuild') -const prod = process.argv.indexOf('prod') !== -1 +const isProd = process.argv.indexOf('prod') !== -1 +const isFirefox = process.argv.indexOf('firefox') !== -1 esbuild .build({ @@ -14,12 +15,30 @@ esbuild 'background.build': './extension/background.js', 'content-script.build': './extension/content-script.js' }, - outdir: './extension/build', - sourcemap: prod ? false : 'inline', + outdir: './extension/output', + sourcemap: isProd ? false : 'inline', define: { window: 'self', global: 'self' }, - watch: !prod + plugins: [ + copy({ + assets: [ + { + from: [ + isFirefox + ? './extension/firefox/manifest.json' + : './extension/chrome/manifest.json' + ], + to: ['./'] + }, + { + from: ['./extension/*.html'], + to: ['./'] + } + ] + }) + ] }) - .then(() => console.log('build success.')) + .then(() => console.log('Build success.')) + .catch(err => console.error('Build error.', err)) diff --git a/extension/manifest.json b/extension/chrome/manifest.json similarity index 97% rename from extension/manifest.json rename to extension/chrome/manifest.json index f275abe..f460b48 100644 --- a/extension/manifest.json +++ b/extension/chrome/manifest.json @@ -1,7 +1,7 @@ { "name": "Nostr Connect", "description": "Nostr Signer Extension", - "version": "0.1.0", + "version": "0.1.1", "homepage_url": "https://github.com/reyamir/nostr-connect", "manifest_version": 3, "icons": { diff --git a/extension/firefox/manifest.json b/extension/firefox/manifest.json new file mode 100644 index 0000000..7f90d11 --- /dev/null +++ b/extension/firefox/manifest.json @@ -0,0 +1,41 @@ +{ + "name": "Nostr Connect", + "description": "Nostr Signer Extension", + "version": "0.1.1", + "homepage_url": "https://github.com/reyamir/nostr-connect", + "manifest_version": 3, + "browser_specific_settings": { + "gecko": { + "id": "{e665d138-0e5b-4b7a-ab91-7af834eda7a2}" + } + }, + "icons": { + "16": "icons/icon16.png", + "32": "icons/icon32.png", + "48": "icons/icon48.png", + "128": "icons/icon128.png" + }, + "options_page": "options.html", + "background": { + "scripts": ["/build/background.build.js"] + }, + "action": { + "default_title": "Nostr Connect", + "default_popup": "popup.html" + }, + "content_scripts": [ + { + "matches": [""], + "js": ["/build/content-script.build.js"], + "all_frames": true + } + ], + "permissions": ["storage"], + "optional_permissions": ["notifications"], + "web_accessible_resources": [ + { + "resources": ["nostr-provider.js"], + "matches": [""] + } + ] +} diff --git a/extension/output/.keep b/extension/output/.keep new file mode 100644 index 0000000..e69de29 diff --git a/extension/releases/.keep b/extension/releases/.keep new file mode 100644 index 0000000..e69de29 diff --git a/package.json b/package.json index 44cc9ab..21d75b3 100644 --- a/package.json +++ b/package.json @@ -23,9 +23,11 @@ "scripts": { "dev": "./build.js; pnpm exec tailwindcss -i ./extension/style.css -o ./extension/build/style.css --watch", "build": "pnpm exec tailwindcss -i ./extension/style.css -o ./extension/build/style.css; ./build.js prod", - "package": "./build.js prod; cd extension; zip -r archive *; cd ..; mv extension/archive.zip ./nostrconnect.zip" + "package:chrome": "./build.js prod; cd extension/output; zip -r archive *; cd ../../; mv extension/output/archive.zip extension/releases/nostrconnect_chrome.zip", + "package:firefox": "./build.js prod firefox; cd extension/output; zip -r archive *; cd ../../; mv extension/output/archive.zip extension/releases/nostrconnect_firefox.xpi" }, "devDependencies": { + "esbuild-plugin-copy": "^2.1.1", "tailwindcss": "^3.3.5" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2ecdaf1..858f0f6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -61,6 +61,9 @@ dependencies: version: 0.8.0 devDependencies: + esbuild-plugin-copy: + specifier: ^2.1.1 + version: 2.1.1(esbuild@0.14.54) tailwindcss: specifier: ^3.3.5 version: 3.3.5 @@ -1522,7 +1525,6 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true - dev: false optional: true /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): @@ -2407,7 +2409,6 @@ packages: engines: {node: '>=8'} dependencies: color-convert: 2.0.1 - dev: false /ansi-styles@5.2.0: resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} @@ -2461,6 +2462,11 @@ packages: is-string: 1.0.7 dev: false + /array-union@2.1.0: + resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} + engines: {node: '>=8'} + dev: true + /array.prototype.flat@1.3.2: resolution: {integrity: sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==} engines: {node: '>= 0.4'} @@ -2771,7 +2777,6 @@ packages: dependencies: ansi-styles: 4.3.0 supports-color: 7.2.0 - dev: false /chokidar@3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} @@ -2851,7 +2856,6 @@ packages: engines: {node: '>=7.0.0'} dependencies: color-name: 1.1.4 - dev: false /color-name@1.1.3: resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} @@ -2859,7 +2863,6 @@ packages: /color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} - dev: false /colorette@1.4.0: resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==} @@ -3081,6 +3084,13 @@ packages: resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==} dev: true + /dir-glob@3.0.1: + resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} + engines: {node: '>=8'} + dependencies: + path-type: 4.0.0 + dev: true + /dlv@1.1.3: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} dev: true @@ -3268,7 +3278,6 @@ packages: cpu: [x64] os: [android] requiresBuild: true - dev: false optional: true /esbuild-android-arm64@0.14.54: @@ -3277,7 +3286,6 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: false optional: true /esbuild-darwin-64@0.14.54: @@ -3286,7 +3294,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: false optional: true /esbuild-darwin-arm64@0.14.54: @@ -3295,7 +3302,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: false optional: true /esbuild-freebsd-64@0.14.54: @@ -3304,7 +3310,6 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: false optional: true /esbuild-freebsd-arm64@0.14.54: @@ -3313,7 +3318,6 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: false optional: true /esbuild-linux-32@0.14.54: @@ -3322,7 +3326,6 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-64@0.14.54: @@ -3331,7 +3334,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-arm64@0.14.54: @@ -3340,7 +3342,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-arm@0.14.54: @@ -3349,7 +3350,6 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-mips64le@0.14.54: @@ -3358,7 +3358,6 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-ppc64le@0.14.54: @@ -3367,7 +3366,6 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-riscv64@0.14.54: @@ -3376,7 +3374,6 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-linux-s390x@0.14.54: @@ -3385,7 +3382,6 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true - dev: false optional: true /esbuild-netbsd-64@0.14.54: @@ -3394,7 +3390,6 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: false optional: true /esbuild-openbsd-64@0.14.54: @@ -3403,16 +3398,26 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: false optional: true + /esbuild-plugin-copy@2.1.1(esbuild@0.14.54): + resolution: {integrity: sha512-Bk66jpevTcV8KMFzZI1P7MZKZ+uDcrZm2G2egZ2jNIvVnivDpodZI+/KnpL3Jnap0PBdIHU7HwFGB8r+vV5CVw==} + peerDependencies: + esbuild: '>= 0.14.0' + dependencies: + chalk: 4.1.2 + chokidar: 3.5.3 + esbuild: 0.14.54 + fs-extra: 10.1.0 + globby: 11.1.0 + dev: true + /esbuild-sunos-64@0.14.54: resolution: {integrity: sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] requiresBuild: true - dev: false optional: true /esbuild-windows-32@0.14.54: @@ -3421,7 +3426,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: false optional: true /esbuild-windows-64@0.14.54: @@ -3430,7 +3434,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: false optional: true /esbuild-windows-arm64@0.14.54: @@ -3439,7 +3442,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: false optional: true /esbuild@0.14.54: @@ -3469,7 +3471,6 @@ packages: esbuild-windows-32: 0.14.54 esbuild-windows-64: 0.14.54 esbuild-windows-arm64: 0.14.54 - dev: false /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -3798,6 +3799,15 @@ packages: engines: {node: '>= 0.6'} dev: false + /fs-extra@10.1.0: + resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} + engines: {node: '>=12'} + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.1 + dev: true + /fs-extra@8.1.0: resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==} engines: {node: '>=6 <7 || >=8'} @@ -3920,6 +3930,18 @@ packages: define-properties: 1.2.1 dev: false + /globby@11.1.0: + resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==} + engines: {node: '>=10'} + dependencies: + array-union: 2.1.0 + dir-glob: 3.0.1 + fast-glob: 3.3.2 + ignore: 5.3.0 + merge2: 1.4.1 + slash: 3.0.0 + dev: true + /gopd@1.0.1: resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} dependencies: @@ -3928,7 +3950,6 @@ packages: /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} - dev: false /graphemer@1.4.0: resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==} @@ -3946,7 +3967,6 @@ packages: /has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} - dev: false /has-property-descriptors@1.0.1: resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==} @@ -4017,7 +4037,6 @@ packages: /ignore@5.3.0: resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} engines: {node: '>= 4'} - dev: false /image-size@1.0.2: resolution: {integrity: sha512-xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg==} @@ -4508,6 +4527,14 @@ packages: graceful-fs: 4.2.11 dev: false + /jsonfile@6.1.0: + resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==} + dependencies: + universalify: 2.0.1 + optionalDependencies: + graceful-fs: 4.2.11 + dev: true + /jsx-ast-utils@3.3.5: resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==} engines: {node: '>=4.0'} @@ -5358,6 +5385,11 @@ packages: /path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} + /path-type@4.0.0: + resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} + engines: {node: '>=8'} + dev: true + /picocolors@1.0.0: resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==} @@ -6015,7 +6047,6 @@ packages: /slash@3.0.0: resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==} engines: {node: '>=8'} - dev: false /slice-ansi@2.1.0: resolution: {integrity: sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==} @@ -6203,7 +6234,6 @@ packages: engines: {node: '>=8'} dependencies: has-flag: 4.0.0 - dev: false /supports-color@8.1.1: resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} @@ -6436,6 +6466,11 @@ packages: engines: {node: '>= 4.0.0'} dev: false + /universalify@2.0.1: + resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==} + engines: {node: '>= 10.0.0'} + dev: true + /unpipe@1.0.0: resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==} engines: {node: '>= 0.8'}