From 62f4522c1fabebfd700468c399d3df8fb3148659 Mon Sep 17 00:00:00 2001 From: Sibiraj <20282546+Sibiraj-S@users.noreply.github.com> Date: Wed, 7 Feb 2018 15:19:47 +0530 Subject: [PATCH] refactor: update ng-packagr to stable version (#48) --- .travis.yml | 7 ++++ ng-package.json | 5 +-- package-lock.json | 84 ++++++++++++++++++++++++++++++++++++++--------- package.json | 17 +++++----- public_api.ts | 1 - src/public_api.ts | 1 + tsconfig.json | 6 +++- 7 files changed, 94 insertions(+), 27 deletions(-) delete mode 100644 public_api.ts create mode 100644 src/public_api.ts diff --git a/.travis.yml b/.travis.yml index d29cf25d..c42ad3f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,3 +22,10 @@ before_script: script: - npm run test:single-run +jobs: + include: + - stage: lint + script: npm run lint + - stage: test + script: npm run test:single-run + diff --git a/ng-package.json b/ng-package.json index 9f26182b..ad5ee690 100644 --- a/ng-package.json +++ b/ng-package.json @@ -1,8 +1,9 @@ { "$schema": "./node_modules/ng-packagr/ng-package.schema.json", - "dest": "build/", + "workingDirectory": "./.ng_pkg_build", + "dest": "./build/", "lib": { - "entryFile": "public_api.ts", + "entryFile": "./src/public_api.ts", "umdModuleIds": { "codemirror": "./node_modules/codemirror/lib/codemirror" } diff --git a/package-lock.json b/package-lock.json index b1a75923..1ee0397c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ngx-editor", - "version": "3.3.0-rc.3", + "version": "3.3.0-rc.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -2235,6 +2235,12 @@ "integrity": "sha512-BFnaq5ZOGcDN7FlrtBT4xxkgIToalIIxwjxLWVJ8bGTpe1LroqMiqQXdA7ygc7CRvaYS+9zfPGFnJqFSayx+AA==", "dev": true }, + "commenting": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/commenting/-/commenting-1.0.4.tgz", + "integrity": "sha1-0UCvMmNPy97k1xOWk0wfzawUflA=", + "dev": true + }, "commitizen": { "version": "2.9.6", "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-2.9.6.tgz", @@ -3904,9 +3910,9 @@ "dev": true }, "estree-walker": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.1.tgz", - "integrity": "sha512-7HgCgz1axW7w5aOvgOQkoR1RMBkllygJrssU3BvymKQ95lxXYv6Pon17fBRDm9qhkvXZGijOULoSF9ShOk/ZLg==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz", + "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=", "dev": true }, "esutils": { @@ -8646,6 +8652,12 @@ } } }, + "moment": { + "version": "2.18.1", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz", + "integrity": "sha1-w2GT3Tzhwu7SrbfIAtu8d6gbHA8=", + "dev": true + }, "morgan": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.0.tgz", @@ -8778,9 +8790,9 @@ "optional": true }, "ng-packagr": { - "version": "2.0.0-rc.13", - "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-2.0.0-rc.13.tgz", - "integrity": "sha512-xNlkvX1t4BsQHYuTXxhST1hCUBCBR/StdzJy514SoDf0ax1mecyQncT858xGsnT2TOTa0q+WM2EN7mHomKvrrg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ng-packagr/-/ng-packagr-2.0.0.tgz", + "integrity": "sha512-Ej9Pu3Lgb5jycukq++RAScc1uWzOH3Zl4FaxVqGTaUYmV+ct26N0vg2ap65e4Vn7YEgSU4XUq9eLx7nYTlLfpA==", "dev": true, "requires": { "@ngtools/json-schema": "1.1.0", @@ -8799,7 +8811,9 @@ "postcss-url": "7.3.0", "rimraf": "2.6.2", "rollup": "0.55.3", + "rollup-plugin-cleanup": "2.0.0", "rollup-plugin-commonjs": "8.3.0", + "rollup-plugin-license": "0.5.0", "rollup-plugin-node-resolve": "3.0.2", "rxjs": "5.5.6", "sorcery": "0.10.0", @@ -12633,6 +12647,25 @@ "integrity": "sha512-2TgimJ7pk+XfPT0DmAcOqq9qdXlJ04qKyzyLm1WvPS/E6XdXEXyG5u6L8AsjxOaKoEBlYGliPzo99jxwhn2NYQ==", "dev": true }, + "rollup-plugin-cleanup": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-cleanup/-/rollup-plugin-cleanup-2.0.0.tgz", + "integrity": "sha1-hZdzGaO/VHUKnXX7kJx+UfWaLaQ=", + "dev": true, + "requires": { + "acorn": "4.0.13", + "magic-string": "0.22.4", + "rollup-pluginutils": "2.0.1" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } + } + }, "rollup-plugin-commonjs": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.3.0.tgz", @@ -12644,6 +12677,35 @@ "magic-string": "0.22.4", "resolve": "1.5.0", "rollup-pluginutils": "2.0.1" + }, + "dependencies": { + "estree-walker": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.5.1.tgz", + "integrity": "sha512-7HgCgz1axW7w5aOvgOQkoR1RMBkllygJrssU3BvymKQ95lxXYv6Pon17fBRDm9qhkvXZGijOULoSF9ShOk/ZLg==", + "dev": true + } + } + }, + "rollup-plugin-license": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/rollup-plugin-license/-/rollup-plugin-license-0.5.0.tgz", + "integrity": "sha1-XnBzdftY0pV1JToNKOl+QYgmgvc=", + "dev": true, + "requires": { + "commenting": "1.0.4", + "lodash": "4.17.4", + "magic-string": "0.22.4", + "mkdirp": "0.5.1", + "moment": "2.18.1" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } } }, "rollup-plugin-node-resolve": { @@ -12665,14 +12727,6 @@ "requires": { "estree-walker": "0.3.1", "micromatch": "2.3.11" - }, - "dependencies": { - "estree-walker": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.3.1.tgz", - "integrity": "sha1-5rGlHPcpJSTnI3wxLl/mZgwc4ao=", - "dev": true - } } }, "run-async": { diff --git a/package.json b/package.json index ad3711fc..566de1f7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ngx-editor", - "version": "3.3.0-rc.3", + "version": "3.3.0-rc.4", "description": "WYSIWYG Editor for Angular Applications", "license": "MIT", "scripts": { @@ -13,12 +13,12 @@ "ng": "ng", "postbuild": "npm run build:package", "prebuild": "npm run lint", - "precommit": "npm run test:single-run", + "precommit": "npm run lint && npm run test:single-run", "prerelease": "npm run build", "release": "sh ./scripts/release.sh", "start": "ng serve --aot -o --port 5000 --host 0.0.0.0", "test": "ng test", - "test:single-run": "npm run lint && ng test --watch false" + "test:single-run": "ng test --watch false" }, "keywords": [ "angular-editor", @@ -37,11 +37,11 @@ }, "homepage": "https://github.com/Sibiraj-S/ngx-editor", "peerDependencies": { - "@angular/common": "^5.0.0", - "@angular/core": "^5.0.0", - "@angular/forms": "^5.0.0", + "@angular/common": "^5.2.0", + "@angular/core": "^5.2.0", + "@angular/forms": "^5.2.0", "font-awesome": "^4.7.0", - "rxjs": "^5.5.2", + "rxjs": "^5.5.6", "codemirror": "^5.34.0" }, "devDependencies": { @@ -77,10 +77,11 @@ "karma-coverage-istanbul-reporter": "^1.2.1", "karma-jasmine": "~1.1.0", "karma-jasmine-html-reporter": "^0.2.2", - "ng-packagr": "^2.0.0-rc.13", + "ng-packagr": "^2.0.0", "protractor": "~5.1.2", "rxjs": "^5.5.6", "ts-node": "~4.1.0", + "tsickle": "^0.26.0", "tslint": "~5.9.1", "typescript": "~2.5.3", "zone.js": "^0.8.19" diff --git a/public_api.ts b/public_api.ts deleted file mode 100644 index 054f684e..00000000 --- a/public_api.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './src/app/ngx-editor/ngx-editor.module'; \ No newline at end of file diff --git a/src/public_api.ts b/src/public_api.ts new file mode 100644 index 00000000..ce9e4bc1 --- /dev/null +++ b/src/public_api.ts @@ -0,0 +1 @@ +export * from './app/ngx-editor/ngx-editor.module'; diff --git a/tsconfig.json b/tsconfig.json index a6c016bf..13752ca0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -15,5 +15,9 @@ "es2017", "dom" ] - } + }, + "exclude": [ + ".ng_build", + ".ng_pkg_build", + ] }