From 1d983fa4b3ef0457dc192f376e380c77b611d058 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 17 Nov 2021 11:40:56 -0500 Subject: [PATCH 1/2] fix(angular): build is now in correct directory (#24236) * fix(): revert ded build changes * fix(); revert stuff * chore(): revert dev build * chore(): fix merge --- .github/workflows/dev-build.yml | 63 ++------------------------------- .scripts/common.js | 51 ++++++++++++-------------- .scripts/release-dev.js | 21 +++++------ 3 files changed, 34 insertions(+), 101 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index c9ed9dccc7..e6b75e472f 100644 --- a/.github/workflows/dev-build.yml +++ b/.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 }} diff --git a/.scripts/common.js b/.scripts/common.js index 036574f2d7..f43d416397 100644 --- a/.scripts/common.js +++ b/.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, diff --git a/.scripts/release-dev.js b/.scripts/release-dev.js index 1bf90dccf7..a5812596ae 100644 --- a/.scripts/release-dev.js +++ b/.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); From c2603e9cffe7ad57d9e9153ddf2b45b890c82b30 Mon Sep 17 00:00:00 2001 From: Liam DeBeasi Date: Wed, 17 Nov 2021 11:48:52 -0500 Subject: [PATCH 2/2] 5.9.1 --- CHANGELOG.md | 9 +++++++++ angular/package-lock.json | 18 +++++++++--------- angular/package.json | 4 ++-- core/package-lock.json | 4 ++-- core/package.json | 2 +- docs/package.json | 2 +- packages/angular-server/package-lock.json | 18 +++++++++--------- packages/angular-server/package.json | 4 ++-- packages/react-router/package.json | 6 +++--- packages/react/package.json | 4 ++-- packages/vue-router/package-lock.json | 4 ++-- packages/vue-router/package.json | 2 +- packages/vue/package-lock.json | 18 +++++++++--------- packages/vue/package.json | 4 ++-- 14 files changed, 54 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323ab38047..b2a0945243 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/angular/package-lock.json b/angular/package-lock.json index 8a7e44f77b..e5851404e0 100644 --- a/angular/package-lock.json +++ b/angular/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/angular", - "version": "5.9.0", + "version": "5.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular", - "version": "5.9.0", + "version": "5.9.1", "license": "MIT", "dependencies": { - "@ionic/core": "5.8.5", + "@ionic/core": "5.9.0", "tslib": "^1.9.3" }, "devDependencies": { @@ -204,9 +204,9 @@ } }, "node_modules/@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "dependencies": { "@stencil/core": "^2.4.0", "ionicons": "^5.5.3", @@ -5156,9 +5156,9 @@ } }, "@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "requires": { "@stencil/core": "^2.4.0", "ionicons": "^5.5.3", diff --git a/angular/package.json b/angular/package.json index 6a918422aa..59f236224f 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "5.9.0", + "version": "5.9.1", "description": "Angular specific wrappers for @ionic/core", "keywords": [ "ionic", @@ -42,7 +42,7 @@ "validate": "npm i && npm run lint && npm run test && npm run build" }, "dependencies": { - "@ionic/core": "5.9.0", + "@ionic/core": "5.9.1", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/package-lock.json b/core/package-lock.json index a7269441ee..e8843ea98e 100644 --- a/core/package-lock.json +++ b/core/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/core", - "version": "5.9.0", + "version": "5.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/core", - "version": "5.9.0", + "version": "5.9.1", "license": "MIT", "dependencies": { "@stencil/core": "^2.4.0", diff --git a/core/package.json b/core/package.json index d0bb193065..0956c4936d 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "5.9.0", + "version": "5.9.1", "description": "Base components for Ionic", "keywords": [ "ionic", diff --git a/docs/package.json b/docs/package.json index 950d8da330..08aa6ad130 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "5.9.0", + "version": "5.9.1", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/packages/angular-server/package-lock.json b/packages/angular-server/package-lock.json index ec24d2e04a..2c4f29a63e 100644 --- a/packages/angular-server/package-lock.json +++ b/packages/angular-server/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/angular-server", - "version": "5.9.0", + "version": "5.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/angular-server", - "version": "5.9.0", + "version": "5.9.1", "license": "MIT", "devDependencies": { "@angular/animations": "8.2.13", @@ -16,7 +16,7 @@ "@angular/core": "8.2.13", "@angular/platform-browser": "8.2.13", "@angular/platform-server": "8.2.13", - "@ionic/core": "5.8.5", + "@ionic/core": "5.9.0", "ng-packagr": "5.7.1", "tslint": "^5.12.1", "tslint-ionic-rules": "0.0.21", @@ -137,9 +137,9 @@ } }, "node_modules/@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "dev": true, "dependencies": { "@stencil/core": "^2.4.0", @@ -5424,9 +5424,9 @@ } }, "@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "dev": true, "requires": { "@stencil/core": "^2.4.0", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 340f3c08b7..1fa579279b 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "5.9.0", + "version": "5.9.1", "description": "Angular SSR Module for Ionic", "keywords": [ "ionic", @@ -49,7 +49,7 @@ "@angular/core": "8.2.13", "@angular/platform-browser": "8.2.13", "@angular/platform-server": "8.2.13", - "@ionic/core": "5.9.0", + "@ionic/core": "5.9.1", "ng-packagr": "5.7.1", "tslint": "^5.12.1", "tslint-ionic-rules": "0.0.21", diff --git a/packages/react-router/package.json b/packages/react-router/package.json index 19e7f4a5eb..fe1b10ac0a 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "5.9.0", + "version": "5.9.1", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -40,14 +40,14 @@ "tslib": "*" }, "peerDependencies": { - "@ionic/react": "5.8.5", + "@ionic/react": "5.9.1", "react": ">=16.8.6", "react-dom": ">=16.8.6", "react-router": "^5.0.1", "react-router-dom": "^5.0.1" }, "devDependencies": { - "@ionic/react": "5.8.5", + "@ionic/react": "5.9.1", "@rollup/plugin-node-resolve": "^8.1.0", "@testing-library/jest-dom": "^5.11.6", "@testing-library/react": "^11.2.2", diff --git a/packages/react/package.json b/packages/react/package.json index 981d12e3c8..934a4e7ca0 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "5.9.0", + "version": "5.9.1", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -40,7 +40,7 @@ "css/" ], "dependencies": { - "@ionic/core": "5.9.0", + "@ionic/core": "5.9.1", "ionicons": "^5.1.2", "tslib": "*" }, diff --git a/packages/vue-router/package-lock.json b/packages/vue-router/package-lock.json index 8633e68eb8..1b4a957313 100644 --- a/packages/vue-router/package-lock.json +++ b/packages/vue-router/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ionic/vue-router", - "version": "5.9.0", + "version": "5.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue-router", - "version": "5.9.0", + "version": "5.9.1", "license": "MIT", "devDependencies": { "@ionic/vue": "5.4.1", diff --git a/packages/vue-router/package.json b/packages/vue-router/package.json index 758e6c68af..a56f5494d2 100644 --- a/packages/vue-router/package.json +++ b/packages/vue-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue-router", - "version": "5.9.0", + "version": "5.9.1", "description": "Vue Router integration for @ionic/vue", "scripts": { "test.spec": "jest", diff --git a/packages/vue/package-lock.json b/packages/vue/package-lock.json index ec4dd4c864..4e9fe1b65c 100644 --- a/packages/vue/package-lock.json +++ b/packages/vue/package-lock.json @@ -1,15 +1,15 @@ { "name": "@ionic/vue", - "version": "5.9.0", + "version": "5.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@ionic/vue", - "version": "5.9.0", + "version": "5.9.1", "license": "MIT", "dependencies": { - "@ionic/core": "5.8.5", + "@ionic/core": "5.9.0", "ionicons": "^5.1.2" }, "devDependencies": { @@ -53,9 +53,9 @@ } }, "node_modules/@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "dependencies": { "@stencil/core": "^2.4.0", "ionicons": "^5.5.3", @@ -633,9 +633,9 @@ } }, "@ionic/core": { - "version": "5.8.5", - "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.8.5.tgz", - "integrity": "sha512-KUT3kKcON606FBJBZcAZn2c62OfPhVR/LQO260FH3znUmpZbqD2/Zm1LOTCxluiG9H6UIe8TVo9n8BgsKxCygA==", + "version": "5.9.0", + "resolved": "https://registry.npmjs.org/@ionic/core/-/core-5.9.0.tgz", + "integrity": "sha512-0mUnNPFzQK89/ZsuiKb9tQ1rRzILDSeNsp+4ASjf9z8FJuULeTqyDEHU3Pwnje7cLwl8lezGlvNpOXu7Xlz+/w==", "requires": { "@stencil/core": "^2.4.0", "ionicons": "^5.5.3", diff --git a/packages/vue/package.json b/packages/vue/package.json index 9367535bf9..064073a664 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/vue", - "version": "5.9.0", + "version": "5.9.1", "description": "Vue specific wrapper for @ionic/core", "scripts": { "lint": "echo add linter", @@ -59,7 +59,7 @@ "vue-router": "^4.0.0-rc.4" }, "dependencies": { - "@ionic/core": "5.9.0", + "@ionic/core": "5.9.1", "ionicons": "^5.1.2" }, "vetur": {