Skip to content

Commit 70cd8b6

Browse files
imhoffdimhoffd
committed
refactor: merge plugin functionality into base package
(except the proxy plugin)
1 parent e046733 commit 70cd8b6

253 files changed

Lines changed: 2303 additions & 3911 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 6 additions & 19 deletions

‎CONTRIBUTING.md‎

Lines changed: 6 additions & 8 deletions

‎README.md‎

Lines changed: 13 additions & 8 deletions

‎circle.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ machine:
44

55
dependencies:
66
cache_directories:
7-
- packages/cli-plugin-cordova/node_modules
8-
- packages/cli-plugin-ionic-angular/node_modules
9-
- packages/cli-plugin-ionic1/node_modules
10-
- packages/cli-plugin-proxy/node_modules
11-
- packages/cli-utils/node_modules
7+
- packages/@ionic/cli-plugin-proxy/node_modules
8+
- packages/@ionic/cli-utils/node_modules
129
- packages/ionic/node_modules
1310
post:
1411
- npm run bootstrap
@@ -20,7 +17,10 @@ test:
2017
deployment:
2118
pre:
2219
- echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc
23-
npm:
20+
npm-canary:
2421
branch: master
2522
commands:
26-
- npm run publish:ci
23+
- npm run publish:canary -- --yes
24+
npm-testing:
25+
branch: testing
26+
- npm run publish:testing -- --yes

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"lerna": "2.0.0",
33
"version": "independent",
44
"packages": [
5-
"packages/*"
5+
"packages/**"
66
],
77
"changelog": {
88
"repo": "ionic-team/ionic-cli",

‎package.json‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,27 @@
99
"test": "lerna run test",
1010
"build": "lerna run build",
1111
"watch": "lerna run watch --parallel",
12-
"docs": "node ./packages/cli-scripts/docs.js",
12+
"docs": "node ./packages/@ionic/cli-scripts/docs.js",
1313
"publish:canary": "lerna publish --canary --exact --npm-tag=canary --skip-git",
14-
"publish:beta": "lerna publish --exact --npm-tag=beta",
15-
"publish:ci": "npm run publish:canary -- --yes",
14+
"publish:testing": "lerna publish --canary=testing --exact --npm-tag=testing --skip-git",
1615
"publish": "lerna publish --exact --conventional-commits",
1716
"prepush": "npm run lint"
1817
},
1918
"devDependencies": {
2019
"@types/node": "^6.0.85",
21-
"awesome-typescript-loader": "^3.1.3",
2220
"chokidar-cli": "^1.2.0",
2321
"concurrently": "^3.4.0",
2422
"coveralls": "^2.2.0",
25-
"cross-env": "^5.0.1",
23+
"cross-env": "^5.0.4",
2624
"eslint-config-ionic": "0.0.2",
2725
"husky": "^0.14.3",
2826
"jest": "^20.0.4",
2927
"jest-cli": "^20.0.4",
3028
"lerna": "^2.0.0",
3129
"replace": "^0.3.0",
32-
"ts-jest": "^20.0.4",
33-
"tslint": "^5.3.2",
30+
"ts-jest": "^20.0.10",
31+
"tslint": "^5.6.0",
3432
"tslint-ionic-rules": "^0.0.11",
35-
"typescript": "^2.4.2"
33+
"typescript": "^2.5.0-dev.20170807"
3634
}
3735
}

packages/cli-plugin-cordova/.npmrc renamed to packages/@ionic/cli-plugin-proxy/.npmrc

File renamed without changes.

packages/cli-plugin-proxy/CHANGELOG.md renamed to packages/@ionic/cli-plugin-proxy/CHANGELOG.md

packages/cli-plugin-proxy/README.md renamed to packages/@ionic/cli-plugin-proxy/README.md

packages/cli-plugin-proxy/package.json renamed to packages/@ionic/cli-plugin-proxy/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
"types": "./dist/main.d.ts",
99
"scripts": {
1010
"clean": "rm -rf ./dist",
11-
"lint": "tslint --config ../../tslint.js --project tsconfig.json --type-check",
11+
"lint": "tslint --config ../../../tslint.js --project tsconfig.json --type-check",
1212
"build": "npm run clean && npm run build-ts && npm run build-js",
1313
"build-ts": "tsc",
1414
"build-js": "npm run script-prepublish",
1515
"watch": "concurrently -p \"{name} \" -n \"TS,JS\" -c \"cyan.bold,yellow.dim\" \"npm run watch-ts\" \"npm run watch-js\"",
1616
"watch-ts": "tsc -w",
1717
"watch-js": "cross-env-shell IONIC_PREPUBLISH_PLUGIN_VERSION=${npm_package_version}-local \"npm run watch-js-chokidar\"",
1818
"watch-js-chokidar": "chokidar --silent \"dist/index.js\" -c \"npm run build-js\"",
19-
"script-prepublish": "cli-scripts-prepublish cli-plugin-proxy",
19+
"script-prepublish": "cli-scripts-prepublish @ionic/cli-plugin-proxy",
2020
"test": "jest",
21-
"prepublish": "npm run build"
21+
"prepublishOnly": "npm run build"
2222
},
2323
"keywords": [
2424
"ionic",
@@ -51,7 +51,7 @@
5151
"js"
5252
],
5353
"transform": {
54-
".(ts)": "<rootDir>/../../node_modules/ts-jest/preprocessor.js"
54+
".(ts)": "<rootDir>/../../../node_modules/ts-jest/preprocessor.js"
5555
},
5656
"testRegex": "/__tests__/.*\\.(ts|js)$"
5757
},

0 commit comments

Comments
 (0)