chore(): sync with main

chore(): sync with main

.github/workflows/dev-build.yml

@@ -1,75 +1,18 @@
 name: 'Ionic Dev Build'
 
 on:
-  workflow_dispatch
+  workflow_dispatch:
 
 jobs:
   dev-build:
     runs-on: ubuntu-latest
-    outputs:
-      version: ${{ steps.devBuild.outputs.version }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: 15.x
-          registry-url: 'https://registry.npmjs.org'
-      - name: Install Dependencies
-        run: npm install
-        shell: bash
       - name: Create Dev Build
         run: npm run release.dev -- --skip-prompt
         shell: bash
-      - name: Publish Core
-        run: npm publish --tag dev
-        working-directory: ./core
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Docs
-        run: npm publish --tag dev
-        working-directory: ./docs
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Angular
-        run: npm publish --tag dev
-        working-directory: ./angular
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Angular Server
-        run: npm publish --tag dev
-        working-directory: ./packages/angular-server
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish React
-        run: npm publish --tag dev
-        working-directory: ./packages/react
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish React Router
-        run: npm publish --tag dev
-        working-directory: ./packages/react-router
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Vue
-        run: npm publish --tag dev
-        working-directory: ./packages/vue
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Publish Vue Router
-        run: npm publish --tag dev
-        working-directory: ./packages/vue-router
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      - name: Wrap Up
-        id: devBuild
-        run: |
-          val=$(grep version package.json | sed 's/.*"version": "\(.*\)".*/\1/')
-          echo "::set-output name=version::$val"
-        working-directory: ./core
-  get-version:
-    name: Get your dev build!
-    runs-on: ubuntu-latest
-    needs: [dev-build]
-    steps:
-      - run: echo ${{ needs.dev-build.outputs.version }}
-
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.scripts/common.js

@@ -199,16 +199,6 @@ function preparePackage(tasks, package, version, install) {
   });
 }
 
-function installDevPackage(tasks, package) {
-  const projectRoot = projectPath(package);
-  const pkg = readPkg(package);
-
-  tasks.push({
-    title: `${pkg.name}: npm install`,
-    task: () => execa('npm', ['install', '--legacy-peer-deps'], { cwd: projectRoot })
-  });
-}
-
 function prepareDevPackage(tasks, package, version) {
   const projectRoot = projectPath(package);
   const pkg = readPkg(package);
@@ -221,20 +211,20 @@ function prepareDevPackage(tasks, package, version) {
         title: `${pkg.name}: npm link @ionic/core`,
         task: () => execa('npm', ['link', '@ionic/core', '--legacy-peer-deps'], { cwd: projectRoot })
       });
+
+      if (package === 'packages/react-router') {
+        projectTasks.push({
+          title: `${pkg.name}: npm link @ionic/react`,
+          task: () => execa('npm', ['link', '@ionic/react', '--legacy-peer-deps'], { cwd: projectRoot })
+        });
+      }
     }
 
     projectTasks.push({
       title: `${pkg.name}: update ionic/core dep to ${version}`,
       task: () => {
-
-        /**
-         * At this point, the version for the package
-         * has been changed so we need to re-fetch the
-         * package contents so we do not overwrite it.
-         */
-        const updatedPackage = readPkg(package);
-        updateDependency(updatedPackage, '@ionic/core', version);
-        writePkg(package, updatedPackage);
+        updateDependency(pkg, '@ionic/core', version);
+        writePkg(package, pkg);
       }
     });
 
@@ -243,7 +233,7 @@ function prepareDevPackage(tasks, package, version) {
       task: () => execa('npm', ['run', 'build'], { cwd: projectRoot })
     });
 
-    if (package === 'core') {
+    if (package === 'core' || package === 'packages/react') {
       projectTasks.push({
         title: `${pkg.name}: npm link`,
         task: () => execa('npm', ['link'], { cwd: projectRoot })
@@ -288,6 +278,17 @@ function updatePackageVersions(tasks, packages, version) {
         }
       });
     }
+
+    if (package === 'packages/react-router') {
+      tasks.push({
+        title: `${package} update @ionic/react dependency, if present ${dim(`(${version})`)}`,
+        task: async () => {
+          const pkg = readPkg(package);
+          updateDependency(pkg, '@ionic/react', version);
+          writePkg(package, pkg);
+        }
+      });
+    }
   });
 }
 
@@ -318,8 +319,8 @@ function copyPackageToDist(tasks, packages) {
   });
 }
 
-function verifyPackages(tasks, packages, version, npmTag = 'latest') {
-  // verify version
+function publishPackages(tasks, packages, version, npmTag = 'latest') {
+  // first verify version
   packages.forEach(package => {
     if (package === 'core') {
       return;
@@ -336,10 +337,6 @@ function verifyPackages(tasks, packages, version, npmTag = 'latest') {
       }
     });
   });
-}
-
-function publishPackages(tasks, packages, version, npmTag = 'latest') {
-  verifyPackages(tasks, packages, version, npmTag);
 
   // Publish
   packages.forEach(package => {
@@ -385,7 +382,6 @@ function copyCDNLoader(tasks, version) {
 }
 
 module.exports = {
-  installDevPackage,
   checkTestDist,
   checkGit,
   askNpmTag,
@@ -399,7 +395,6 @@ module.exports = {
   preparePackage,
   projectPath,
   publishPackages,
-  verifyPackages,
   readPkg,
   rootDir,
   updateDependency,

.scripts/release-dev.js

@@ -33,14 +33,7 @@ async function main() {
 
     const tasks = [];
 
-    packages.forEach(package => {
-      common.installDevPackage(tasks, package);
-    });
-
-    tasks.push({
-      title: 'Set package version changes',
-      task: async () => await setPackageVersionChanges(packages, devVersion)
-    })
+    await setPackageVersionChanges(packages, devVersion);
 
     packages.forEach(package => {
       common.prepareDevPackage(tasks, package, devVersion);
@@ -57,14 +50,13 @@ async function main() {
     console.log('\n', red(err), '\n');
     process.exit(1);
   }
+
+  orgPkg.forEach(pkg => {
+    fs.writeFileSync(pkg.filePath, pkg.packageContent);
+  });
 }
 
 async function askDevVersion(devVersion) {
-  const skipPrompt = process.argv.find(arg => arg === '--skip-prompt');
-  if (skipPrompt) {
-    console.log(`\n--skip-prompt was passed. Skipping dev build prompt.`)
-    return true;
-  }
 
   const prompts = [
     {
@@ -86,6 +78,9 @@ async function setPackageVersionChanges(packages, version) {
     if (package !== 'core') {
       const pkg = common.readPkg(package);
       common.updateDependency(pkg, '@ionic/core', version);
+      if(package === 'packages/react-router') {
+        common.updateDependency(pkg, '@ionic/react', version);
+      }
       common.writePkg(package, pkg);
     }
     const projectRoot = common.projectPath(package);

CHANGELOG.md

@@ -1,3 +1,12 @@
+## [5.9.1](https://github.com/ionic-team/ionic/compare/v5.9.0...v5.9.1) (2021-11-17)
+
+
+### Bug Fixes
+
+* **angular:** build is now in correct directory ([#24236](https://github.com/ionic-team/ionic/issues/24236)) ([1d983fa](https://github.com/ionic-team/ionic/commit/1d983fa4b3ef0457dc192f376e380c77b611d058))
+
+
+
 # [5.9.0](https://github.com/ionic-team/ionic/compare/v5.8.5...v5.9.0) (2021-11-17)