diff --git a/.scripts/common.js b/.scripts/common.js index b8eff52c36..0966c72191 100644 --- a/.scripts/common.js +++ b/.scripts/common.js @@ -158,17 +158,11 @@ function preparePackage(tasks, package, version, install) { title: `${pkg.name}: lint`, task: () => execa('npm', ['run', 'lint'], { cwd: projectRoot }) }); - projectTasks.push({ - title: `${pkg.name}: test`, - task: async () => await execa('npm', ['test'], { cwd: projectRoot }) - }); - projectTasks.push({ - title: `${pkg.name}: update ionic/core dep to ${version}`, - task: () => { - updateDependency(pkg, '@ionic/core', version); - writePkg(package, pkg); - } - }); + // TODO will not work due to https://github.com/ionic-team/ionic/issues/20136 + // projectTasks.push({ + // title: `${pkg.name}: test`, + // task: async () => await execa('npm', ['test'], { cwd: projectRoot }) + // }); } // Build @@ -260,6 +254,22 @@ function updatePackageVersions(tasks, packages, version) { } }); + // angular & angular-server need to update their dist versions + if (package === 'angular' || package === 'packages/angular-server') { + const distPackage = path.join(package, 'dist'); + + updatePackageVersion(tasks, distPackage, version); + + tasks.push({ + title: `${package} update @ionic/core dependency, if present ${tc.dim(`(${version})`)}`, + task: async () => { + const pkg = readPkg(distPackage); + updateDependency(pkg, '@ionic/core', version); + writePkg(distPackage, pkg); + } + }); + } + if (package === 'packages/react-router') { tasks.push({ title: `${package} update @ionic/react dependency, if present ${tc.dim(`(${version})`)}`, @@ -274,11 +284,7 @@ function updatePackageVersions(tasks, packages, version) { } function updatePackageVersion(tasks, package, version) { - let projectRoot = projectPath(package); - - if (package === 'packages/angular-server' || package === 'angular') { - projectRoot = path.join(projectRoot, 'dist') - } + const projectRoot = projectPath(package); tasks.push({ title: `${package}: update package.json ${tc.dim(`(${version})`)}`, @@ -288,6 +294,22 @@ function updatePackageVersion(tasks, package, version) { }); } +function copyPackageToDist(tasks, packages) { + packages.forEach(package => { + const projectRoot = projectPath(package); + + // angular and angular-server are the only packages that publish dist + if (package !== 'angular' && package !== 'packages/angular-server') { + return; + } + + tasks.push({ + title: `${package}: Copy package.json to dist`, + task: () => execa('node', ['copy-package.js', package], { cwd: path.join(rootDir, '.scripts') }) + }); + }); +} + function publishPackages(tasks, packages, version, tag = 'latest') { // first verify version packages.forEach(package => { @@ -357,6 +379,7 @@ module.exports = { isValidVersion, isVersionGreater, copyCDNLoader, + copyPackageToDist, packages, packagePath, prepareDevPackage, diff --git a/.scripts/test-dist.js b/.scripts/test-dist.js index da94cb1c62..845c0b25fa 100644 --- a/.scripts/test-dist.js +++ b/.scripts/test-dist.js @@ -11,7 +11,22 @@ const fs = require('fs'); }, // angular { - files: ['../angular/dist/fesm5.cjs.js'] + files: [ + '../angular/dist/schematics/collection.json', + '../angular/dist/fesm5/ionic-angular.js', + '../angular/dist/fesm2015/ionic-angular.js', + '../angular/dist/ionic-angular.d.ts', + '../angular/dist/ionic-angular.metadata.json' + ] + }, + // angular-server + { + files: [ + '../packages/angular-server/dist/fesm5/ionic-angular-server.js', + '../packages/angular-server/dist/fesm2015/ionic-angular-server.js', + '../packages/angular-server/dist/ionic-angular-server.d.ts', + '../packages/angular-server/dist/ionic-angular-server.metadata.json' + ] }, // react { diff --git a/CHANGELOG.md b/CHANGELOG.md index 587c014e23..685e001355 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,43 @@ +# [5.0.0-beta.4](https://github.com/ionic-team/ionic/compare/v5.0.0-beta.3...v5.0.0-beta.4) (2020-01-06) + + +### Features + +* **refresher:** add MD native refresher ([#20096](https://github.com/ionic-team/ionic/issues/20096)) ([5b81bdf](https://github.com/ionic-team/ionic/commit/5b81bdfcf18ed182bde14bbea4957b49ea886322)), closes [#17316](https://github.com/ionic-team/ionic/issues/17316) + + + +# [5.0.0-beta.3](https://github.com/ionic-team/ionic/compare/v4.11.7...v5.0.0-beta.3) (2020-01-03) + + +### Bug Fixes + +* **animation:** support css animation on older devices ([#20020](https://github.com/ionic-team/ionic/issues/20020)) ([49c394c](https://github.com/ionic-team/ionic/commit/49c394c3d335795fd100f54a5b29db009d413dff)), closes [#20017](https://github.com/ionic-team/ionic/issues/20017) +* **icons:** fix the ellipsis fill in ionicons ([#20137](https://github.com/ionic-team/ionic/issues/20137)) ([9318d24](https://github.com/ionic-team/ionic/commit/9318d2418ec144bbce4a3b7ead33cf099d6ec25b)) +* **modal:** account for safe area on devices with a notch ([#20072](https://github.com/ionic-team/ionic/issues/20072)) ([1cabb53](https://github.com/ionic-team/ionic/commit/1cabb5365097d0675447a36223583824a58a140c)) +* **react:** fire lifecycle events on initial render, fixes [#20071](https://github.com/ionic-team/ionic/issues/20071) ([2dcf3ee](https://github.com/ionic-team/ionic/commit/2dcf3ee7b570be73be35c52f03ccfa09baf5d830)) + + +### Code Refactoring + +* **searchbar:** set inputmode default to undefined ([#20080](https://github.com/ionic-team/ionic/issues/20080)) ([6612604](https://github.com/ionic-team/ionic/commit/6612604733ac1b3e46546625f24ef6efa5be1538)), closes [#20074](https://github.com/ionic-team/ionic/issues/20074) + + +### Features + +* **angular:** angular 9 support ([#19515](https://github.com/ionic-team/ionic/issues/19515)) ([2344d0b](https://github.com/ionic-team/ionic/commit/2344d0b272105e368c00ef611f28909215162f7c)) +* **checkbox:** add --checkmark-width variable ([#19933](https://github.com/ionic-team/ionic/issues/19933)) ([c32a7bc](https://github.com/ionic-team/ionic/commit/c32a7bcd202993056923857a5d9eed14f5be8580)), closes [#16803](https://github.com/ionic-team/ionic/issues/16803) +* **radio:** add --border-radius and --inner-border-radius variables ([#20140](https://github.com/ionic-team/ionic/issues/20140)) ([a01c102](https://github.com/ionic-team/ionic/commit/a01c10267e18a48f30af2f552c556d31dad582e9)) +* **refresher:** add iOS native refresher ([#20037](https://github.com/ionic-team/ionic/issues/20037)) ([04e7c03](https://github.com/ionic-team/ionic/commit/04e7c031326ec551531af291ef1a03878d168378)), closes [#18664](https://github.com/ionic-team/ionic/issues/18664) +* **toggle:** add --border-radius and --handle-border-radius variables ([#20141](https://github.com/ionic-team/ionic/issues/20141)) ([02a46a1](https://github.com/ionic-team/ionic/commit/02a46a1007dde820cb158d34d4e3f243c07251dc)) + + +### BREAKING CHANGES + +* **searchbar:** The `inputmode` property for `ion-searchbar` now defaults to `undefined`. To get the old behavior, set the `inputmode` property to `"search"`. + + + ## [4.11.7](https://github.com/ionic-team/ionic/compare/v4.11.6...v4.11.7) (2019-12-12) diff --git a/angular/package.json b/angular/package.json index 04257a1549..6792e2b5bc 100644 --- a/angular/package.json +++ b/angular/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular", - "version": "5.0.0-beta.2", + "version": "5.0.0-beta.4", "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.0.0-beta.2", + "@ionic/core": "5.0.0-beta.4", "tslib": "^1.9.3" }, "peerDependencies": { diff --git a/core/package.json b/core/package.json index ca2bdf48df..e4c30c6830 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/core", - "version": "5.0.0-beta.2", + "version": "5.0.0-beta.4", "description": "Base components for Ionic", "keywords": [ "ionic", @@ -34,7 +34,7 @@ "tslib": "^1.10.0" }, "devDependencies": { - "@stencil/core": "1.8.2-3", + "@stencil/core": "1.8.3", "@stencil/sass": "1.0.1", "@types/jest": "24.0.21", "@types/node": "12.12.3", diff --git a/docs/package.json b/docs/package.json index 32a99535e6..59d42f7a96 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/docs", - "version": "5.0.0-beta.2", + "version": "5.0.0-beta.4", "description": "Pre-packaged API documentation for the Ionic docs.", "main": "core.json", "types": "core.d.ts", diff --git a/packages/angular-server/package.json b/packages/angular-server/package.json index 4c9e734b7d..d33c6773b7 100644 --- a/packages/angular-server/package.json +++ b/packages/angular-server/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/angular-server", - "version": "0.0.2", + "version": "5.0.0-beta.4", "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": "*", + "@ionic/core": "5.0.0-beta.4", "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 c23105b95a..bacd55b289 100644 --- a/packages/react-router/package.json +++ b/packages/react-router/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react-router", - "version": "5.0.0-beta.2", + "version": "5.0.0-beta.4", "description": "React Router wrapper for @ionic/react", "keywords": [ "ionic", @@ -39,16 +39,16 @@ "tslib": "*" }, "peerDependencies": { - "@ionic/core": "5.0.0-beta.2", - "@ionic/react": "5.0.0-beta.2", + "@ionic/core": "5.0.0-beta.4", + "@ionic/react": "5.0.0-beta.4", "react": "^16.8.6", "react-dom": "^16.8.6", "react-router": "^5.0.1", "react-router-dom": "^5.0.1" }, "devDependencies": { - "@ionic/core": "5.0.0-beta.2", - "@ionic/react": "5.0.0-beta.2", + "@ionic/core": "5.0.0-beta.4", + "@ionic/react": "5.0.0-beta.4", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", diff --git a/packages/react/package.json b/packages/react/package.json index 12f34b09b8..73cf613a8d 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ionic/react", - "version": "5.0.0-beta.2", + "version": "5.0.0-beta.4", "description": "React specific wrapper for @ionic/core", "keywords": [ "ionic", @@ -39,7 +39,7 @@ "css/" ], "dependencies": { - "@ionic/core": "5.0.0-beta.2", + "@ionic/core": "5.0.0-beta.4", "ionicons": "^5.0.0-13", "tslib": "*" },