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

Update most libraries #559

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
nx 14.
  • Loading branch information
negue committed Sep 7, 2023
commit ee86e4129134cbfe8d41707d25098f53b58c9467
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ Thumbs.db
/src/assets/*.webm
/src/assets/*.mp3
/src/assets/*.mp4
!angular.webpack.cjs
!angular.webpack.cjs
**/settings.json
**/settings.json*.backup
*.log
@@ -71,3 +71,4 @@ documentation.json

# misc
.eslintcache
.angular/cache
2 changes: 1 addition & 1 deletion STACK.md
Original file line number Diff line number Diff line change
@@ -18,6 +18,6 @@

# TypeScript

Instead of using the normal TypeScript Compiler, Meme-Box is using `ttypescript` which enables transforms during compilation.
Instead of using the normal TypeScript Compiler, Meme-Box is using `ts-patch` which enables transforms during compilation.

Currently only `@zerollup/ts-transform-paths` is used. But in future more transform will be added to prevent lots of boilerplate.
55 changes: 36 additions & 19 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "",
"projects": {
"action-variables": {
"projectType": "library",
@@ -102,7 +101,9 @@
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["projects/app-state/**/*.ts"]
"lintFilePatterns": [
"projects/app-state/**/*.ts"
]
}
}
},
@@ -193,7 +194,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": true,
@@ -210,7 +210,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": true,
@@ -227,7 +226,6 @@
"optimization": false,
"outputHashing": "all",
"sourceMap": true,
"extractCss": true,
"namedChunks": true,
"aot": true,
"extractLicenses": false,
@@ -244,7 +242,6 @@
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": true,
"aot": true,
"extractLicenses": true,
@@ -302,8 +299,12 @@
"polyfills": "src/polyfills-test.ts",
"tsConfig": "tsconfig.spec.json",
"scripts": [],
"styles": ["src/styles.scss"],
"assets": ["src/assets"],
"styles": [
"src/styles.scss"
],
"assets": [
"src/assets"
],
"customWebpackConfig": {
"path": "./angular.webpack.cjs",
"target": "electron-renderer"
@@ -391,9 +392,11 @@
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/projects/recipe-core"],
"outputs": [
"coverage/projects/recipe-core"
],
"options": {
"jestConfig": "projects/recipe-core/jest.config.js",
"jestConfig": "projects/recipe-core/jest.config.ts",
"passWithNoTests": true
}
}
@@ -429,9 +432,11 @@
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/projects/recipe-ui"],
"outputs": [
"coverage/projects/recipe-ui"
],
"options": {
"jestConfig": "projects/recipe-ui/jest.config.js",
"jestConfig": "projects/recipe-ui/jest.config.ts",
"passWithNoTests": true
}
}
@@ -444,13 +449,17 @@
"projectType": "application",
"architect": {
"build": {
"builder": "@nrwl/node:build",
"outputs": ["{options.outputPath}"],
"builder": "@nrwl/webpack:webpack",
"outputs": [
"{options.outputPath}"
],
"options": {
"outputPath": "dist/projects/server",
"main": "server/server.ts",
"tsConfig": "server/tsconfig.server.json",
"assets": []
"assets": [],
"target": "node",
"compiler": "tsc"
},
"configurations": {
"production": {
@@ -463,14 +472,20 @@
},
"lint": {
"builder": "@nrwl/linter:eslint",
"outputs": ["{options.outputFile}"],
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": ["server/**/*.ts"]
"lintFilePatterns": [
"server/**/*.ts"
]
}
},
"test": {
"builder": "@nrwl/jest:jest",
"outputs": ["coverage/projects/server"],
"outputs": [
"coverage/projects/server"
],
"options": {
"jestConfig": "projects/server/jest.config.js",
"passWithNoTests": true
@@ -614,7 +629,9 @@
"lint": {
"builder": "@nrwl/linter:eslint",
"options": {
"lintFilePatterns": ["projects/utils/**/*.ts"]
"lintFilePatterns": [
"projects/utils/**/*.ts"
]
}
}
},
4 changes: 2 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ for (const [key, value] of currentPaths) {
moduleNameMapper[key] = `<rootDir>/${value}`;
}

module.exports = {
export default {
moduleNameMapper,
modulePathIgnorePatterns: [
'<rootDir>/dist/',
@@ -18,5 +18,5 @@ module.exports = {
],
rootDir: __dirname,
preset: 'jest-preset-angular',
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
setupFilesAfterEnv: ['<rootDir>/setup-jest.ts']
};
2 changes: 1 addition & 1 deletion jest.preset.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
const nxPreset = require('@nrwl/jest/preset');
const nxPreset = require('@nrwl/jest/preset').default;

module.exports = { ...nxPreset };
41 changes: 20 additions & 21 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
{
"extends": "@nrwl/workspace/presets/npm.json",
"extends": "nx/presets/npm.json",
"npmScope": "memebox",
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/workspace/tasks-runners/default",
"runner": "nx/tasks-runners/default",
"options": {
"cacheableOperations": ["build", "test", "lint", "package", "prepare"]
"cacheableOperations": [
"build",
"test",
"lint",
"package",
"prepare"
],
"parallel": 3
}
}
},
"targetDependencies": {
"prepare": [
{
"target": "prepare",
"projects": "dependencies"
}
],
"package": [
{
"target": "package",
"projects": "dependencies"
}
]
},
"affected": {
"defaultBase": "develop"
},
@@ -31,8 +24,7 @@
"appsDir": "projects"
},
"cli": {
"analytics": false,
"defaultCollection": "@nrwl/angular"
"analytics": false
},
"generators": {
"@schematics/angular:component": {
@@ -52,9 +44,16 @@
"linter": "eslint",
"unitTestRunner": "jest",
"buildable": true,
"style": "scss",
"strict": true
}
},
"defaultProject": "memebox-app"
"defaultProject": "memebox-app",
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
]
}
}
}
Loading