Update for new structure in site-shared (#6154)

Accounts for a recent change in directory structure.
dart-lang · Oct 16, 2024 · cbb0d89 · cbb0d89
1 parent 6735643
commit cbb0d89
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/eleventy.config.js b/eleventy.config.js
@@ -75,7 +75,7 @@ export default function (eleventyConfig) {
 
   eleventyConfig.addPassthroughCopy('src/content/assets/dash');
   eleventyConfig.addPassthroughCopy('src/content/assets/js');
-  eleventyConfig.addPassthroughCopy({'site-shared/packages/inject_dartpad/lib/inject_dartpad.js': 'assets/js/inject_dartpad.js'});
+  eleventyConfig.addPassthroughCopy({'site-shared/pkgs/inject_dartpad/lib/inject_dartpad.js': 'assets/js/inject_dartpad.js'});
   eleventyConfig.addPassthroughCopy('src/content/assets/img', { expand: true });
   eleventyConfig.addPassthroughCopy('src/content/f', {
     expand: true,

diff --git a/examples/create_libraries/lib/hw_mp.dart b/examples/create_libraries/lib/hw_mp.dart
@@ -1,5 +1,5 @@
 /// A multi-platform Hello World library.
-library hw_mp;
+library;
 
 // #docregion export
 export 'src/hw_none.dart' // Stub implementation

diff --git a/examples/misc/lib/effective_dart/my_library.dart b/examples/misc/lib/effective_dart/my_library.dart
@@ -1,3 +1,4 @@
+// ignore_for_file: unnecessary_library_name
 library my_library;
 
 part 'some/other/file.dart';
diff --git a/examples/misc/lib/effective_dart/usage_bad.dart b/examples/misc/lib/effective_dart/usage_bad.dart
@@ -6,7 +6,7 @@
 // ignore_for_file: avoid_function_literals_in_foreach_calls, prefer_function_declarations_over_variables
 // ignore_for_file: prefer_adjacent_string_concatenation, prefer_is_not_empty, prefer_interpolation_to_compose_strings
 // ignore_for_file: unnecessary_this, always_declare_return_types, no_leading_underscores_for_local_identifiers
-// ignore_for_file: unchecked_use_of_nullable_value, unnecessary_library_directive
+// ignore_for_file: unchecked_use_of_nullable_value, unnecessary_library_directive, unnecessary_library_name
 
 // #docregion library-dir
 library my_library;

diff --git a/site-shared b/site-shared
diff --git a/src/content/effective-dart/usage.md b/src/content/effective-dart/usage.md
@@ -42,7 +42,7 @@ The preferred syntax is to use a URI string that points
 directly to the library file. 
 If you have some library, `my_library.dart`, that contains:
 
-<?code-excerpt "my_library.dart"?>
+<?code-excerpt "my_library.dart" remove="ignore_for_file"?>
 ```dart title="my_library.dart"
 library my_library;
 

diff --git a/tool/dart_site/pubspec.yaml b/tool/dart_site/pubspec.yaml
@@ -9,7 +9,7 @@ environment:
 dependencies:
   args: ^2.5.0
   excerpter:
-    path: ../../site-shared/packages/excerpter
+    path: ../../site-shared/pkgs/excerpter
   fbh_front_matter: ^0.0.1
   html_unescape: ^2.0.0
   intl: ^0.19.0
@@ -21,4 +21,4 @@ dependencies:
 
 dev_dependencies:
   analysis_defaults:
-    path: ../../site-shared/packages/analysis_defaults
+    path: ../../site-shared/pkgs/analysis_defaults
diff --git a/tool/get-dart/pubspec.yaml b/tool/get-dart/pubspec.yaml
@@ -11,4 +11,4 @@ workspace:
 
 dev_dependencies:
   analysis_defaults:
-    path: ../../site-shared/packages/analysis_defaults
+    path: ../../site-shared/pkgs/analysis_defaults