From 2057d19a9727521b9e12b0429c503647c32ab4ff Mon Sep 17 00:00:00 2001 From: CodeDoctorDE Date: Sat, 28 Sep 2024 09:41:17 +0200 Subject: [PATCH] Fix importing keeps id --- SECURITY.md | 3 +- api/lib/butterfly_api.dart | 2 +- api/lib/butterfly_text.dart | 7 ---- api/pubspec.lock | 10 ++--- api/pubspec.yaml | 2 +- app/lib/services/import.dart | 1 + app/pubspec.lock | 12 +++--- docs/package.json | 2 +- docs/pnpm-lock.yaml | 62 +++++++++++++++---------------- metadata/en-US/changelogs/116.txt | 4 ++ tools/pubspec.lock | 6 +-- tools/pubspec.yaml | 2 +- 12 files changed, 56 insertions(+), 57 deletions(-) create mode 100644 metadata/en-US/changelogs/116.txt diff --git a/SECURITY.md b/SECURITY.md index 47b1d295f277..0ab43f28ef3a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -5,7 +5,8 @@ | Version | Supported | | | ------- | ------------------ | -------------------------------------------------------------------------------------------------------------------------------- | | 2.2-dev | :warning: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0-rc.2) | -| 2.1.1 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | +| 2.2.0 | :white_check_mark: | [Docs](https://butterfly.linwood.dev/docs/2.2/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.2.0) | +| 2.1.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.1/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.1.1) | | 2.0.3 | :x: | [Docs](https://butterfly.linwood.dev/docs/2.0/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v2.0.3) | | 1.6.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.6/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.6.1) | | 1.5.1 | :x: | [Docs](https://butterfly.linwood.dev/docs/1.5/intro) [Release](https://github.com/LinwoodDev/butterfly/releases/tag/v1.5.1) | diff --git a/api/lib/butterfly_api.dart b/api/lib/butterfly_api.dart index 199ca386907a..b1f55b05bde6 100644 --- a/api/lib/butterfly_api.dart +++ b/api/lib/butterfly_api.dart @@ -1,7 +1,7 @@ /// Support for doing something awesome. /// /// More dartdocs go here. -library butterfly_api; +library; export 'butterfly_models.dart'; export 'butterfly_helpers.dart'; diff --git a/api/lib/butterfly_text.dart b/api/lib/butterfly_text.dart index 5ef14fb050e6..7fecb2192f68 100644 --- a/api/lib/butterfly_text.dart +++ b/api/lib/butterfly_text.dart @@ -1,8 +1 @@ -/// Support for doing something awesome. -/// -/// More dartdocs go here. -library butterfly_api; - export 'src/models/text.dart'; - -// TODO: Export any libraries intended for clients of this package. diff --git a/api/pubspec.lock b/api/pubspec.lock index 6159be28fcd3..10a0d449f9c3 100644 --- a/api/pubspec.lock +++ b/api/pubspec.lock @@ -298,10 +298,10 @@ packages: dependency: "direct dev" description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" logging: dependency: transitive description: @@ -595,10 +595,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77 + sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.5.1" vm_service: dependency: transitive description: @@ -664,4 +664,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.5.0-259.0.dev <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/api/pubspec.yaml b/api/pubspec.yaml index 1a8023340b9e..5e5abf675069 100644 --- a/api/pubspec.yaml +++ b/api/pubspec.yaml @@ -26,5 +26,5 @@ dev_dependencies: json_serializable: ^6.7.1 build_runner: ^2.4.9 freezed: ^2.5.2 - lints: ^4.0.0 + lints: ^5.0.0 analyzer: ^6.3.0 diff --git a/app/lib/services/import.dart b/app/lib/services/import.dart index 597c35bb81f8..35ede2e0e620 100644 --- a/app/lib/services/import.dart +++ b/app/lib/services/import.dart @@ -305,6 +305,7 @@ class ImportService { .toList(); final content = page.content + .map((e) => e.copyWith(id: createUniqueId())) .map((e) => Renderer.fromInstance(e) .transform(position: firstPos, relative: true) diff --git a/app/pubspec.lock b/app/pubspec.lock index 1aa9c3367002..83ee921c749d 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -706,10 +706,10 @@ packages: dependency: "direct main" description: name: idb_shim - sha256: "71098af49d9fc63e67b551d0ac59715ac1b519ef6db7e6704433a50bbcc9002b" + sha256: "9e7ec816139bfafb69ae4b3668ad29dbd43c53428d6eb31f9332d42bd4fa7205" url: "https://pub.dev" source: hosted - version: "2.6.1+6" + version: "2.6.1+7" image: dependency: "direct main" description: @@ -1198,10 +1198,10 @@ packages: dependency: transitive description: name: sembast - sha256: "4806604edc5bd9022fb0206c399236bdbc6c3fb49c3e3c5027915d93b1bca128" + sha256: "934a7b99297fb4f0b6e69fb1465286737b3b47b1a5149bf8dfc85667fbbdd21d" url: "https://pub.dev" source: hosted - version: "3.7.4+2" + version: "3.7.4+3" share_plus: dependency: "direct main" description: @@ -1387,10 +1387,10 @@ packages: dependency: transitive description: name: synchronized - sha256: "51b08572b9f091f8c3eb4d9d4be253f196ff0075d5ec9b10a884026d5b55d7bc" + sha256: "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225" url: "https://pub.dev" source: hosted - version: "3.3.0+2" + version: "3.3.0+3" term_glyph: dependency: transitive description: diff --git a/docs/package.json b/docs/package.json index 94b8ef4054c9..02b61f44f914 100644 --- a/docs/package.json +++ b/docs/package.json @@ -24,7 +24,7 @@ "sharp": "^0.33.5", "typescript": "^5.6.2" }, - "packageManager": "pnpm@9.10.0", + "packageManager": "pnpm@9.11.0", "devDependencies": { "sass": "^1.79.3" } diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml index 4c9031d979d5..e7b39151b42a 100644 --- a/docs/pnpm-lock.yaml +++ b/docs/pnpm-lock.yaml @@ -672,17 +672,17 @@ packages: cpu: [x64] os: [win32] - '@shikijs/core@1.19.0': - resolution: {integrity: sha512-314J5MPdS1wzfjuD856MXvbAI2wN03ofMnUGkZ5ZDBOza/d38paLwd+YVyuKrrjxJ4hfPMjc4tRmPkXd6UDMPQ==} + '@shikijs/core@1.20.0': + resolution: {integrity: sha512-KlO3iE0THzSdYkzDFugt8SHe6FR3qNYTkmpbdW1d6xo8juQkMjybxAw/cBi2npL2eb2F4PbbnSs5Z9tDusfvyg==} - '@shikijs/engine-javascript@1.19.0': - resolution: {integrity: sha512-D1sioU61n7fLWfDzTC9JNS19zEYZMr7qxkSVzv6ziEWDxnwzy2PvYoKPedJV4qUf+2VnrYPSaArDz2W0XgGB7A==} + '@shikijs/engine-javascript@1.20.0': + resolution: {integrity: sha512-ZUMo758uduM0Tfgzi/kd+0IKMbNdumCxxWjY36uf1DIs2Qyg9HIq3vA1Wfa/vc6HE7tHWFpANRi3mv7UzJ68MQ==} - '@shikijs/engine-oniguruma@1.19.0': - resolution: {integrity: sha512-/JxwIefNVLGB4EmpB8i6P4JB/oVYRuzSixbqvx7m6iPW0lQ1T97c/0wmA+JlKbngEiExckSuPwa48fajlShB7A==} + '@shikijs/engine-oniguruma@1.20.0': + resolution: {integrity: sha512-MQ40WkVTZk7by33ces4PGK6XNFSo6PYvKTSAr2kTWdRNhFmOcnaX+1XzvFwB26eySXR7U74t91czZ1qJkEgxTA==} - '@shikijs/types@1.19.0': - resolution: {integrity: sha512-NZvVp3k1bP4MTRUbmnkGhYzPdoNMjNLSAwczMRUbtUl4oj2LlNRNbwERyeIyJt56Ac9fvPVZ2nn13OXk86E5UQ==} + '@shikijs/types@1.20.0': + resolution: {integrity: sha512-y+EaDvU2K6/GaXOKXxJaGnr1XtmZMF7MfS0pSEDdxEq66gCtKsLwQvVwoQFdp7R7dLlNAro3ijEE19sMZ0pzqg==} '@shikijs/vscode-textmate@9.2.2': resolution: {integrity: sha512-TMp15K+GGYrWlZM8+Lnj9EaHEFmOen0WJBrfa17hF7taDOYthuPPV0GWzfd/9iMij0akS/8Yw2ikquH7uVi/fg==} @@ -1142,8 +1142,8 @@ packages: resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==} engines: {node: '>=8.6.0'} - fast-uri@3.0.1: - resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==} + fast-uri@3.0.2: + resolution: {integrity: sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==} fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} @@ -1914,8 +1914,8 @@ packages: resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==} engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0} - shiki@1.19.0: - resolution: {integrity: sha512-Ng7Gd6XgWFLsv4Z3so65hOyXjV78qz1M117MuZHwdPQD6fgb5wR2IoLMvSlM/Ml14EXH7n+/YxIpTD74i7kDdw==} + shiki@1.20.0: + resolution: {integrity: sha512-MZJJ1PCFsQB1Piq+25wiz0a75yUv8Q3/fzy7SzRx5ONdjdtGdyiKwYn8vb/FnK5kjS0voWGnPpjG16POauUR+g==} signal-exit@4.1.0: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} @@ -2398,7 +2398,7 @@ snapshots: remark-parse: 11.0.0 remark-rehype: 11.1.1 remark-smartypants: 3.0.2 - shiki: 1.19.0 + shiki: 1.20.0 unified: 11.0.5 unist-util-remove-position: 5.0.0 unist-util-visit: 5.0.0 @@ -2759,7 +2759,7 @@ snapshots: '@expressive-code/plugin-shiki@0.35.6': dependencies: '@expressive-code/core': 0.35.6 - shiki: 1.19.0 + shiki: 1.20.0 '@expressive-code/plugin-text-markers@0.35.6': dependencies: @@ -2983,27 +2983,27 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.22.4': optional: true - '@shikijs/core@1.19.0': + '@shikijs/core@1.20.0': dependencies: - '@shikijs/engine-javascript': 1.19.0 - '@shikijs/engine-oniguruma': 1.19.0 - '@shikijs/types': 1.19.0 + '@shikijs/engine-javascript': 1.20.0 + '@shikijs/engine-oniguruma': 1.20.0 + '@shikijs/types': 1.20.0 '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 hast-util-to-html: 9.0.3 - '@shikijs/engine-javascript@1.19.0': + '@shikijs/engine-javascript@1.20.0': dependencies: - '@shikijs/types': 1.19.0 + '@shikijs/types': 1.20.0 '@shikijs/vscode-textmate': 9.2.2 oniguruma-to-js: 0.4.3 - '@shikijs/engine-oniguruma@1.19.0': + '@shikijs/engine-oniguruma@1.20.0': dependencies: - '@shikijs/types': 1.19.0 + '@shikijs/types': 1.20.0 '@shikijs/vscode-textmate': 9.2.2 - '@shikijs/types@1.19.0': + '@shikijs/types@1.20.0': dependencies: '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 @@ -3158,7 +3158,7 @@ snapshots: ajv@8.17.1: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.0.1 + fast-uri: 3.0.2 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -3256,7 +3256,7 @@ snapshots: prompts: 2.4.2 rehype: 13.0.1 semver: 7.6.3 - shiki: 1.19.0 + shiki: 1.20.0 string-width: 7.2.0 strip-ansi: 7.1.0 tinyexec: 0.3.0 @@ -3564,7 +3564,7 @@ snapshots: merge2: 1.4.1 micromatch: 4.0.8 - fast-uri@3.0.1: {} + fast-uri@3.0.2: {} fastq@1.17.1: dependencies: @@ -4812,12 +4812,12 @@ snapshots: '@img/sharp-win32-ia32': 0.33.5 '@img/sharp-win32-x64': 0.33.5 - shiki@1.19.0: + shiki@1.20.0: dependencies: - '@shikijs/core': 1.19.0 - '@shikijs/engine-javascript': 1.19.0 - '@shikijs/engine-oniguruma': 1.19.0 - '@shikijs/types': 1.19.0 + '@shikijs/core': 1.20.0 + '@shikijs/engine-javascript': 1.20.0 + '@shikijs/engine-oniguruma': 1.20.0 + '@shikijs/types': 1.20.0 '@shikijs/vscode-textmate': 9.2.2 '@types/hast': 3.0.4 diff --git a/metadata/en-US/changelogs/116.txt b/metadata/en-US/changelogs/116.txt new file mode 100644 index 000000000000..5784b4970153 --- /dev/null +++ b/metadata/en-US/changelogs/116.txt @@ -0,0 +1,4 @@ +* Fix importing keeps id + +This is a stable release, it includes all the changes from the 2.2 nightly release. +Read more here: https://linwood.dev/butterfly/2.2 \ No newline at end of file diff --git a/tools/pubspec.lock b/tools/pubspec.lock index 1b3fe722bc03..a7083c19c4a5 100644 --- a/tools/pubspec.lock +++ b/tools/pubspec.lock @@ -61,10 +61,10 @@ packages: dependency: "direct main" description: name: lints - sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235" + sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "5.0.0" meta: dependency: transitive description: @@ -130,4 +130,4 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.4.0 <4.0.0" + dart: ">=3.5.0 <4.0.0" diff --git a/tools/pubspec.yaml b/tools/pubspec.yaml index 066dcb36b5d4..ea4e7be44c1e 100644 --- a/tools/pubspec.yaml +++ b/tools/pubspec.yaml @@ -4,6 +4,6 @@ environment: dependencies: args: ^2.5.0 intl: ^0.19.0 - lints: ^4.0.0 + lints: ^5.0.0 yaml: ^3.1.2 http: ^1.2.1