Skip to content

Commit

Permalink
Restructuring angular-mentions project.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose10go committed Nov 4, 2020
1 parent 905c146 commit 1a7d94e
Show file tree
Hide file tree
Showing 66 changed files with 10,502 additions and 16,490 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Update the 'dockerComposeFile' list if you have more compose files or use different names.
// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
"dockerComposeFile": ["..\\docker-compose.yml"],
"dockerComposeFile": ["../docker-compose.yml","docker-compose.yml"],

// The 'service' property is the name of the service for the container that VS Code should
// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
Expand Down
7 changes: 7 additions & 0 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: '3.7'
services:
devenv:
environment:
GITHUB_REGISTRY_PERSONAL_ACCES_TOKEN: ${GITHUB_REGISTRY_PERSONAL_ACCES_TOKEN}
command: /bin/sh -c "while sleep 1000; do :; done"

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ testem.log
.DS_Store
Thumbs.db
tetrainsights-angular-mentions-*.tgz
**/*.env
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
registry=https://npm.pkg.github.com/TetraInsights
@tetrainsights:registry=https://npm.pkg.github.com
//npm.pkg.github.com/:_authToken=${GITHUB_REGISTRY_PERSONAL_ACCES_TOKEN}
6 changes: 3 additions & 3 deletions Dockerfile.Dev
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ EXPOSE 4200

WORKDIR /usr/src/app

COPY ["package.json", "package-lock.json*","./"]
COPY ["package.json", "yarn.lock*","./"]

# install app dependencies...
RUN npm install
RUN npm install -g @angular/cli@9
RUN yarn install
RUN yarn global add @angular/cli@9
128 changes: 74 additions & 54 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,65 @@
"newProjectRoot": "projects",
"projects": {
"angular-mentions": {
"root": "",
"sourceRoot": "src",
"projectType": "library",
"root": "projects/angular-mentions",
"sourceRoot": "projects/angular-mentions/src",
"architect": {
"build": {
"builder": "@angular-devkit/build-ng-packagr:build",
"options": {
"tsConfig": "projects/angular-mentions/tsconfig.lib.json",
"project": "projects/angular-mentions/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/angular-mentions/tsconfig.lib.prod.json"
}
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "projects/angular-mentions/src/test.ts",
"tsConfig": "projects/angular-mentions/tsconfig.spec.json",
"karmaConfig": "projects/angular-mentions/karma.conf.js"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"projects/angular-mentions/tsconfig.lib.json",
"projects/angular-mentions/tsconfig.spec.json"
],
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular-mentions-demo": {
"projectType": "application",
"root": "projects/angular-mentions-demo",
"sourceRoot": "projects/angular-mentions-demo/src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"aot": true,
"outputPath": "dist",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"outputPath": "dist/angular-mentions-demo",
"index": "projects/angular-mentions-demo/src/index.html",
"main": "projects/angular-mentions-demo/src/main.ts",
"polyfills": "projects/angular-mentions-demo/src/polyfills.ts",
"tsConfig": "projects/angular-mentions-demo/tsconfig.app.json",
"assets": [
"src/assets",
"src/favicon.ico"
"projects/angular-mentions-demo/src/assets",
"projects/angular-mentions-demo/src/favicon.ico"
],
"styles": [
"src/styles.css"
"projects/angular-mentions-demo/src/styles.css"
],
"scripts": []
},
Expand Down Expand Up @@ -55,83 +95,63 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "angular-mentions:build"
"browserTarget": "angular-mentions-demo:build"
},
"configurations": {
"production": {
"browserTarget": "angular-mentions:build:production"
"browserTarget": "angular-mentions-demo:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "angular-mentions:build"
"browserTarget": "angular-mentions-demo:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "./karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"main": "projects/angular-mentions-demo/src/test.ts",
"polyfills": "projects/angular-mentions-demo/src/polyfills.ts",
"tsConfig": "projects/angular-mentions-demo/tsconfig.spec.json",
"karmaConfig": "projects/angular-mentions-demo/karma.conf.js",
"scripts": [],
"styles": [
"src/styles.css"
"projects/angular-mentions-demo/src/styles.css"
],
"assets": [
"src/assets",
"src/favicon.ico"
"projects/angular-mentions-demo/src/assets",
"projects/angular-mentions-demo/src/favicon.ico"
]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"src/tsconfig.app.json",
"src/tsconfig.spec.json"
"projects/angular-mentions-demo/tsconfig.app.json",
"projects/angular-mentions-demo/tsconfig.spec.json"
],
"exclude": []
"exclude": [
"**/node_modules/**"
]
}
}
}
},
"angular-mentions-e2e": {
"root": "e2e",
"sourceRoot": "e2e",
"projectType": "application",
"architect": {
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "./protractor.conf.js",
"devServerTarget": "angular-mentions:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"e2e/tsconfig.e2e.json"
],
"exclude": []
"protractorConfig": "projects/angular-mentions-demo/e2e/protractor.conf.js",
"devServerTarget": "angular-mentions-demo:serve"
},
"configurations": {
"production": {
"devServerTarget": "angular-mentions-demo:serve:production"
}
}
}
}
}
},
"defaultProject": "angular-mentions",
"schematics": {
"@schematics/angular:component": {
"inlineTemplate": false,
"skipTests": false,
"prefix": "app",
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
}
}
"defaultProject": "angular-mentions"
}
1 change: 0 additions & 1 deletion e2e/typings.d.ts

This file was deleted.

Loading

0 comments on commit 1a7d94e

Please sign in to comment.