This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit ebab1a5

committed

chore: merge demo, lib into single angular project

- Also includes boilerplate for datatables v2

1 parent 705f26c commit ebab1a5Copy full SHA for ebab1a5

File tree

45 files changed

+16057

-23083

lines changed

.gitignore
angular.json
demo
lib
package-lock.json
package.json
protractor.config.js
rollup-uglify.conf.js
rollup.conf.js
systemjs.config.js
tsconfig.json

Some content is hidden

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

45 files changed

+16057

-23083

lines changed

`‎.gitignore‎`

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,3 +25,47 @@ _temp`
`25`	`25`	`*.d.ts`
`26`	`26`	`*.metadata.json`
`27`	`27`	`index*.js`
	`28`	`+`
	`29`	`+# See http://help.github.com/ignore-files/ for more about ignoring files.`
	`30`	`+`
	`31`	`+# compiled output`
	`32`	`+/dist`
	`33`	`+/tmp`
	`34`	`+/out-tsc`
	`35`	`+`
	`36`	`+# dependencies`
	`37`	`+/node_modules`
	`38`	`+`
	`39`	`+# IDEs and editors`
	`40`	`+/.idea`
	`41`	`+.project`
	`42`	`+.classpath`
	`43`	`+.c9/`
	`44`	`+*.launch`
	`45`	`+.settings/`
	`46`	`+*.sublime-workspace`
	`47`	`+`
	`48`	`+# IDE - VSCode`
	`49`	`+.vscode/*`
	`50`	`+!.vscode/settings.json`
	`51`	`+!.vscode/tasks.json`
	`52`	`+!.vscode/launch.json`
	`53`	`+!.vscode/extensions.json`
	`54`	`+`
	`55`	`+# misc`
	`56`	`+/.angular/cache`
	`57`	`+/.sass-cache`
	`58`	`+/connect.lock`
	`59`	`+/coverage`
	`60`	`+/libpeerconnection.log`
	`61`	`+npm-debug.log`
	`62`	`+testem.log`
	`63`	`+/typings`
	`64`	`+`
	`65`	`+# e2e`
	`66`	`+/e2e/*.js`
	`67`	`+/e2e/*.map`
	`68`	`+`
	`69`	`+# System Files`
	`70`	`+.DS_Store`
	`71`	`+Thumbs.db`

`‎demo/angular.json‎ renamed to ‎angular.json‎`

Lines changed: 47 additions & 22 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "./node_modules/@angular/cli/lib/config/schema.json",`
`3`	`3`	`"version": 1,`
`4`		`- "newProjectRoot": "projects",`
	`4`	`+ "newProjectRoot": "",`
`5`	`5`	`"projects": {`
`6`	`6`	`"angular-datatables-demo": {`
`7`		`- "root": "",`
	`7`	`+ "root": "demo",`
`8`	`8`	`"sourceRoot": "src",`
`9`	`9`	`"projectType": "application",`
`10`	`10`	`"architect": {`
`11`	`11`	`"build": {`
`12`	`12`	`"builder": "@angular-devkit/build-angular:browser",`
`13`	`13`	`"options": {`
`14`		`- "outputPath": "dist",`
`15`		`- "index": "src/index.html",`
`16`		`- "main": "src/main.ts",`
`17`		`- "tsConfig": "src/tsconfig.app.json",`
	`14`	`+ "outputPath": "dist/demo",`
	`15`	`+ "index": "demo/src/index.html",`
	`16`	`+ "main": "demo/src/main.ts",`
	`17`	`+ "tsConfig": "demo/src/tsconfig.app.json",`
`18`	`18`	`"polyfills": [`
`19`	`19`	`"zone.js"`
`20`	`20`	`],`
`@@ -32,7 +32,7 @@`
`32`	`32`	`"node_modules/datatables.net-select-dt/css/select.dataTables.css",`
`33`	`33`	`"node_modules/materialize-css/dist/css/materialize.css",`
`34`	`34`	`"node_modules/prism-themes/themes/prism-material-dark.css",`
`35`		`- "src/styles.css",`
	`35`	`+ "demo/src/styles.css",`
`36`	`36`	`"node_modules/prismjs/plugins/toolbar/prism-toolbar.css"`
`37`	`37`	`],`
`38`	`38`	`"scripts": [`
`@@ -76,13 +76,7 @@`
`76`	`76`	`"namedChunks": false,`
`77`	`77`	`"extractLicenses": true,`
`78`	`78`	`"vendorChunk": false,`
`79`		`- "buildOptimizer": true,`
`80`		`- "fileReplacements": [`
`81`		`- {`
`82`		`- "replace": "src/environments/environment.ts",`
`83`		`- "with": "src/environments/environment.prod.ts"`
`84`		`- }`
`85`		`- ]`
	`79`	`+ "buildOptimizer": true`
`86`	`80`	`}`
`87`	`81`	`}`
`88`	`82`	`},`
`@@ -149,20 +143,51 @@`
`149`	`143`	`}`
`150`	`144`	`}`
`151`	`145`	`},`
`152`		`- "angular-datatables-demo-e2e": {`
`153`		`- "root": "",`
`154`		`- "sourceRoot": "",`
`155`		`- "projectType": "application",`
	`146`	`+ "angular-datatables": {`
	`147`	`+ "root": "lib",`
	`148`	`+ "sourceRoot": "lib/src",`
	`149`	`+ "projectType": "library",`
	`150`	`+ "prefix": "lib",`
`156`	`151`	`"architect": {`
`157`		`- "e2e": {`
`158`		`- "builder": "@angular-devkit/build-angular:protractor",`
	`152`	`+ "build": {`
	`153`	`+ "builder": "@angular-devkit/build-angular:ng-packagr",`
`159`	`154`	`"options": {`
`160`		`- "protractorConfig": "./protractor.conf.js",`
`161`		`- "devServerTarget": "angular-datatables-demo:serve"`
	`155`	`+ "project": "lib/ng-package.json"`
	`156`	`+ },`
	`157`	`+ "configurations": {`
	`158`	`+ "production": {`
	`159`	`+ "tsConfig": "lib/tsconfig.lib.prod.json"`
	`160`	`+ },`
	`161`	`+ "development": {`
	`162`	`+ "tsConfig": "lib/tsconfig.lib.json"`
	`163`	`+ }`
	`164`	`+ },`
	`165`	`+ "defaultConfiguration": "production"`
	`166`	`+ },`
	`167`	`+ "test": {`
	`168`	`+ "builder": "@angular-devkit/build-angular:karma",`
	`169`	`+ "options": {`
	`170`	`+ "tsConfig": "lib/tsconfig.spec.json",`
	`171`	`+ "karmaConfig": "lib/karma.conf.js",`
	`172`	`+ "polyfills": [`
	`173`	`+ "zone.js",`
	`174`	`+ "zone.js/testing"`
	`175`	`+ ]`
	`176`	`+ }`
	`177`	`+ },`
	`178`	`+ "lint": {`
	`179`	`+ "builder": "@angular-eslint/builder:lint",`
	`180`	`+ "options": {`
	`181`	`+ "eslintConfig": "lib/.eslintrc.json",`
	`182`	`+ "lintFilePatterns": [`
	`183`	`+ "lib/*/.ts",`
	`184`	`+ "lib/*/.html"`
	`185`	`+ ]`
`162`	`186`	`}`
`163`	`187`	`}`
`164`	`188`	`}`
`165`	`189`	`}`
	`190`	`+`
`166`	`191`	`},`
`167`	`192`	`"schematics": {`
`168`	`193`	`"@schematics/angular:component": {`

`‎demo/karma-ci.conf.js‎`

Lines changed: 0 additions & 39 deletions

This file was deleted.

`‎demo/karma.conf.js‎`

Lines changed: 0 additions & 34 deletions

This file was deleted.

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ebab1a5

File tree

45 files changed

Some content is hidden

45 files changed

`‎.gitignore‎`

`‎demo/angular.json‎ renamed to ‎angular.json‎`

`‎demo/karma-ci.conf.js‎`

`‎demo/karma.conf.js‎`

0 commit comments