Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: nx latest and more improvements #12

Merged
merged 29 commits into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6506202
chore: nx migrate latest
NathanWalker Jan 14, 2022
ab268eb
chore: convert to project config
NathanWalker Jan 14, 2022
c126792
chore: nx migrate latest
NathanWalker Feb 19, 2022
32c7b43
feat: migration wip
NathanWalker Feb 19, 2022
f0b681e
feat: migrations wip
NathanWalker Feb 19, 2022
e05c3aa
chore: migration note
NathanWalker Feb 19, 2022
631b9f8
wip: update and spec
edusperoni Feb 19, 2022
452992c
wip: more fixes
edusperoni Feb 19, 2022
b329701
feat: change workspace scripts
edusperoni Feb 20, 2022
5f6b4f5
chore: comments
edusperoni Feb 20, 2022
a143ef5
feat: lint and dependsOn
edusperoni Feb 20, 2022
6b1bd6f
chore: cleanup
edusperoni Feb 22, 2022
8ebec21
fix: optional properties
edusperoni Feb 22, 2022
feef729
fix: add angular correctly
edusperoni Feb 22, 2022
7151c50
test: update 3.0 test
edusperoni Feb 22, 2022
4bca799
feat: include tsconfig.base.json modifications with add-package and a…
NathanWalker Feb 23, 2022
303e53a
fix: guard around no tsconfig or paths
edusperoni Feb 23, 2022
d68cceb
fix: migration handling
NathanWalker Feb 24, 2022
b17234e
feat: ng-packagr migration and fixes
edusperoni Feb 24, 2022
05a545b
feat: add missing lint dependencies
edusperoni Feb 24, 2022
cdd8b9b
fix: final touches
edusperoni Feb 24, 2022
82ffc60
chore: migration handling
NathanWalker Feb 24, 2022
1b8b475
feat: switch to dependsOn
edusperoni Feb 24, 2022
561b7c1
feat: add caching
edusperoni Feb 24, 2022
7a2ede3
feat: migration handling
NathanWalker Feb 24, 2022
47d6b9b
feat: add missing files to generators
edusperoni Feb 25, 2022
2b575c2
chore: Nx 13.8.5 and handle nrw/node executor rename
NathanWalker Mar 8, 2022
98f5bd2
chore: ensure core and types are 8.2
NathanWalker Mar 8, 2022
13ea805
chore: prep versions
NathanWalker Mar 8, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 33 additions & 34 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,35 @@
{
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
"root": true,
"ignorePatterns": ["**/*"],
"plugins": ["@nrwl/nx"],
"overrides": [
{
"files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
"rules": {
"@nrwl/nx/enforce-module-boundaries": [
"error",
{
"enforceBuildableLibDependency": true,
"allow": [],
"depConstraints": [
{
"sourceTag": "*",
"onlyDependOnLibsWithTags": ["*"]
}
]
}
]
}
]
}

},
{
"files": ["*.ts", "*.tsx"],
"extends": ["plugin:@nrwl/nx/typescript"],
"rules": {}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nrwl/nx/javascript"],
"rules": {}
}
]
}
59 changes: 13 additions & 46 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,103 +1,70 @@
# [2.3.0](https://github.com/NativeScript/plugin-tools/compare/2.2.1...2.3.0) (2021-10-10)


### Features

* allow config to set default repo url and author details ([80c38b5](https://github.com/NativeScript/plugin-tools/commit/80c38b58da6101a25aac6e67379eef102caac18f))


- allow config to set default repo url and author details ([80c38b5](https://github.com/NativeScript/plugin-tools/commit/80c38b58da6101a25aac6e67379eef102caac18f))

## [2.2.1](https://github.com/NativeScript/plugin-tools/compare/2.2.0...2.2.1) (2021-09-16)


### Bug Fixes

* migration handling syntax ([d7630ec](https://github.com/NativeScript/plugin-tools/commit/d7630ec2ad55805dddf01bd9ae5953ce0a90d9f8))


- migration handling syntax ([d7630ec](https://github.com/NativeScript/plugin-tools/commit/d7630ec2ad55805dddf01bd9ae5953ce0a90d9f8))

# [2.2.0](https://github.com/NativeScript/plugin-tools/compare/2.1.0...2.2.0) (2021-09-15)


### Bug Fixes

* demo app index for vanilla is now properly updated ([#6](https://github.com/NativeScript/plugin-tools/issues/6)) ([1867989](https://github.com/NativeScript/plugin-tools/commit/18679891a72bfb3f464eaafd3f31265374d31154))
* remove package ([#7](https://github.com/NativeScript/plugin-tools/issues/7)) ([afc17e3](https://github.com/NativeScript/plugin-tools/commit/afc17e331b371a030e7c4e9e360d980b21d7bc58))
* remove-package from demo flavours used ([#9](https://github.com/NativeScript/plugin-tools/issues/9)) ([43e9413](https://github.com/NativeScript/plugin-tools/commit/43e9413c4f5169590b5a5b3a7cab16eb293c0669)), closes [#8](https://github.com/NativeScript/plugin-tools/issues/8)


- demo app index for vanilla is now properly updated ([#6](https://github.com/NativeScript/plugin-tools/issues/6)) ([1867989](https://github.com/NativeScript/plugin-tools/commit/18679891a72bfb3f464eaafd3f31265374d31154))
- remove package ([#7](https://github.com/NativeScript/plugin-tools/issues/7)) ([afc17e3](https://github.com/NativeScript/plugin-tools/commit/afc17e331b371a030e7c4e9e360d980b21d7bc58))
- remove-package from demo flavours used ([#9](https://github.com/NativeScript/plugin-tools/issues/9)) ([43e9413](https://github.com/NativeScript/plugin-tools/commit/43e9413c4f5169590b5a5b3a7cab16eb293c0669)), closes [#8](https://github.com/NativeScript/plugin-tools/issues/8)

# [2.1.0](https://github.com/NativeScript/plugin-tools/compare/2.0.7...2.1.0) (2021-08-11)


### Features

* allow nonscoped packages ([#5](https://github.com/NativeScript/plugin-tools/issues/5)) ([7d8bff8](https://github.com/NativeScript/plugin-tools/commit/7d8bff80dcdd3178cb9e9d913678ab5e40ff86af))


- allow nonscoped packages ([#5](https://github.com/NativeScript/plugin-tools/issues/5)) ([7d8bff8](https://github.com/NativeScript/plugin-tools/commit/7d8bff80dcdd3178cb9e9d913678ab5e40ff86af))

## [2.0.7](https://github.com/NativeScript/plugin-tools/compare/2.0.6...2.0.7) (2021-07-26)


### Bug Fixes

* demo app migration for devDependency updates ([89ffa7b](https://github.com/NativeScript/plugin-tools/commit/89ffa7b11fc3e7f091597b7893656810d0c4780b))


- demo app migration for devDependency updates ([89ffa7b](https://github.com/NativeScript/plugin-tools/commit/89ffa7b11fc3e7f091597b7893656810d0c4780b))

## [2.0.6](https://github.com/NativeScript/plugin-tools/compare/2.0.5...2.0.6) (2021-07-25)


### Bug Fixes

* migration handling when other demo's are not {N} apps ([a6521eb](https://github.com/NativeScript/plugin-tools/commit/a6521ebc1e29ca2f6284aab22ca15b34df9d41b9))


- migration handling when other demo's are not {N} apps ([a6521eb](https://github.com/NativeScript/plugin-tools/commit/a6521ebc1e29ca2f6284aab22ca15b34df9d41b9))

## [2.0.5](https://github.com/NativeScript/plugin-tools/compare/2.0.4...2.0.5) (2021-07-25)


### Bug Fixes

* migration handling when other demo's are present ([1f25314](https://github.com/NativeScript/plugin-tools/commit/1f2531435ba038c1b90f98368aab39a9ef274319))


- migration handling when other demo's are present ([1f25314](https://github.com/NativeScript/plugin-tools/commit/1f2531435ba038c1b90f98368aab39a9ef274319))

## [2.0.4](https://github.com/NativeScript/plugin-tools/compare/2.0.3...2.0.4) (2021-07-24)


### Bug Fixes

* migration when run a 2nd time and demo css had already been handled ([dd82faa](https://github.com/NativeScript/plugin-tools/commit/dd82faaa6dd6fab8c6c3b68c70fb9f3109ab41fc))


- migration when run a 2nd time and demo css had already been handled ([dd82faa](https://github.com/NativeScript/plugin-tools/commit/dd82faaa6dd6fab8c6c3b68c70fb9f3109ab41fc))

## [2.0.3](https://github.com/NativeScript/plugin-tools/compare/2.0.2...2.0.3) (2021-07-24)


### Features

* generators for add-demo + remove-package ([cb3c5c9](https://github.com/NativeScript/plugin-tools/commit/cb3c5c999fea2863dcd5d34a90a4a6e240ef46b1))


- generators for add-demo + remove-package ([cb3c5c9](https://github.com/NativeScript/plugin-tools/commit/cb3c5c999fea2863dcd5d34a90a4a6e240ef46b1))

## [2.0.2](https://github.com/NativeScript/plugin-tools/compare/2.0.0...2.0.2) (2021-07-23)


### Bug Fixes

* ensure package listing is only valid structures ([828bfce](https://github.com/NativeScript/plugin-tools/commit/828bfcea3cdabb2ad3fda7eb7dc9039bea2722fb))


- ensure package listing is only valid structures ([828bfce](https://github.com/NativeScript/plugin-tools/commit/828bfcea3cdabb2ad3fda7eb7dc9039bea2722fb))

# [2.0.0](https://github.com/NativeScript/plugin-tools/compare/1.1.0...2.0.0) (2021-07-22)


### Features

* nx-plugin structure + Nx 12.5.x + webpack5 ([#4](https://github.com/NativeScript/plugin-tools/issues/4)) ([5cd770b](https://github.com/NativeScript/plugin-tools/commit/5cd770be682362fdd0d8bf98c2efcca4cbebafb4))


- nx-plugin structure + Nx 12.5.x + webpack5 ([#4](https://github.com/NativeScript/plugin-tools/issues/4)) ([5cd770b](https://github.com/NativeScript/plugin-tools/commit/5cd770be682362fdd0d8bf98c2efcca4cbebafb4))

# [1.1.0](https://github.com/NativeScript/plugin-tools/compare/1.0.7...1.1.0) (2021-02-21)

Expand Down
16 changes: 16 additions & 0 deletions e2e/plugin-tools-e2e/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"root": "e2e/plugin-tools-e2e",
"projectType": "application",
"sourceRoot": "e2e/plugin-tools-e2e/src",
"targets": {
"e2e": {
"executor": "@nrwl/nx-plugin:e2e",
"options": {
"target": "plugin-tools:build",
"jestConfig": "e2e/plugin-tools-e2e/jest.config.js"
}
}
},
"tags": [],
"implicitDependencies": ["plugin-tools"]
}
34 changes: 7 additions & 27 deletions e2e/plugin-tools-e2e/tests/plugin-tools.spec.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import {
checkFilesExist,
ensureNxProject,
readJson,
runNxCommandAsync,
uniq,
} from '@nrwl/nx-plugin/testing';
import { checkFilesExist, ensureNxProject, readJson, runNxCommandAsync, uniq } from '@nrwl/nx-plugin/testing';
describe('plugin-tools e2e', () => {
it('should create plugin-tools', async () => {
const plugin = uniq('plugin-tools');
ensureNxProject('@nativescript/plugin-tools', 'dist/packages/plugin-tools');
await runNxCommandAsync(
`generate @nativescript/plugin-tools:plugin-tools ${plugin}`
);
await runNxCommandAsync(`generate @nativescript/plugin-tools:plugin-tools ${plugin}`);

const result = await runNxCommandAsync(`build ${plugin}`);
expect(result.stdout).toContain('Executor ran');
Expand All @@ -20,29 +12,17 @@ describe('plugin-tools e2e', () => {
describe('--directory', () => {
it('should create src in the specified directory', async () => {
const plugin = uniq('plugin-tools');
ensureNxProject(
'@nativescript/plugin-tools',
'dist/packages/plugin-tools'
);
await runNxCommandAsync(
`generate @nativescript/plugin-tools:plugin-tools ${plugin} --directory subdir`
);
expect(() =>
checkFilesExist(`libs/subdir/${plugin}/src/index.ts`)
).not.toThrow();
ensureNxProject('@nativescript/plugin-tools', 'dist/packages/plugin-tools');
await runNxCommandAsync(`generate @nativescript/plugin-tools:plugin-tools ${plugin} --directory subdir`);
expect(() => checkFilesExist(`libs/subdir/${plugin}/src/index.ts`)).not.toThrow();
}, 120000);
});

describe('--tags', () => {
it('should add tags to nx.json', async () => {
const plugin = uniq('plugin-tools');
ensureNxProject(
'@nativescript/plugin-tools',
'dist/packages/plugin-tools'
);
await runNxCommandAsync(
`generate @nativescript/plugin-tools:plugin-tools ${plugin} --tags e2etag,e2ePackage`
);
ensureNxProject('@nativescript/plugin-tools', 'dist/packages/plugin-tools');
await runNxCommandAsync(`generate @nativescript/plugin-tools:plugin-tools ${plugin} --tags e2etag,e2ePackage`);
const nxJson = readJson('nx.json');
expect(nxJson.projects[plugin].tags).toEqual(['e2etag', 'e2ePackage']);
}, 120000);
Expand Down
12 changes: 3 additions & 9 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,11 @@
}
]
},
"projects": {
"plugin-tools": {
"tags": []
},
"plugin-tools-e2e": {
"tags": [],
"implicitDependencies": ["plugin-tools"]
}
},
"workspaceLayout": {
"appsDir": "e2e",
"libsDir": "packages"
},
"cli": {
"defaultCollection": "@nrwl/workspace"
}
}
33 changes: 17 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,38 +35,39 @@
"tslib": "^2.0.0"
},
"devDependencies": {
"@nrwl/cli": "12.10.0",
"@nrwl/devkit": "12.10.0",
"@nrwl/eslint-plugin-nx": "12.10.0",
"@nrwl/jest": "12.10.0",
"@nrwl/linter": "12.10.0",
"@nrwl/node": "12.10.0",
"@nrwl/nx-plugin": "12.10.0",
"@nrwl/tao": "12.10.0",
"@nrwl/workspace": "12.10.0",
"@angular-devkit/schematics": "^13.2.4",
"@nrwl/cli": "13.8.5",
"@nrwl/devkit": "13.8.5",
"@nrwl/eslint-plugin-nx": "13.8.5",
"@nrwl/jest": "13.8.5",
"@nrwl/js": "13.8.5",
"@nrwl/linter": "13.8.5",
"@nrwl/node": "13.8.5",
"@nrwl/nx-plugin": "13.8.5",
"@nrwl/tao": "13.8.5",
"@nrwl/workspace": "13.8.5",
"@types/jest": "27.0.2",
"@types/node": "14.14.33",
"@typescript-eslint/eslint-plugin": "4.31.2",
"@typescript-eslint/parser": "4.31.2",
"@typescript-eslint/eslint-plugin": "5.10.2",
"@typescript-eslint/parser": "5.10.2",
"conventional-changelog-cli": "~2.1.0",
"dotenv": "10.0.0",
"eslint": "7.22.0",
"eslint": "8.7.0",
"eslint-config-prettier": "8.1.0",
"github-contributors-list": "~1.2.3",
"husky": "~5.1.3",
"husky": "~7.0.4",
"jest": "27.2.3",
"jsonc-parser": "3.0.0",
"parse-version-string": "^1.0.1",
"prettier": "^2.3.1",
"prettier": "2.5.1",
"ts-jest": "27.0.5",
"ts-node": "~9.1.1",
"tslib": "^2.0.0",
"typescript": "4.3.5"
"typescript": "~4.5.4"
},
"lint-staged": {
"**/*.{js,ts,scss,json,html}": [
"npx prettier --write"
]
}
}

2 changes: 1 addition & 1 deletion packages/plugin-tools/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
## Tooling for NativeScript plugin workspaces
## Tooling for NativeScript plugin workspaces
Loading