Skip to content

Commit c5b9e71

Browse files
authored
Merge pull request #80 from IgniteUI/vkombov/preserve-caret-ranges
fix: preserve caret ranges for shared dev dependencies
2 parents 7802457 + feaf910 commit c5b9e71

7 files changed

Lines changed: 4 additions & 39 deletions

File tree

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ export class GridConfigGenerator implements IConfigGenerator {
9090
### Shared File
9191
The engine creates a `shared.json` file which holds all of the common files path and content, used in every sample application. These files are:
9292
* index.html
93-
* polyfills.ts
9493
* styles.scss
9594
* .angular-cli.json
9695
* main.ts

src/generators/SharedAssetsGenerator.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ export class SharedAssetsGenerator {
3434

3535
private _generateSharedAssets(args: SharedAssetsGeneratorArgs) {
3636
const INDEX_FILE_PATH = path.join(process.cwd(), (this.options.projectDir ?? ""), "src/index.html");
37-
const POLYPFILLS_FILE_PATH = path.join(process.cwd(), (this.options.projectDir ?? ""), "src/polyfills.ts");
3837

3938
let indexFile = fs.readFileSync(INDEX_FILE_PATH, "utf8");
4039
let angularJsonFile = fs.readFileSync(args.angularJsonFilePath, "utf8");
4140
let mainTsFile = fs.readFileSync(MAIN_TS_FILE_PATH, "utf8");
4241
let environmentFile = fs.readFileSync(ENVIRONMENT_FILE_PATH, "utf8");
4342
let environmentProdFile = fs.readFileSync(ENVIRONMENT_PROD_FILE_PATH, "utf8");
4443
let files = new Array<LiveEditingFile>();
45-
let polyfillsFile = fs.readFileSync(POLYPFILLS_FILE_PATH, "utf8");
4644
let tsConfigFile = fs.readFileSync(TS_CONFIG_FILE_PATH, "utf8");
4745
let tsConfigAppFile = fs.readFileSync(TS_APP_CONFIG_FILE_PATH, "utf8");
4846
let stackblitzConfigFile = fs.readFileSync(STACKBLITZ_CONFIG_FILE_PATH, "utf8");
@@ -65,7 +63,6 @@ export class SharedAssetsGenerator {
6563
files.push(new LiveEditingFile(SAMPLE_ENVIRONMENTS_FOLDER + "environment.prod.ts", environmentProdFile));
6664
}
6765
files.push(new LiveEditingFile(SAMPLE_SRC_FOLDER + "index.html", indexFile));
68-
files.push(new LiveEditingFile(SAMPLE_SRC_FOLDER + "polyfills.ts", polyfillsFile));
6966
files.push(new LiveEditingFile(SAMPLE_SRC_FOLDER + args.stylesFileName, args.stylesFileContent));
7067
files.push(new LiveEditingFile("angular.json", angularJsonFile));
7168
files.push(new LiveEditingFile(SAMPLE_SRC_FOLDER + "main.ts", mainTsFile));

src/services/DependencyResolver.ts

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,30 +34,17 @@ const SHARED_DEPENDENCIES = [
3434
"@angular/platform-browser-dynamic",
3535
"@angular/router",
3636
"rxjs",
37-
"zone.js",
3837

3938
"igniteui-angular", // needed for all samples because of styles.scss
40-
"jszip", // dependency for igniteui-angular
41-
42-
// For polyfills
43-
"classlist.js",
44-
"core-js",
45-
"hammerjs",
46-
"@types/hammerjs",
47-
"intl",
48-
"web-animations-js"
39+
"jszip" // dependency for igniteui-angular
4940
];
5041

5142
const DEFAULT_DEPENDENCIES = [
5243
"@angular/animations",
5344
"@angular/forms",
5445
"@angular/router",
55-
"classlist.js",
56-
"hammerjs",
57-
"web-animations-js",
5846
"jszip",
5947
"immediate",
60-
"intl",
6148
"tslib",
6249
"sass"
6350
];
@@ -124,7 +111,7 @@ export class DevDependencyResolver {
124111
for (let key in this._devDependencies) {
125112
if (key in SHARED_DEV_DEPENDENCIES) {
126113
let version = this._devDependencies[key];
127-
result[key] = version.replace("~", "").replace("^", "");
114+
result[key] = version.replace("~", "");
128115
}
129116
}
130117

src/templates/angular.json.template

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
"base": "dist/example-app",
2828
},
2929
"index": "src/index.html",
30-
"polyfills": [
31-
"src/polyfills.ts"
32-
],
3330
"tsConfig": "tsconfig.app.json",
3431
"inlineStyleLanguage": "scss",
3532
"assets": ["src/favicon.ico", "src/assets"],
@@ -93,7 +90,6 @@
9390
"builder": "@angular/build:karma",
9491
"options": {
9592
"main": "src/test.ts",
96-
"polyfills": "src/polyfills.ts",
9793
"tsConfig": "tsconfig.spec.json",
9894
"karmaConfig": "karma.conf.js",
9995
"inlineStyleLanguage": "scss",

src/templates/environment.ts.template

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,3 @@
55
export const environment = {
66
production: false,
77
};
8-
9-
/*
10-
* For easier debugging in development mode, you can import the following file
11-
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
12-
*
13-
* This import should be commented out in production mode because it will have a negative impact
14-
* on performance if an error is thrown.
15-
*/
16-
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

src/templates/package.json.template

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@
2020
"@angular/platform-browser-dynamic": "^21.0.0",
2121
"@angular/router": "^21.0.0",
2222
"@juggle/resize-observer": "^3.3.1",
23-
"@types/hammerjs": "^2.0.39",
2423
"@microsoft/signalr": "^8.0.7",
25-
"core-js": "2.6.2",
26-
"hammerjs": "^2.0.8",
2724
"igniteui-angular": "^21.0.0",
2825
"igniteui-angular-charts": "^20.2.0",
2926
"igniteui-angular-core": "^20.2.0",
@@ -35,12 +32,10 @@
3532
"igniteui-dockmanager": "^1.17.0",
3633
"igniteui-webcomponents": "^6.2.0",
3734
"immediate": "^3.2.3",
38-
"intl": "^1.2.5",
3935
"rxjs": "^7.8.2",
4036
"tailwindcss": "^4.1.10",
4137
"@tailwindcss/postcss": "^4.1.10",
42-
"tslib": "^2.6.1",
43-
"zone.js": "~0.15.0"{dependencies}
38+
"tslib": "^2.6.1"{dependencies}
4439
},
4540
"devDependencies": {
4641
"@angular/build": "^21.0.0",

src/templates/tsconfig.app.json.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"outDir": "./out-tsc/app",
66
"types": []
77
},
8-
"files": ["src/main.ts", "src/polyfills.ts"],
8+
"files": ["src/main.ts"],
99
"include": ["src/**/*.d.ts"]
1010
}

0 commit comments

Comments
 (0)