From 9abe1590e595716af94904d110a2dbf867fcfb80 Mon Sep 17 00:00:00 2001 From: JoeyDoey Date: Fri, 14 Jul 2023 19:48:08 -0700 Subject: [PATCH 1/3] wip --- package.json | 2 +- packages/cli/package.json | 2 +- packages/cli/src/lib/write-bedframe-config.ts | 10 +- packages/cli/src/lib/write-manifests.ts | 20 +- packages/cli/src/lib/write-package-json.ts | 8 +- packages/cli/src/lib/write-service-worker.ts | 4 +- packages/core/package.json | 2 +- pnpm-lock.yaml | 443 +++++++----------- 8 files changed, 189 insertions(+), 302 deletions(-) diff --git a/package.json b/package.json index 7daa6fc5..728953f9 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "@changesets/cli": "^2.26.1", "@commitlint/cli": "^17.4.4", "@commitlint/config-conventional": "^17.6.3", - "@types/chrome": "^0.0.237", + "@types/chrome": "^0.0.241", "@types/fs-extra": "^11.0.1", "@types/node": "^16.18.36", "@types/prompts": "^2.4.3", diff --git a/packages/cli/package.json b/packages/cli/package.json index 6a1e5e12..becaa9d0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -54,7 +54,7 @@ "@rollup/plugin-json": "^6.0.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-typescript": "^11.1.0", - "@types/chrome": "^0.0.237", + "@types/chrome": "^0.0.241", "@types/fs-extra": "^11.0.1", "@types/listr": "^0.14.4", "@types/node": "^16.18.36", diff --git a/packages/cli/src/lib/write-bedframe-config.ts b/packages/cli/src/lib/write-bedframe-config.ts index a1553cec..d1c35a24 100644 --- a/packages/cli/src/lib/write-bedframe-config.ts +++ b/packages/cli/src/lib/write-bedframe-config.ts @@ -41,13 +41,15 @@ import { getCustomFonts, getManifest, BuildConfig } from '@bedframe/core' import { manifests } from './src/manifests' export function createBedframeConfig({ command, mode }: BuildConfig): UserConfig { - const root = resolve(__dirname, './src') + const root = __dirname + const src = resolve(root, './src') + const outDir = resolve(root, 'dist', mode) return { root, resolve: { alias: { - '@': resolve(__dirname, './src'), + '@': src, }, }, plugins: [ @@ -74,11 +76,11 @@ export function createBedframeConfig({ command, mode }: BuildConfig): UserConfig rollupOptions: { input: {${ extensionType === 'sidepanel' - ? `welcome: resolve(root, 'sidepanels', 'welcome', 'index.html'),\nmain: resolve(root, 'sidepanels', 'main', 'index.html'),\n` + ? `welcome: resolve(src, 'sidepanels', 'welcome', 'index.html'),\n` : '' }${ extensionType === 'devtools' - ? `devtools: resolve(root, 'pages', 'devtools', 'sidepanel.html'),\n` + ? `devtools: resolve(src, 'pages', 'devtools', 'sidepanel.html'),\n` : '' }${overridePage !== 'none' ? getOverridePage(overridePage) : ''} }, diff --git a/packages/cli/src/lib/write-manifests.ts b/packages/cli/src/lib/write-manifests.ts index 0604728e..4aae692a 100644 --- a/packages/cli/src/lib/write-manifests.ts +++ b/packages/cli/src/lib/write-manifests.ts @@ -25,10 +25,10 @@ import { import pkg from '../../package.json' export const icons = createManifestIcons({ - 16: 'assets/icons/icon-16x16.png', - 32: 'assets/icons/icon-32x32.png', - 48: 'assets/icons/icon-48x48.png', - 128: 'assets/icons/icon-128x128.png', + 16: 'src/assets/icons/icon-16x16.png', + 32: 'src/assets/icons/icon-32x32.png', + 48: 'src/assets/icons/icon-48x48.png', + 128: 'src/assets/icons/icon-128x128.png', }) export const action: ManifestAction = { @@ -86,11 +86,11 @@ export const contentScripts: ManifestContentScripts = [ export const webAccessibleResources: ManifestWebAccessibleResources = [ { resources: [ - 'assets/icons/*.png', - 'assets/fonts/inter/Inter-Bold.ttf', - 'assets/fonts/inter/Inter-ExtraBold.ttf', - 'assets/fonts/inter/Inter-Regular.ttf', - 'assets/fonts/inter/Inter-SemiBold.ttf', + 'src/assets/icons/*.png', + 'src/assets/fonts/inter/Inter-Bold.ttf', + 'src/assets/fonts/inter/Inter-ExtraBold.ttf', + 'src/assets/fonts/inter/Inter-Regular.ttf', + 'src/assets/fonts/inter/Inter-SemiBold.ttf', ], matches: [''], }, @@ -165,7 +165,7 @@ export function manifestForBrowser( const { name: extensionType } = type const optionsUI = `options_ui: { - page: 'pages/options/index.html', + page: 'src/pages/options/index.html', open_in_tab: false, }` diff --git a/packages/cli/src/lib/write-package-json.ts b/packages/cli/src/lib/write-package-json.ts index efd6e61d..c603f669 100644 --- a/packages/cli/src/lib/write-package-json.ts +++ b/packages/cli/src/lib/write-package-json.ts @@ -259,9 +259,9 @@ export function createDependenciesFrom(response: prompts.Answers): { }, { devDependencies: [ - { name: '@bedframe/core', version: '^0.0.17' }, + { name: '@bedframe/core', version: '^0.0.18' }, { name: '@crxjs/vite-plugin', version: '^1.0.14' }, - { name: '@types/chrome', version: '^0.0.237' }, + { name: '@types/chrome', version: '^0.0.241' }, { name: '@types/react', version: '^18.2.9' }, { name: '@types/react-dom', version: '^18.2.4' }, { name: '@types/react-frame-component', version: '^4.1.3' }, @@ -288,10 +288,6 @@ export function createDependenciesFrom(response: prompts.Answers): { { name: 'eslint-plugin-react', version: '^7.32.2' }, { name: 'eslint-plugin-react-hooks', version: '^4.6.0' }, { name: 'eslint-plugin-react-refresh', version: '^0.4.1' }, - // { - // name: 'eslint-config-standard-with-typescript', - // version: '^34.0.0', - // }, { name: 'prettier', version: '^2.8.8' }, ].sort((a, b) => a.name.localeCompare(b.name)), }, diff --git a/packages/cli/src/lib/write-service-worker.ts b/packages/cli/src/lib/write-service-worker.ts index db6b6b59..2543a22c 100644 --- a/packages/cli/src/lib/write-service-worker.ts +++ b/packages/cli/src/lib/write-service-worker.ts @@ -64,8 +64,8 @@ const eventListeners = (isSidePanel: boolean) => onInstalled(isSidePanel) + onConnect + onStartup + onSuspend const sidePanels = ` -const welcomePanel = 'sidepanels/welcome/index.html' -const mainPanel = 'sidepanels/main/index.html' +const welcomePanel = 'src/sidepanels/welcome/index.html' +const mainPanel = 'src/sidepanels/main/index.html' /** * Fires when the active tab in a window changes. diff --git a/packages/core/package.json b/packages/core/package.json index fa43bd63..b964bc27 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,7 +38,7 @@ "@crxjs/vite-plugin": "^1.0.14" }, "devDependencies": { - "@types/chrome": "^0.0.237", + "@types/chrome": "^0.0.241", "@types/node": "^16.18.36", "@typescript-eslint/eslint-plugin": "^5.59.8", "@vitejs/plugin-react": "^4.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f2894870..682a89c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,7 +76,7 @@ importers: dependencies: '@bedframe/core': specifier: '*' - version: link:../core + version: 0.0.17(vite@4.4.4) commander: specifier: ^10.0.0 version: 10.0.0 @@ -118,8 +118,8 @@ importers: specifier: ^11.1.0 version: 11.1.1(rollup@3.25.1)(tslib@2.5.3)(typescript@4.9.5) '@types/chrome': - specifier: ^0.0.237 - version: 0.0.237 + specifier: ^0.0.241 + version: 0.0.241 '@types/fs-extra': specifier: ^11.0.1 version: 11.0.1 @@ -152,7 +152,7 @@ importers: version: 5.3.0(rollup@3.25.1)(typescript@4.9.5) rollup-plugin-esbuild: specifier: ^5.0.0 - version: 5.0.0(esbuild@0.18.4)(rollup@3.25.1) + version: 5.0.0(esbuild@0.18.12)(rollup@3.25.1) rollup-plugin-string: specifier: ^3.0.0 version: 3.0.0 @@ -170,8 +170,8 @@ importers: version: 1.0.14(vite@4.3.9) devDependencies: '@types/chrome': - specifier: ^0.0.237 - version: 0.0.237 + specifier: ^0.0.241 + version: 0.0.241 '@types/node': specifier: ^16.18.36 version: 16.18.36 @@ -192,7 +192,7 @@ importers: version: 1.8.0 rollup-plugin-node-externals: specifier: ^6.1.1 - version: 6.1.1(rollup@3.25.1) + version: 6.1.1(rollup@3.26.2) tslib: specifier: ^2.5.3 version: 2.5.3 @@ -210,7 +210,7 @@ importers: version: 1.0.6(vite@4.3.9) vite-plugin-dts: specifier: ^2.1.0 - version: 2.3.0(@types/node@16.18.36)(rollup@3.25.1)(vite@4.3.9) + version: 2.3.0(@types/node@16.18.36)(rollup@3.26.2)(vite@4.3.9) vite-plugin-externalize-deps: specifier: ^0.6.0 version: 0.6.0(vite@4.3.9) @@ -225,20 +225,20 @@ importers: version: link:../cli '@bedframe/core': specifier: '*' - version: link:../core + version: 0.0.17(vite@4.3.9) devDependencies: '@rollup/plugin-node-resolve': specifier: ^15.1.0 - version: 15.1.0(rollup@3.25.1) + version: 15.1.0(rollup@3.26.2) '@rollup/plugin-typescript': specifier: ^11.1.1 - version: 11.1.1(rollup@3.25.1)(tslib@2.5.3)(typescript@5.0.2) + version: 11.1.1(rollup@3.26.2)(tslib@2.5.3)(typescript@5.0.2) rollup-plugin-dts: specifier: ^5.3.0 - version: 5.3.0(rollup@3.25.1)(typescript@5.0.2) + version: 5.3.0(rollup@3.26.2)(typescript@5.0.2) rollup-plugin-esbuild: specifier: ^5.0.0 - version: 5.0.0(esbuild@0.18.4)(rollup@3.25.1) + version: 5.0.0(esbuild@0.18.12)(rollup@3.26.2) rollup-plugin-string: specifier: ^3.0.0 version: 3.0.0 @@ -250,7 +250,7 @@ importers: version: 4.3.9(@types/node@16.18.36) vite-plugin-dts: specifier: ^2.3.0 - version: 2.3.0(@types/node@16.18.36)(rollup@3.25.1)(vite@4.3.9) + version: 2.3.0(@types/node@16.18.36)(rollup@3.26.2)(vite@4.3.9) packages/eslint-config-bedframe: dependencies: @@ -287,7 +287,7 @@ importers: version: 4.3.9(@types/node@16.18.36) vite-plugin-dts: specifier: ^2.3.0 - version: 2.3.0(@types/node@16.18.36)(rollup@3.25.1)(vite@4.3.9) + version: 2.3.0(@types/node@16.18.36)(vite@4.3.9) packages/tsconfig: {} @@ -527,6 +527,24 @@ packages: '@babel/helper-validator-identifier': 7.22.5 to-fast-properties: 2.0.0 + /@bedframe/core@0.0.17(vite@4.3.9): + resolution: {integrity: sha512-PPFR4Q/pRZkTMeE8nqGyLvJ7NYZUqlbo3SZDCLDE3OqABmhH2zVK2OQ0NHKZjFNP5yJYO7A9PTuOW5Jp0IYFbw==} + dependencies: + '@crxjs/vite-plugin': 1.0.14(vite@4.3.9) + transitivePeerDependencies: + - supports-color + - vite + dev: false + + /@bedframe/core@0.0.17(vite@4.4.4): + resolution: {integrity: sha512-PPFR4Q/pRZkTMeE8nqGyLvJ7NYZUqlbo3SZDCLDE3OqABmhH2zVK2OQ0NHKZjFNP5yJYO7A9PTuOW5Jp0IYFbw==} + dependencies: + '@crxjs/vite-plugin': 1.0.14(vite@4.4.4) + transitivePeerDependencies: + - supports-color + - vite + dev: false + /@changesets/apply-release-plan@6.1.3: resolution: {integrity: sha512-ECDNeoc3nfeAe1jqJb5aFQX7CqzQhD2klXRez2JDb/aVpGUbX673HgKrnrgJRuQR/9f2TtLoYIzrGB9qwD77mg==} dependencies: @@ -914,6 +932,33 @@ packages: - supports-color dev: false + /@crxjs/vite-plugin@1.0.14(vite@4.4.4): + resolution: {integrity: sha512-emOueVCqFRFmpcfT80Xsm4mfuFw9VSp5GY4eh5qeLDeiP81g0hddlobVQCo0pE2ZvNnWbyhLrXEYAaMAXjNL6A==} + engines: {node: '>=14'} + peerDependencies: + vite: ^2.9.0 + dependencies: + '@rollup/pluginutils': 4.2.1 + '@webcomponents/custom-elements': 1.6.0 + acorn-walk: 8.2.0 + cheerio: 1.0.0-rc.12 + connect-injector: 0.4.4 + debug: 4.3.4 + es-module-lexer: 0.10.5 + fast-glob: 3.2.12 + fs-extra: 10.1.0 + jsesc: 3.0.2 + magic-string: 0.26.7 + picocolors: 1.0.0 + react-refresh: 0.13.0 + rollup: 2.79.1 + vite: 4.4.4(@types/node@16.18.36) + optionalDependencies: + '@vitejs/plugin-react': 4.0.1(vite@4.4.4) + transitivePeerDependencies: + - supports-color + dev: false + /@cspotcode/source-map-support@0.8.1: resolution: {integrity: sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==} engines: {node: '>=12'} @@ -956,16 +1001,6 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: false - optional: true - - /@esbuild/android-arm64@0.18.4: - resolution: {integrity: sha512-yQVgO+V307hA2XhzELQ6F91CBGX7gSnlVGAj5YIqjQOxThDpM7fOcHT2YLJbE6gNdPtgRSafQrsK8rJ9xHCaZg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true optional: true /@esbuild/android-arm@0.17.19: @@ -982,16 +1017,6 @@ packages: cpu: [arm] os: [android] requiresBuild: true - dev: false - optional: true - - /@esbuild/android-arm@0.18.4: - resolution: {integrity: sha512-yKmQC9IiuvHdsNEbPHSprnMHg6OhL1cSeQZLzPpgzJBJ9ppEg9GAZN8MKj1TcmB4tZZUrq5xjK7KCmhwZP8iDA==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true - dev: true optional: true /@esbuild/android-x64@0.17.19: @@ -1008,16 +1033,6 @@ packages: cpu: [x64] os: [android] requiresBuild: true - dev: false - optional: true - - /@esbuild/android-x64@0.18.4: - resolution: {integrity: sha512-yLKXMxQg6sk1ntftxQ5uwyVgG4/S2E7UoOCc5N4YZW7fdkfRiYEXqm7CMuIfY2Vs3FTrNyKmSfNevIuIvJnMww==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true - dev: true optional: true /@esbuild/darwin-arm64@0.17.19: @@ -1034,16 +1049,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: false - optional: true - - /@esbuild/darwin-arm64@0.18.4: - resolution: {integrity: sha512-MVPEoZjZpk2xQ1zckZrb8eQuQib+QCzdmMs3YZAYEQPg+Rztk5pUxGyk8htZOC8Z38NMM29W+MqY9Sqo/sDGKw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true optional: true /@esbuild/darwin-x64@0.17.19: @@ -1060,16 +1065,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: false - optional: true - - /@esbuild/darwin-x64@0.18.4: - resolution: {integrity: sha512-uEsRtYRUDsz7i2tXg/t/SyF+5gU1cvi9B6B8i5ebJgtUUHJYWyIPIesmIOL4/+bywjxsDMA/XrNFMgMffLnh5A==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true optional: true /@esbuild/freebsd-arm64@0.17.19: @@ -1086,16 +1081,6 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: false - optional: true - - /@esbuild/freebsd-arm64@0.18.4: - resolution: {integrity: sha512-I8EOigqWnOHRin6Zp5Y1cfH3oT54bd7Sdz/VnpUNksbOtfp8IWRTH4pgkgO5jWaRQPjCpJcOpdRjYAMjPt8wXg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true optional: true /@esbuild/freebsd-x64@0.17.19: @@ -1112,16 +1097,6 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: false - optional: true - - /@esbuild/freebsd-x64@0.18.4: - resolution: {integrity: sha512-1bHfgMz/cNMjbpsYxjVgMJ1iwKq+NdDPlACBrWULD7ZdFmBQrhMicMaKb5CdmdVyvIwXmasOuF4r6Iq574kUTA==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true optional: true /@esbuild/linux-arm64@0.17.19: @@ -1138,16 +1113,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-arm64@0.18.4: - resolution: {integrity: sha512-J42vLHaYREyiBwH0eQE4/7H1DTfZx8FuxyWSictx4d7ezzuKE3XOkIvOg+SQzRz7T9HLVKzq2tvbAov4UfufBw==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-arm@0.17.19: @@ -1164,16 +1129,6 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-arm@0.18.4: - resolution: {integrity: sha512-4XCGqM/Ay1LCXUBH59bL4JbSbbTK1K22dWHymWMGaEh2sQCDOUw+OQxozYV/YdBb91leK2NbuSrE2BRamwgaYw==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-ia32@0.17.19: @@ -1190,16 +1145,6 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-ia32@0.18.4: - resolution: {integrity: sha512-4ksIqFwhq7OExty7Sl1n0vqQSCqTG4sU6i99G2yuMr28CEOUZ/60N+IO9hwI8sIxBqmKmDgncE1n5CMu/3m0IA==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-loong64@0.17.19: @@ -1216,16 +1161,6 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-loong64@0.18.4: - resolution: {integrity: sha512-bsWtoVHkGQgAsFXioDueXRiUIfSGrVkJjBBz4gcBJxXcD461cWFQFyu8Fxdj9TP+zEeqJ8C/O4LFFMBNi6Fscw==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-mips64el@0.17.19: @@ -1242,16 +1177,6 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-mips64el@0.18.4: - resolution: {integrity: sha512-LRD9Fu8wJQgIOOV1o3nRyzrheFYjxA0C1IVWZ93eNRRWBKgarYFejd5WBtrp43cE4y4D4t3qWWyklm73Mrsd/g==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-ppc64@0.17.19: @@ -1268,16 +1193,6 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-ppc64@0.18.4: - resolution: {integrity: sha512-jtQgoZjM92gauVRxNaaG/TpL3Pr4WcL3Pwqi9QgdrBGrEXzB+twohQiWNSTycs6lUygakos4mm2h0B9/SHveng==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-riscv64@0.17.19: @@ -1294,16 +1209,6 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-riscv64@0.18.4: - resolution: {integrity: sha512-7WaU/kRZG0VCV09Xdlkg6LNAsfU9SAxo6XEdaZ8ffO4lh+DZoAhGTx7+vTMOXKxa+r2w1LYDGxfJa2rcgagMRA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-s390x@0.17.19: @@ -1320,16 +1225,6 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-s390x@0.18.4: - resolution: {integrity: sha512-D19ed0xreKQvC5t+ArE2njSnm18WPpE+1fhwaiJHf+Xwqsq+/SUaV8Mx0M27nszdU+Atq1HahrgCOZCNNEASUg==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/linux-x64@0.17.19: @@ -1346,16 +1241,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: false - optional: true - - /@esbuild/linux-x64@0.18.4: - resolution: {integrity: sha512-Rx3AY1sxyiO/gvCGP00nL69L60dfmWyjKWY06ugpB8Ydpdsfi3BHW58HWC24K3CAjAPSwxcajozC2PzA9JBS1g==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true optional: true /@esbuild/netbsd-x64@0.17.19: @@ -1372,16 +1257,6 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: false - optional: true - - /@esbuild/netbsd-x64@0.18.4: - resolution: {integrity: sha512-AaShPmN9c6w1mKRpliKFlaWcSkpBT4KOlk93UfFgeI3F3cbjzdDKGsbKnOZozmYbE1izZKLmNJiW0sFM+A5JPA==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true optional: true /@esbuild/openbsd-x64@0.17.19: @@ -1398,16 +1273,6 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: false - optional: true - - /@esbuild/openbsd-x64@0.18.4: - resolution: {integrity: sha512-tRGvGwou3BrvHVvF8HxTqEiC5VtPzySudS9fh2jBIKpLX7HCW8jIkW+LunkFDNwhslx4xMAgh0jAHsx/iCymaQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true optional: true /@esbuild/sunos-x64@0.17.19: @@ -1424,16 +1289,6 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - dev: false - optional: true - - /@esbuild/sunos-x64@0.18.4: - resolution: {integrity: sha512-acORFDI95GKhmAnlH8EarBeuqoy/j3yxIU+FDB91H3+ZON+8HhTadtT450YkaMzX6lEWbhi+mjVUCj00M5yyOQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true optional: true /@esbuild/win32-arm64@0.17.19: @@ -1450,16 +1305,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-arm64@0.18.4: - resolution: {integrity: sha512-1NxP+iOk8KSvS1L9SSxEvBAJk39U0GiGZkiiJGbuDF9G4fG7DSDw6XLxZMecAgmvQrwwx7yVKdNN3GgNh0UfKg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true optional: true /@esbuild/win32-ia32@0.17.19: @@ -1476,16 +1321,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-ia32@0.18.4: - resolution: {integrity: sha512-OKr8jze93vbgqZ/r23woWciTixUwLa976C9W7yNBujtnVHyvsL/ocYG61tsktUfJOpyIz5TsohkBZ6Lo2+PCcQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true optional: true /@esbuild/win32-x64@0.17.19: @@ -1502,16 +1337,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: false - optional: true - - /@esbuild/win32-x64@0.18.4: - resolution: {integrity: sha512-qJr3wVvcLjPFcV4AMDS3iquhBfTef2zo/jlm8RMxmiRp3Vy2HY8WMxrykJlcbCnqLXZPA0YZxZGND6eug85ogg==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true optional: true /@eslint-community/eslint-utils@4.4.0(eslint@7.32.0): @@ -1728,6 +1553,24 @@ packages: rollup: 3.25.1 dev: true + /@rollup/plugin-node-resolve@15.1.0(rollup@3.26.2): + resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.78.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@types/resolve': 1.20.2 + deepmerge: 4.3.1 + is-builtin-module: 3.2.1 + is-module: 1.0.0 + resolve: 1.22.2 + rollup: 3.26.2 + dev: true + /@rollup/plugin-typescript@11.1.1(rollup@3.25.1)(tslib@2.5.3)(typescript@4.9.5): resolution: {integrity: sha512-Ioir+x5Bejv72Lx2Zbz3/qGg7tvGbxQZALCLoJaGrkNXak/19+vKgKYJYM3i/fJxvsb23I9FuFQ8CUBEfsmBRg==} engines: {node: '>=14.0.0'} @@ -1748,7 +1591,7 @@ packages: typescript: 4.9.5 dev: true - /@rollup/plugin-typescript@11.1.1(rollup@3.25.1)(tslib@2.5.3)(typescript@5.0.2): + /@rollup/plugin-typescript@11.1.1(rollup@3.26.2)(tslib@2.5.3)(typescript@5.0.2): resolution: {integrity: sha512-Ioir+x5Bejv72Lx2Zbz3/qGg7tvGbxQZALCLoJaGrkNXak/19+vKgKYJYM3i/fJxvsb23I9FuFQ8CUBEfsmBRg==} engines: {node: '>=14.0.0'} peerDependencies: @@ -1761,9 +1604,9 @@ packages: tslib: optional: true dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@rollup/pluginutils': 5.0.2(rollup@3.26.2) resolve: 1.22.2 - rollup: 3.25.1 + rollup: 3.26.2 tslib: 2.5.3 typescript: 5.0.2 dev: true @@ -1791,6 +1634,21 @@ packages: rollup: 3.25.1 dev: true + /@rollup/pluginutils@5.0.2(rollup@3.26.2): + resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.1 + estree-walker: 2.0.2 + picomatch: 2.3.1 + rollup: 3.26.2 + dev: true + /@rushstack/eslint-patch@1.3.2: resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==} dev: false @@ -1922,6 +1780,13 @@ packages: '@types/har-format': 1.2.11 dev: true + /@types/chrome@0.0.241: + resolution: {integrity: sha512-3WxC2D8zhyDnCU1GxyznoyUulLH6ReLWUWQm5LSM7S1rvV9w+k8TUNbWrFavk6zz2E1ws05lNawnSa7rK5kY8Q==} + dependencies: + '@types/filesystem': 0.0.32 + '@types/har-format': 1.2.11 + dev: true + /@types/estree@1.0.1: resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==} dev: true @@ -2220,6 +2085,21 @@ packages: transitivePeerDependencies: - supports-color + /@vitejs/plugin-react@4.0.1(vite@4.4.4): + resolution: {integrity: sha512-g25lL98essfeSj43HJ0o4DMp0325XK0ITkxpgChzJU/CyemgyChtlxfnRbjfwxDGCTRxTiXtQAsdebQXKMRSOA==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: ^4.2.0 + dependencies: + '@babel/core': 7.22.5 + '@babel/plugin-transform-react-jsx-self': 7.22.5(@babel/core@7.22.5) + '@babel/plugin-transform-react-jsx-source': 7.22.5(@babel/core@7.22.5) + react-refresh: 0.14.0 + vite: 4.4.4(@types/node@16.18.36) + transitivePeerDependencies: + - supports-color + optional: true + /@vitest/expect@0.32.2: resolution: {integrity: sha512-6q5yzweLnyEv5Zz1fqK5u5E83LU+gOMVBDuxBl2d2Jfx1BAp5M+rZgc5mlyqdnxquyoiOXpXmFNkcGcfFnFH3Q==} dependencies: @@ -3474,37 +3354,6 @@ packages: '@esbuild/win32-arm64': 0.18.12 '@esbuild/win32-ia32': 0.18.12 '@esbuild/win32-x64': 0.18.12 - dev: false - - /esbuild@0.18.4: - resolution: {integrity: sha512-9rxWV/Cb2DMUXfe9aUsYtqg0KTlw146ElFH22kYeK9KVV1qT082X4lpmiKsa12ePiCcIcB686TQJxaGAa9TFvA==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.18.4 - '@esbuild/android-arm64': 0.18.4 - '@esbuild/android-x64': 0.18.4 - '@esbuild/darwin-arm64': 0.18.4 - '@esbuild/darwin-x64': 0.18.4 - '@esbuild/freebsd-arm64': 0.18.4 - '@esbuild/freebsd-x64': 0.18.4 - '@esbuild/linux-arm': 0.18.4 - '@esbuild/linux-arm64': 0.18.4 - '@esbuild/linux-ia32': 0.18.4 - '@esbuild/linux-loong64': 0.18.4 - '@esbuild/linux-mips64el': 0.18.4 - '@esbuild/linux-ppc64': 0.18.4 - '@esbuild/linux-riscv64': 0.18.4 - '@esbuild/linux-s390x': 0.18.4 - '@esbuild/linux-x64': 0.18.4 - '@esbuild/netbsd-x64': 0.18.4 - '@esbuild/openbsd-x64': 0.18.4 - '@esbuild/sunos-x64': 0.18.4 - '@esbuild/win32-arm64': 0.18.4 - '@esbuild/win32-ia32': 0.18.4 - '@esbuild/win32-x64': 0.18.4 - dev: true /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -5950,7 +5799,7 @@ packages: '@babel/code-frame': 7.22.5 dev: true - /rollup-plugin-dts@5.3.0(rollup@3.25.1)(typescript@5.0.2): + /rollup-plugin-dts@5.3.0(rollup@3.26.2)(typescript@5.0.2): resolution: {integrity: sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==} engines: {node: '>=v14'} peerDependencies: @@ -5958,13 +5807,13 @@ packages: typescript: ^4.1 || ^5.0 dependencies: magic-string: 0.30.0 - rollup: 3.25.1 + rollup: 3.26.2 typescript: 5.0.2 optionalDependencies: '@babel/code-frame': 7.22.5 dev: true - /rollup-plugin-esbuild@5.0.0(esbuild@0.18.4)(rollup@3.25.1): + /rollup-plugin-esbuild@5.0.0(esbuild@0.18.12)(rollup@3.25.1): resolution: {integrity: sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==} engines: {node: '>=14.18.0', npm: '>=8.0.0'} peerDependencies: @@ -5974,7 +5823,7 @@ packages: '@rollup/pluginutils': 5.0.2(rollup@3.25.1) debug: 4.3.4 es-module-lexer: 1.3.0 - esbuild: 0.18.4 + esbuild: 0.18.12 joycon: 3.1.1 jsonc-parser: 3.2.0 rollup: 3.25.1 @@ -5982,13 +5831,31 @@ packages: - supports-color dev: true - /rollup-plugin-node-externals@6.1.1(rollup@3.25.1): + /rollup-plugin-esbuild@5.0.0(esbuild@0.18.12)(rollup@3.26.2): + resolution: {integrity: sha512-1cRIOHAPh8WQgdQQyyvFdeOdxuiyk+zB5zJ5+YOwrZP4cJ0MT3Fs48pQxrZeyZHcn+klFherytILVfE4aYrneg==} + engines: {node: '>=14.18.0', npm: '>=8.0.0'} + peerDependencies: + esbuild: '>=0.10.1' + rollup: ^1.20.0 || ^2.0.0 || ^3.0.0 + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + debug: 4.3.4 + es-module-lexer: 1.3.0 + esbuild: 0.18.12 + joycon: 3.1.1 + jsonc-parser: 3.2.0 + rollup: 3.26.2 + transitivePeerDependencies: + - supports-color + dev: true + + /rollup-plugin-node-externals@6.1.1(rollup@3.26.2): resolution: {integrity: sha512-127OFMkpH5rBVlRHRBDUMk1m1sGuzbGy7so5aj/IkpUb2r3+wOWjR/erUzd2ChEQWPsxsyQG6xpYYvPBAdcBRA==} engines: {node: '>=16.0.0'} peerDependencies: rollup: ^3.0.0 dependencies: - rollup: 3.25.1 + rollup: 3.26.2 dev: true /rollup-plugin-string@3.0.0: @@ -6024,7 +5891,6 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: false /run-applescript@5.0.0: resolution: {integrity: sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==} @@ -6896,7 +6762,30 @@ packages: - supports-color dev: true - /vite-plugin-dts@2.3.0(@types/node@16.18.36)(rollup@3.25.1)(vite@4.3.9): + /vite-plugin-dts@2.3.0(@types/node@16.18.36)(rollup@3.26.2)(vite@4.3.9): + resolution: {integrity: sha512-WbJgGtsStgQhdm3EosYmIdTGbag5YQpZ3HXWUAPCDyoXI5qN6EY0V7NXq0lAmnv9hVQsvh0htbYcg0Or5Db9JQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: '>=2.9.0' + dependencies: + '@babel/parser': 7.22.5 + '@microsoft/api-extractor': 7.35.4(@types/node@16.18.36) + '@rollup/pluginutils': 5.0.2(rollup@3.26.2) + '@rushstack/node-core-library': 3.59.4(@types/node@16.18.36) + debug: 4.3.4 + fast-glob: 3.2.12 + fs-extra: 10.1.0 + kolorist: 1.8.0 + magic-string: 0.29.0 + ts-morph: 18.0.0 + vite: 4.3.9(@types/node@16.18.36) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + dev: true + + /vite-plugin-dts@2.3.0(@types/node@16.18.36)(vite@4.3.9): resolution: {integrity: sha512-WbJgGtsStgQhdm3EosYmIdTGbag5YQpZ3HXWUAPCDyoXI5qN6EY0V7NXq0lAmnv9hVQsvh0htbYcg0Or5Db9JQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: From 4aaedbc392fae3bd5c99acfb4c3f4d8fb95e7cd5 Mon Sep 17 00:00:00 2001 From: JoeyDoey Date: Fri, 14 Jul 2023 19:50:24 -0700 Subject: [PATCH 2/3] feat(project gen): update root dir; update project gen a lil mbit --- packages/cli/public/stubs/tsconfig/tsconfig.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/cli/public/stubs/tsconfig/tsconfig.json b/packages/cli/public/stubs/tsconfig/tsconfig.json index adce67d4..ff8808e5 100644 --- a/packages/cli/public/stubs/tsconfig/tsconfig.json +++ b/packages/cli/public/stubs/tsconfig/tsconfig.json @@ -21,9 +21,8 @@ "noFallthroughCasesInSwitch": true, /* Path aliases */ - "baseUrl": ".", "paths": { - "@/*": ["src/*"] + "@/*": ["./src/*"] } }, "include": ["src"], From 558f631d9869baad9bc0b8ad5dce7488adcb4fe7 Mon Sep 17 00:00:00 2001 From: JoeyDoey Date: Fri, 14 Jul 2023 19:52:36 -0700 Subject: [PATCH 3/3] feat(changeset): project gen updates; bump deps etc --- .changeset/chilly-spoons-wash.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .changeset/chilly-spoons-wash.md diff --git a/.changeset/chilly-spoons-wash.md b/.changeset/chilly-spoons-wash.md new file mode 100644 index 00000000..7a4bde40 --- /dev/null +++ b/.changeset/chilly-spoons-wash.md @@ -0,0 +1,6 @@ +--- +'@bedframe/core': patch +'@bedframe/cli': patch +--- + +project gen updates; bump deps etc