fix: initial step of project structure reorg (#2)

displaykit · Oct 10, 2022 · 241dfa7 · 241dfa7
1 parent abe1cb9
commit 241dfa7
Show file tree

Hide file tree

Showing 39 changed files with 337 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,6 +25,7 @@ jobs:
           flutter-version: "3.0.3"
       - name: "Start: Unit Testing"
         run: |
+          cd ./package
           flutter pub get
           yarn install
           yarn test
@@ -39,8 +40,9 @@ jobs:
       - uses: subosito/flutter-action@v1
         with:
           flutter-version: "3.0.3"
-      - name: "Start: Unit Testing"
+      - name: "Start: Lint"
         run: |
+          cd ./package
           flutter pub get
           yarn install
           yarn lint
@@ -60,5 +62,6 @@ jobs:
           VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
           VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID__DEMO_FLUTTER }}
         run: |
+          cd ./package
           yarn install
           yarn deploy:flutterweb:demopreview
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml
@@ -32,5 +32,6 @@ jobs:
         VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
         VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID__DEMO_FLUTTER }}
       run: |
+        cd ./package
         yarn install
         yarn deploy:flutterweb:demo
diff --git a/.github/workflows/release-base.yml b/.github/workflows/release-base.yml
@@ -24,6 +24,7 @@ jobs:
         flutter-version: '3.0.3'
     - name: "Start: Unit Testing"
       run: |
+        cd ./package
         flutter pub get
         yarn install
         yarn test
@@ -42,6 +43,7 @@ jobs:
         flutter-version: '3.0.3'
     - name: "Start: Unit Testing"
       run: |
+        cd ./package
         flutter pub get
         yarn install
         yarn lint
@@ -66,11 +68,13 @@ jobs:
           GIT_AUTHOR_NAME: "@bumper-bot"
           GITHUB_TOKEN: ${{ secrets.GH_GLOBAL_TOKEN }}
         run: |
+          cd ./package
           echo 'Run Flutter CI Steps'
           echo $GITHUB_TOKEN
           yarn build
           yarn release
       - name: Release GitHub Registry
         run: |
+          cd ./package
           echo '//npm.pkg.github.com/:_authToken=${{ secrets.GITHUB_TOKEN }}' > ~/.npmrc
           yarn release:github_registry
diff --git a/.github/workflows/release-dart.yml b/.github/workflows/release-dart.yml
@@ -21,6 +21,7 @@ jobs:
         node-version: '16'
     - name: Setup credentials
       run: | 
+        cd ./package
         git config --global user.email "13791385+omariosouto@users.noreply.github.com"
         git config --global user.name "CI Bot - DevSoutinho"
         npm run release:dart:clean
@@ -35,6 +36,10 @@ jobs:
         }
         EOF
     - name: Check Publish Warnings
-      run: pub publish --dry-run
+      run: |
+        cd ./package
+        pub publish --dry-run
     - name: Publish package
-      run: pub publish -f
+      run: |
+        cd ./package
+        pub publish -f
diff --git a/example/with_flutter_sample/pubspec.lock b/example/with_flutter_sample/pubspec.lock
@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.2"
+    version: "2.9.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -63,21 +63,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
+    version: "1.2.1"
   clock:
     dependency: transitive
     description:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   code_builder:
     dependency: transitive
     description:
@@ -126,7 +119,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   file:
     dependency: transitive
     description:
@@ -185,21 +178,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.11"
+    version: "0.12.12"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mockito:
     dependency: transitive
     description:
@@ -220,7 +213,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   pub_semver:
     dependency: transitive
     description:
@@ -231,10 +224,10 @@ packages:
   responsive_styles:
     dependency: "direct main"
     description:
-      name: responsive_styles
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
+      path: "../../package"
+      relative: true
+    source: path
+    version: "2.1.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -253,7 +246,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   stack_trace:
     dependency: transitive
     description:
@@ -274,21 +267,21 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.9"
+    version: "0.4.12"
   typed_data:
     dependency: transitive
     description:

diff --git a/example/with_flutter_sample/pubspec.yaml b/example/with_flutter_sample/pubspec.yaml
@@ -29,7 +29,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  responsive_styles: any
+  responsive_styles:
+    path: "../../package"
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2

diff --git a/.babelrc → package/.babelrc b/.babelrc → package/.babelrc
diff --git a/.eslintrc.js → package/.eslintrc.js b/.eslintrc.js → package/.eslintrc.js
diff --git a/.metadata → package/.metadata b/.metadata → package/.metadata
diff --git a/analysis_options.yaml → package/analysis_options.yaml b/analysis_options.yaml → package/analysis_options.yaml
diff --git a/jest.config.ts → package/jest.config.ts b/jest.config.ts → package/jest.config.ts
diff --git a/lib/breakpoints/breakpoints.dart → package/lib/breakpoints/breakpoints.dart b/lib/breakpoints/breakpoints.dart → package/lib/breakpoints/breakpoints.dart
diff --git a/lib/breakpoints/breakpoints.md → package/lib/breakpoints/breakpoints.md b/lib/breakpoints/breakpoints.md → package/lib/breakpoints/breakpoints.md
diff --git a/lib/breakpoints/breakpoints.ts → package/lib/breakpoints/breakpoints.ts b/lib/breakpoints/breakpoints.ts → package/lib/breakpoints/breakpoints.ts
diff --git a/lib/grid-item/grid_item.dart → package/lib/grid-item/grid_item.dart b/lib/grid-item/grid_item.dart → package/lib/grid-item/grid_item.dart
diff --git a/lib/grid-item/grid_item.md → package/lib/grid-item/grid_item.md b/lib/grid-item/grid_item.md → package/lib/grid-item/grid_item.md
diff --git a/lib/index.ts → package/lib/index.ts b/lib/index.ts → package/lib/index.ts
diff --git a/...snapshots__/parse-stylesheet.test.ts.snap → ...snapshots__/parse-stylesheet.test.ts.snap b/...snapshots__/parse-stylesheet.test.ts.snap → ...snapshots__/parse-stylesheet.test.ts.snap
diff --git a/...parse-stylesheet/parse-stylesheet.test.ts → ...parse-stylesheet/parse-stylesheet.test.ts b/...parse-stylesheet/parse-stylesheet.test.ts → ...parse-stylesheet/parse-stylesheet.test.ts
diff --git a/lib/parse-stylesheet/parse-stylesheet.ts → .../lib/parse-stylesheet/parse-stylesheet.ts b/lib/parse-stylesheet/parse-stylesheet.ts → .../lib/parse-stylesheet/parse-stylesheet.ts
diff --git a/lib/responsive/responsive.dart → package/lib/responsive/responsive.dart b/lib/responsive/responsive.dart → package/lib/responsive/responsive.dart
diff --git a/lib/responsive/responsive.md → package/lib/responsive/responsive.md b/lib/responsive/responsive.md → package/lib/responsive/responsive.md
diff --git a/lib/responsive_styles.dart → package/lib/responsive_styles.dart b/lib/responsive_styles.dart → package/lib/responsive_styles.dart
diff --git a/lib/stylesheet/properties/box-model.ts → ...ge/lib/stylesheet/properties/box-model.ts b/lib/stylesheet/properties/box-model.ts → ...ge/lib/stylesheet/properties/box-model.ts
diff --git a/lib/stylesheet/properties/flexbox.ts → package/lib/stylesheet/properties/flexbox.ts b/lib/stylesheet/properties/flexbox.ts → package/lib/stylesheet/properties/flexbox.ts
diff --git a/lib/stylesheet/responsive-property.ts → ...age/lib/stylesheet/responsive-property.ts b/lib/stylesheet/responsive-property.ts → ...age/lib/stylesheet/responsive-property.ts
diff --git a/lib/stylesheet/stylesheet.ts → package/lib/stylesheet/stylesheet.ts b/lib/stylesheet/stylesheet.ts → package/lib/stylesheet/stylesheet.ts
diff --git a/package.json → package/package.json b/package.json → package/package.json
@@ -32,8 +32,8 @@
     "bump:flutter": "node ./scripts/bumpFlutter.js",
     "postversion": "yarn bump:flutter && git add .",
     "deploy:flutterweb:demopreview": "node ./scripts/pullRequestPreview.js",
-    "deploy:flutterweb:demo_base": "cd example/with_flutter_sample && flutter pub get && flutter build web --web-renderer html && npx vercel ./build/web --confirm --token=$VERCEL_TOKEN_GLOBAL",
-    "deploy:flutterweb:demo": "cd example/with_flutter_sample && flutter pub get && flutter build web --web-renderer html && npx vercel ./build/web --confirm --token=$VERCEL_TOKEN_GLOBAL --prod"
+    "deploy:flutterweb:demo_base": "cd ../example/with_flutter_sample && flutter pub get && flutter build web --web-renderer html && npx vercel ./build/web --confirm --token=$VERCEL_TOKEN_GLOBAL",
+    "deploy:flutterweb:demo": "cd ../example/with_flutter_sample && flutter pub get && flutter build web --web-renderer html && npx vercel ./build/web --confirm --token=$VERCEL_TOKEN_GLOBAL --prod"
   },
   "dependencies": {},
   "devDependencies": {