Fix importing keeps id

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)      |

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';

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.

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"

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

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)

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:

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"
   }

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

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"

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