lincd-cli 1.1.8 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (97) hide show
  1. package/defaults/app-static/src/index-static.tsx +3 -3
  2. package/defaults/app-with-backend/.env-cmdrc.json +4 -1
  3. package/defaults/app-with-backend/package.json +9 -8
  4. package/defaults/app-with-backend/scripts/storage-config.js +2 -2
  5. package/defaults/app-with-backend/src/package.ts +2 -1
  6. package/defaults/component.tsx +3 -1
  7. package/defaults/package/package.json +2 -2
  8. package/defaults/package/src/index.ts +0 -1
  9. package/defaults/package/src/ontologies/example-ontology.ts +3 -10
  10. package/defaults/package/src/package.ts +3 -11
  11. package/defaults/set-component.tsx +5 -2
  12. package/defaults/shape.ts +2 -2
  13. package/lib/{cjs/cli-methods.js → cli-methods.js} +291 -665
  14. package/lib/cli-methods.js.map +1 -0
  15. package/lib/{esm/cli.js → cli.js} +44 -59
  16. package/lib/cli.js.map +1 -0
  17. package/lib/{cjs/config-grunt.cjs → config-grunt.js} +13 -15
  18. package/lib/config-grunt.js.map +1 -0
  19. package/lib/config-webpack-app.js +367 -0
  20. package/lib/config-webpack-app.js.map +1 -0
  21. package/lib/{esm/config-webpack.js → config-webpack.js} +39 -27
  22. package/lib/config-webpack.js.map +1 -0
  23. package/lib/{cjs/index.js → index.js} +5 -3
  24. package/lib/index.js.map +1 -0
  25. package/lib/{cjs/interfaces.js.map → interfaces.js.map} +1 -1
  26. package/lib/metadata.js +149 -0
  27. package/lib/metadata.js.map +1 -0
  28. package/lib/plugins/check-imports.js.map +1 -0
  29. package/lib/{esm/plugins → plugins}/declaration-plugin.js +8 -9
  30. package/lib/plugins/declaration-plugin.js.map +1 -0
  31. package/lib/{esm/plugins → plugins}/externalise-modules.js +6 -5
  32. package/lib/plugins/externalise-modules.js.map +1 -0
  33. package/lib/plugins/watch-run.js.map +1 -0
  34. package/lib/{cjs/utils.js → utils.js} +18 -23
  35. package/lib/utils.js.map +1 -0
  36. package/package.json +15 -54
  37. package/defaults/app-static/.env-cmdrc.json +0 -17
  38. package/defaults/app-static/package.json +0 -8
  39. package/defaults/package/src/types.d.ts +0 -9
  40. package/defaults/package/tsconfig-cjs.json +0 -8
  41. package/defaults/package/tsconfig-esm.json +0 -9
  42. package/lib/cjs/cli-methods.js.map +0 -1
  43. package/lib/cjs/cli.js +0 -202
  44. package/lib/cjs/cli.js.map +0 -1
  45. package/lib/cjs/config-grunt.cjs.map +0 -1
  46. package/lib/cjs/config-webpack-app.js +0 -353
  47. package/lib/cjs/config-webpack-app.js.map +0 -1
  48. package/lib/cjs/config-webpack.js +0 -436
  49. package/lib/cjs/config-webpack.js.map +0 -1
  50. package/lib/cjs/index.js.map +0 -1
  51. package/lib/cjs/loaders/css-loader.mjs +0 -82
  52. package/lib/cjs/loaders/css-loader.mjs.map +0 -1
  53. package/lib/cjs/loaders/register.js +0 -6
  54. package/lib/cjs/loaders/register.js.map +0 -1
  55. package/lib/cjs/metadata.js +0 -155
  56. package/lib/cjs/metadata.js.map +0 -1
  57. package/lib/cjs/package.json +0 -141
  58. package/lib/cjs/plugins/check-imports.js.map +0 -1
  59. package/lib/cjs/plugins/declaration-plugin.js +0 -275
  60. package/lib/cjs/plugins/declaration-plugin.js.map +0 -1
  61. package/lib/cjs/plugins/externalise-modules.js +0 -190
  62. package/lib/cjs/plugins/externalise-modules.js.map +0 -1
  63. package/lib/cjs/plugins/watch-run.js.map +0 -1
  64. package/lib/cjs/utils.js.map +0 -1
  65. package/lib/esm/cli-methods.js +0 -1966
  66. package/lib/esm/cli-methods.js.map +0 -1
  67. package/lib/esm/cli.js.map +0 -1
  68. package/lib/esm/config-grunt.cjs +0 -270
  69. package/lib/esm/config-grunt.cjs.map +0 -1
  70. package/lib/esm/config-webpack-app.js +0 -326
  71. package/lib/esm/config-webpack-app.js.map +0 -1
  72. package/lib/esm/config-webpack.js.map +0 -1
  73. package/lib/esm/index.js +0 -9
  74. package/lib/esm/index.js.map +0 -1
  75. package/lib/esm/interfaces.js +0 -2
  76. package/lib/esm/interfaces.js.map +0 -1
  77. package/lib/esm/loaders/css-loader.mjs +0 -75
  78. package/lib/esm/loaders/css-loader.mjs.map +0 -1
  79. package/lib/esm/loaders/register.js +0 -4
  80. package/lib/esm/loaders/register.js.map +0 -1
  81. package/lib/esm/metadata.js +0 -155
  82. package/lib/esm/metadata.js.map +0 -1
  83. package/lib/esm/package.json +0 -141
  84. package/lib/esm/plugins/check-imports.js +0 -65
  85. package/lib/esm/plugins/check-imports.js.map +0 -1
  86. package/lib/esm/plugins/declaration-plugin.js.map +0 -1
  87. package/lib/esm/plugins/externalise-modules.js.map +0 -1
  88. package/lib/esm/plugins/watch-run.js +0 -44
  89. package/lib/esm/plugins/watch-run.js.map +0 -1
  90. package/lib/esm/utils.js +0 -479
  91. package/lib/esm/utils.js.map +0 -1
  92. package/tsconfig-cjs.json +0 -9
  93. package/tsconfig-esm.json +0 -10
  94. /package/{expose-grunt.cjs → expose-grunt.js} +0 -0
  95. /package/lib/{cjs/interfaces.js → interfaces.js} +0 -0
  96. /package/lib/{cjs/plugins → plugins}/check-imports.js +0 -0
  97. /package/lib/{cjs/plugins → plugins}/watch-run.js +0 -0
@@ -1,155 +0,0 @@
1
- // import {NamedNode} from 'lincd/models';
2
- // import {GetEnvVars} from 'env-cmd';
3
- // import path from 'path';
4
- // import fs from 'fs-extra';
5
- // import {createNameSpace} from 'lincd/utils/NameSpace';
6
- // import {Prefix} from 'lincd/utils/Prefix';
7
- // import {getPackageJSON} from './utils';
8
- // import {warn} from './cli-methods';
9
- // import {JSONLDWriter} from 'lincd-jsonld/utils/JSONLDWriter';
10
- //
11
- // function getLocalPackagePaths() {
12
- // let packagePaths = [];
13
- //
14
- // //add the APP package itself
15
- // let appPackagePath = process.cwd();
16
- // let appLincdPackagePath = path.join(
17
- // appPackagePath,
18
- // 'frontend',
19
- // 'src',
20
- // 'package.ts',
21
- // );
22
- // if (fs.existsSync(appPackagePath)) {
23
- // let packageJSON = getPackageJSON(appPackagePath);
24
- //
25
- // packagePaths.push([
26
- // packageJSON.name,
27
- // appPackagePath,
28
- // appLincdPackagePath,
29
- // true,
30
- // ]);
31
- // } else {
32
- // console.log('Not a LINCD app');
33
- // }
34
- //
35
- // //NOTE: we could also switch to checking 'workspaces'?
36
- // let packagesFolder = path.join(process.cwd(), 'packages');
37
- // if (fs.existsSync(packagesFolder)) {
38
- // let localPackages = fs.readdirSync(packagesFolder);
39
- // localPackages.forEach((packageFolderName) => {
40
- // packagePaths.push([
41
- // packageFolderName,
42
- // path.join(packagesFolder, packageFolderName),
43
- // path.join(packagesFolder, packageFolderName, 'lib', 'package.js'),
44
- // ]);
45
- // });
46
- // }
47
- // return packagePaths;
48
- // }
49
- //
50
- // export const buildMetadata = async (): Promise<string[]> => {
51
- // // require('@babel/register')({extensions: ['js', '.ts', '.tsx']});
52
- //
53
- // //NOTE: we can not rely on the LincdWebApp shape from lincd-server here, because that would make the initial build of all modules a lot trickier
54
- // //see, CLI needs to be built as one of the first things in order to build other things. So it cannot rely on lincd-server, which relies on 10 other packages
55
- // let app: NamedNode;
56
- //
57
- // //set the URL of the app as the URI of its node
58
- // let envVars: any = await GetEnvVars({
59
- // envFile: {
60
- // filePath: '.env-cmdrc.json',
61
- // },
62
- // });
63
- // if (
64
- // envVars[process.env.NODE_ENV] &&
65
- // envVars[process.env.NODE_ENV].SITE_ROOT
66
- // ) {
67
- // //get the site root of the current environment
68
- // app = NamedNode.getOrCreate(envVars[process.env.NODE_ENV].SITE_ROOT);
69
- // } else {
70
- // warn(
71
- // 'Cannot find environment variable SITE_ROOT. Make sure SITE_ROOT is set (likely in .env-cmdrc.json) for the current environment: ' +
72
- // process.env.NODE_ENV,
73
- // );
74
- // app = NamedNode.create();
75
- // }
76
- //
77
- // let updatedPaths = [];
78
- // var localPackagePaths = getLocalPackagePaths();
79
- //
80
- // //prepare output path
81
- // let metadataFolder = path.join(process.cwd(), 'data', 'metadata');
82
- // await fs.ensureDir(metadataFolder); //{recursive:true} but not needed with fs-extra
83
- //
84
- // for (const [
85
- // packageCodeName,
86
- // packagePath,
87
- // lincdPackagePath,
88
- // isAppPackage,
89
- // ] of localPackagePaths) {
90
- // let errors = false;
91
- // //TODO: check if this resolves, if not, skip it (for initial setup)
92
- // import('lincd-modules/scripts/package-metadata.js').then(
93
- // async (script) => {
94
- // await script
95
- // .getPackageMetadata(packagePath, lincdPackagePath)
96
- // .then(async (response) => {
97
- // if (response.errors.length > 0) {
98
- // // console.log(JSON.stringify(response));
99
- // warn(
100
- // 'Error processing ' +
101
- // packagePath +
102
- // ':\n' +
103
- // response.errors.join('\n'),
104
- // );
105
- // // throw response
106
- // errors = true;
107
- // } else {
108
- // if (!response.packageUri) {
109
- // console.warn(
110
- // 'No package URI from meta data. Not building meta data for this package',
111
- // );
112
- // return;
113
- // }
114
- // let pkgNode = NamedNode.getOrCreate(response.packageUri);
115
- // //connect the packages to the app
116
- // let lincdApp = createNameSpace('http://lincd.org/ont/lincd-app/');
117
- // Prefix.add('lincdApp', 'http://lincd.org/ont/lincd-app/');
118
- // if (isAppPackage) {
119
- // //Note: this needs to match with LincdWebApp.ownPackage accessor;
120
- // app.overwrite(lincdApp('ownPackage'), pkgNode);
121
- // } else {
122
- // //Note: this needs to match with LincdWebApp.packages accessor;
123
- // app.set(lincdApp('maintainsPackage'), pkgNode);
124
- // }
125
- //
126
- // //write this graph to a jsonld file
127
- // let packageMetaData = JSON.stringify(response.result, null, 2);
128
- // let metadataFile = path.join(
129
- // metadataFolder,
130
- // packageCodeName + '.json',
131
- // );
132
- // await fs.writeFile(metadataFile, packageMetaData).then(() => {
133
- // updatedPaths.push(metadataFile);
134
- // });
135
- // }
136
- // });
137
- // },
138
- // );
139
- //
140
- // //enable this when testing if you don't want to continue with building other metadata when an errors occur
141
- // // if (errors) break;
142
- // }
143
- //
144
- // let packageMetaData = await JSONLDWriter.stringify(
145
- // app as any,
146
- // process.env.NODE_ENV === 'development',
147
- // );
148
- // let metadataFile = path.join(metadataFolder, '_app.json');
149
- // await fs.writeFile(metadataFile, packageMetaData).then(() => {
150
- // updatedPaths.push(metadataFile);
151
- // });
152
- //
153
- // return updatedPaths;
154
- // };
155
- //# sourceMappingURL=metadata.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/metadata.ts"],"names":[],"mappings":"AAAA,0CAA0C;AAC1C,sCAAsC;AACtC,2BAA2B;AAC3B,6BAA6B;AAC7B,yDAAyD;AACzD,6CAA6C;AAC7C,0CAA0C;AAC1C,sCAAsC;AACtC,gEAAgE;AAChE,EAAE;AACF,oCAAoC;AACpC,2BAA2B;AAC3B,EAAE;AACF,iCAAiC;AACjC,wCAAwC;AACxC,yCAAyC;AACzC,sBAAsB;AACtB,kBAAkB;AAClB,aAAa;AACb,oBAAoB;AACpB,OAAO;AACP,yCAAyC;AACzC,wDAAwD;AACxD,EAAE;AACF,0BAA0B;AAC1B,0BAA0B;AAC1B,wBAAwB;AACxB,6BAA6B;AAC7B,cAAc;AACd,UAAU;AACV,aAAa;AACb,sCAAsC;AACtC,MAAM;AACN,EAAE;AACF,2DAA2D;AAC3D,+DAA+D;AAC/D,yCAAyC;AACzC,0DAA0D;AAC1D,qDAAqD;AACrD,4BAA4B;AAC5B,6BAA6B;AAC7B,wDAAwD;AACxD,6EAA6E;AAC7E,YAAY;AACZ,UAAU;AACV,MAAM;AACN,yBAAyB;AACzB,IAAI;AACJ,EAAE;AACF,gEAAgE;AAChE,wEAAwE;AACxE,EAAE;AACF,qJAAqJ;AACrJ,iKAAiK;AACjK,wBAAwB;AACxB,EAAE;AACF,oDAAoD;AACpD,0CAA0C;AAC1C,iBAAiB;AACjB,qCAAqC;AACrC,SAAS;AACT,QAAQ;AACR,SAAS;AACT,uCAAuC;AACvC,8CAA8C;AAC9C,QAAQ;AACR,qDAAqD;AACrD,4EAA4E;AAC5E,aAAa;AACb,YAAY;AACZ,6IAA6I;AAC7I,gCAAgC;AAChC,SAAS;AACT,gCAAgC;AAChC,MAAM;AACN,EAAE;AACF,2BAA2B;AAC3B,oDAAoD;AACpD,EAAE;AACF,0BAA0B;AAC1B,uEAAuE;AACvE,wFAAwF;AACxF,EAAE;AACF,iBAAiB;AACjB,uBAAuB;AACvB,mBAAmB;AACnB,wBAAwB;AACxB,oBAAoB;AACpB,8BAA8B;AAC9B,0BAA0B;AAC1B,0EAA0E;AAC1E,gEAAgE;AAChE,4BAA4B;AAC5B,uBAAuB;AACvB,+DAA+D;AAC/D,wCAAwC;AACxC,gDAAgD;AAChD,0DAA0D;AAC1D,sBAAsB;AACtB,wCAAwC;AACxC,kCAAkC;AAClC,4BAA4B;AAC5B,gDAAgD;AAChD,mBAAmB;AACnB,kCAAkC;AAClC,+BAA+B;AAC/B,uBAAuB;AACvB,4CAA4C;AAC5C,gCAAgC;AAChC,8FAA8F;AAC9F,qBAAqB;AACrB,0BAA0B;AAC1B,kBAAkB;AAClB,0EAA0E;AAC1E,kDAAkD;AAClD,mFAAmF;AACnF,2EAA2E;AAC3E,oCAAoC;AACpC,oFAAoF;AACpF,kEAAkE;AAClE,yBAAyB;AACzB,kFAAkF;AAClF,kEAAkE;AAClE,kBAAkB;AAClB,EAAE;AACF,oDAAoD;AACpD,gFAAgF;AAChF,8CAA8C;AAC9C,kCAAkC;AAClC,6CAA6C;AAC7C,mBAAmB;AACnB,+EAA+E;AAC/E,mDAAmD;AACnD,oBAAoB;AACpB,gBAAgB;AAChB,gBAAgB;AAChB,WAAW;AACX,SAAS;AACT,EAAE;AACF,iHAAiH;AACjH,4BAA4B;AAC5B,MAAM;AACN,EAAE;AACF,wDAAwD;AACxD,kBAAkB;AAClB,8CAA8C;AAC9C,OAAO;AACP,+DAA+D;AAC/D,mEAAmE;AACnE,uCAAuC;AACvC,QAAQ;AACR,EAAE;AACF,yBAAyB;AACzB,KAAK"}
@@ -1,141 +0,0 @@
1
- {
2
- "name": "lincd-cli",
3
- "version": "1.1.7",
4
- "description": "Command line tools for the lincd.js library",
5
- "typesVersions": {
6
- "*": {
7
- "*": [
8
- "lib/esm/*"
9
- ]
10
- }
11
- },
12
- "scripts": {
13
- "prepublishOnly": "npm exec build",
14
- "build": "rimraf ./lib && yarn build-esm && yarn build-cjs && yarn dual-package",
15
- "build-cjs": "echo \"compiling CJS\" && yarn tsc -p tsconfig-cjs.json",
16
- "build-esm": "echo \"compiling ESM\" && yarn tsc -p tsconfig-esm.json",
17
- "dual-package": "echo 'adding package.json to each lib folder for dual output support' && yarn tsconfig-to-dual-package ./tsconfig-cjs.json ./tsconfig-esm.json",
18
- "dev": "yarn tsc -p tsconfig-esm.json -w",
19
- "dev-cjs": "yarn tsc -p tsconfig-cjs.json -w",
20
- "_postinstall": "husky install",
21
- "prepack": "yarn build && pinst --disable && yarn version patch",
22
- "postpack": "pinst --enable",
23
- "prettier": "prettier \"src/**/*.{js,jsx,ts,tsx,css,scss}\" --check",
24
- "prettier:fix": "yarn prettier --write",
25
- "format": "yarn prettier:fix && yarn lint:fix"
26
- },
27
- "lint-staged": {
28
- "*.{js,ts,tsx}": [
29
- "prettier --write"
30
- ],
31
- "*.{scss,css}": [
32
- "prettier --write"
33
- ]
34
- },
35
- "keywords": [
36
- "lincd",
37
- "cli",
38
- "build",
39
- "tools"
40
- ],
41
- "repository": "https://github.com:Semantu/lincd.org",
42
- "author": {
43
- "name": "René Verheij",
44
- "url": "https://github.com/flyon",
45
- "email": "rpwverheij@gmail.com"
46
- },
47
- "license": "MPL-2.0",
48
- "bin": {
49
- "grunt": "expose-grunt.cjs",
50
- "lincd": "lib/esm/cli.js",
51
- "lincd-cli": "lib/esm/cli.js"
52
- },
53
- "dependencies": {
54
- "@babel/cli": "^7.23.9",
55
- "@babel/core": "^7.24.0",
56
- "@babel/plugin-proposal-decorators": "^7.24.0",
57
- "@babel/plugin-transform-runtime": "^7.24.0",
58
- "@babel/preset-env": "^7.24.0",
59
- "@babel/preset-react": "^7.23.3",
60
- "@babel/preset-typescript": "^7.23.3",
61
- "@babel/register": "^7.23.7",
62
- "@lodder/grunt-postcss": "^3.1.1",
63
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
64
- "@types/node": "^20.12.7",
65
- "@types/react": "^18.0.17",
66
- "@types/react-dom": "^18.0.6",
67
- "babel-loader": "^9.1.3",
68
- "chalk": "^4.1.2",
69
- "child-process-promise": "^2.2.1",
70
- "colors": "^1.4.0",
71
- "commander": "^11.0.0",
72
- "copy-webpack-plugin": "^12.0.2",
73
- "copyfiles": "^2.4.1",
74
- "create-esm-loader": "^0.2.5",
75
- "css-loader": "^6.10.0",
76
- "css-parse": "^2.0.0",
77
- "depcheck": "^1.4.7",
78
- "env-cmd": "^10.1.0",
79
- "find-nearest-package-json": "^2.0.1",
80
- "fs-extra": "^11.2.0",
81
- "glob": "^10.3.12",
82
- "grunt": "^1.6.1",
83
- "grunt-cli": "^1.4.3",
84
- "grunt-concurrent": "^3.0.0",
85
- "grunt-contrib-clean": "^2.0.1",
86
- "grunt-contrib-copy": "^1.0.0",
87
- "grunt-exec": "^3.0.0",
88
- "grunt-ts": "^6.0.0-beta.22",
89
- "grunt-webpack": "^6.0.0",
90
- "license-info-webpack-plugin": "^3.0.0",
91
- "lincd": "^1.0",
92
- "lincd-jsonld": "~1.0",
93
- "lincd-modules": "~1.0",
94
- "load-grunt-tasks": "^5.1.0",
95
- "mini-css-extract-plugin": "^2.8.1",
96
- "node-hook": "^1.0.0",
97
- "open": "^8.4.0",
98
- "ora": "^8.0.1",
99
- "postcss": "^8.4.35",
100
- "postcss-comment": "^2.0.0",
101
- "postcss-font-magician": "^4.0.0",
102
- "postcss-import": "^16.0.1",
103
- "postcss-loader": "^8.1.1",
104
- "postcss-modules": "^6.0.0",
105
- "postcss-nested": "^6.0.1",
106
- "postcss-preset-env": "^9.5.0",
107
- "postcss-reporter": "^7.1.0",
108
- "postcss-scss": "^4.0.9",
109
- "postcss-strip-inline-comments": "^0.1.5",
110
- "postcss-url": "^10.1.3",
111
- "react-refresh-typescript": "^2.0.9",
112
- "require-extensions": "^0.0.4",
113
- "rimraf": "^5.0.7",
114
- "sass": "^1.71.1",
115
- "sass-loader": "^14.1.1",
116
- "sharp": "^0.33.5",
117
- "source-map-loader": "^5.0.0",
118
- "staged-git-files": "^1.3.0",
119
- "tailwindcss": "^3.4.1",
120
- "terminal-kit": "^3.1.1",
121
- "terser-webpack-plugin": "^5.3.10",
122
- "ts-loader": "^9.5.1",
123
- "tsconfig-paths-webpack-plugin": "^4.1.0",
124
- "tsconfig-to-dual-package": "^1.2.0",
125
- "tsx": "^4.7.2",
126
- "typescript": "^4.8.4",
127
- "typescript-plugin-css-modules": "^5.1.0",
128
- "webpack": "^5.90.3",
129
- "webpack-bundle-analyzer": "^4.10.1",
130
- "webpack-license-plugin": "^4.4.2",
131
- "webpack-typings-for-css": "^0.13.0"
132
- },
133
- "devDependencies": {
134
- "husky": "^9.0.11",
135
- "optimize-css-assets-webpack-plugin": "^6.0.1",
136
- "pinst": "^3.0.0",
137
- "prettier": "^3.2.5"
138
- },
139
- "peerDepencencies": {},
140
- "type": "commonjs"
141
- }
@@ -1 +0,0 @@
1
- {"version":3,"file":"check-imports.js","sourceRoot":"","sources":["../../../src/plugins/check-imports.ts"],"names":[],"mappings":";;AAAA,6BAA6B;AAC7B,MAAM,EAAC,UAAU,EAAC,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAC7C,mDAAmD;AACnD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE7B,mBAAmB;AACnB,oBAAoB;AACpB,kBAAkB;AAClB,cAAc;AACd,wBAAwB;AACxB,SAAS;AACT,OAAO;AACP,KAAK;AACL,IAAI,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC;AAC9B,IAAI;IACF,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC,CAAC;IACnE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACxE,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC;CAC1C;AAAC,OAAO,GAAG,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;CAC9D;AAED,SAAwB,OAAO,CAAC,MAAM;IACpC,MAAM,OAAO,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAEjC,+BAA+B;IAC/B,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;IACnC,sDAAsD;IACtD,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACnC,6CAA6C;IAC7C,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACtC,uFAAuF;IACvF,IAAI,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IAC3C,sBAAsB;IACtB,IAAI,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACrC,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,YAAY,CAAC;IAEjE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACrB,0BAA0B;IAC1B,iCAAiC;IACjC,IAAI;IAEJ,IAAI,aAAa,GACf,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9D,uBAAuB;IACvB,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAChC,8CAA8C;IAC9C,wCAAwC;IACxC,6CAA6C;IAC7C,kCAAkC;IAClC,wDAAwD;IACxD,OAAO;IACP,wEAAwE;IAExE,qEAAqE;IACrE,IACE,aAAa;QACb,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QACxC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAChD;QACA,IAAI,CAAC,SAAS,CACZ,KAAK,CACH,kEAAkE,QAAQ,CAAC,eAAe,CAAC,OAAO;UAChG,YAAY,cAAc,QAAQ,CAAC,eAAe,CAAC,OAAO,GAAG,CAChE,CACF,CAAC;KACH;IACD,gEAAgE;IAChE,0EAA0E;IAC1E,IAAI;IAEJ,yDAAyD;IAEzD,OAAO,MAAM,CAAC;AAChB,CAAC;AAtDD,0BAsDC;AAED,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC"}
@@ -1,275 +0,0 @@
1
- "use strict";
2
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
- if (k2 === undefined) k2 = k;
4
- var desc = Object.getOwnPropertyDescriptor(m, k);
5
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
- desc = { enumerable: true, get: function() { return m[k]; } };
7
- }
8
- Object.defineProperty(o, k2, desc);
9
- }) : (function(o, m, k, k2) {
10
- if (k2 === undefined) k2 = k;
11
- o[k2] = m[k];
12
- }));
13
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
- Object.defineProperty(o, "default", { enumerable: true, value: v });
15
- }) : function(o, v) {
16
- o["default"] = v;
17
- });
18
- var __importStar = (this && this.__importStar) || function (mod) {
19
- if (mod && mod.__esModule) return mod;
20
- var result = {};
21
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
- __setModuleDefault(result, mod);
23
- return result;
24
- };
25
- var __importDefault = (this && this.__importDefault) || function (mod) {
26
- return (mod && mod.__esModule) ? mod : { "default": mod };
27
- };
28
- Object.defineProperty(exports, "__esModule", { value: true });
29
- /// <reference path="colors.d.ts" />
30
- const colors_1 = __importDefault(require("colors"));
31
- const path = __importStar(require("path"));
32
- const webpack_1 = __importDefault(require("webpack"));
33
- const process = __importStar(require("process"));
34
- const fs_1 = __importDefault(require("fs"));
35
- const { Compilation } = webpack_1.default;
36
- class DeclarationPlugin {
37
- constructor(options = {}) {
38
- this.logMessages = true;
39
- this.exportRoot = '/lib';
40
- this.options = options;
41
- this.options['out'] = options.out
42
- ? options.out
43
- : './builds/declarations.d.ts';
44
- this.options['config'] = options.config
45
- ? options.config
46
- : process.cwd() + '/daconfig.js';
47
- //var moduleConfig = this.getModuleConfig();
48
- this.options['root'] = options.root || this.exportRoot; //'/lib'
49
- this.logMessages = options.debug ? options.debug : false;
50
- //load package.json with fs
51
- this.modulePackageInfo = JSON.parse(fs_1.default.readFileSync(process.cwd() + '/package.json', 'utf8'));
52
- // this.modulePackageInfo = await import(process.cwd() + '/package.json');
53
- // this.debug('found package name: '+this.modulePackageInfo.name);
54
- }
55
- // apply(compiler) {
56
- // // Specify the event hook to attach to
57
- // compiler.hooks.emit.tapAsync(
58
- // 'MyExampleWebpackPlugin',
59
- // (compilation, callback) => {
60
- //
61
- // }
62
- apply(compiler) {
63
- this.debug('applying ');
64
- //when the compiler is ready to emit files
65
- // compiler.plugin('emit', (compilation,callback) =>
66
- compiler.hooks.compilation.tap('DeclarationPlugin', (compilation) => {
67
- //NOTE: even though the stage comes from the processAssets hook and not the afterProcessAssets hook
68
- // somehow this only works WITH the stage defined
69
- compilation.hooks.afterProcessAssets.tap({
70
- stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
71
- name: 'DeclarationPlugin',
72
- }, () => {
73
- // this.debug('indexing and removing declaration assets');
74
- //collect all generated declaration files
75
- //and remove them from the assets that will be emitted
76
- //NOTE: at some point we decided to overwrite declaration files between emits because sometimes only one new declaration file is emitted
77
- //this may cause issues when you remove a file during the continuous building process, but better than the other way around for now
78
- if (!this.declarationFiles) {
79
- this.declarationFiles = {};
80
- }
81
- compilation.getAssets().forEach((asset, key) => {
82
- // this.debug('key '+key.toString())
83
- // this.debug('value '+Object.getOwnPropertyNames(asset).join(", "))
84
- // this.debug('asset: ' + asset.name);
85
- if (asset.name.indexOf('.d.ts') !== -1) {
86
- if (this.declarationFiles[asset.name]) {
87
- this.debug('overwriting ' + asset.name);
88
- }
89
- this.declarationFiles[asset.name] = asset;
90
- this.debug('indexed and removed asset: ' + colors_1.default.green(asset.name));
91
- compilation.deleteAsset(asset.name);
92
- }
93
- });
94
- if (Object.keys(this.declarationFiles).length == 0) {
95
- this.debug("Didn't build .d.ts file because no declaration assets were emitted during build process."
96
- .yellow);
97
- this.debug('This is likely because webpack is using cache.'.yellow);
98
- this.debug('In watch mode, declaration assets will be emitted once you change a ts(x) source file'
99
- .yellow);
100
- // this.log('Make sure to run '.yellow + 'tsc'.blue + ' before running webpack'.yellow);
101
- // this.log(
102
- // 'Make sure to test for '.yellow +
103
- // '/(?!.*.d.ts).ts(x?)$/'.blue.bold['underline'] +
104
- // ' in the ts-loader in webpack.config.json'.yellow,
105
- // );
106
- // this.log(('Assets: ' + Object.keys(compilation.assets).toString()).yellow);
107
- // callback();
108
- return;
109
- }
110
- //combine them into one declaration file
111
- var combinedDeclaration = this.generateCombinedDeclaration(this.declarationFiles); //moduleConfig
112
- //and insert that back into the assets
113
- // compilation.assets[this.options.out] = {
114
- // source: function() {
115
- // return combinedDeclaration;
116
- // },
117
- // size: function() {
118
- // return combinedDeclaration.length;
119
- // },
120
- // };
121
- // As suggested by @JonWallsten here: https://github.com/TypeStrong/ts-loader/pull/1251#issuecomment-800032753
122
- compilation.emitAsset(this.options.out, new webpack_1.default.sources.RawSource(combinedDeclaration));
123
- //get meta data from module exports
124
- /*var metaRdfJson = this.generateMetaRdfJson(compilation,moduleConfig);
125
- //and insert that back into the assets as [module_name].meta.json
126
- compilation.assets[this.options.out.replace(".d.ts",".meta.rdf.json")] = {
127
- source: function() {
128
- return metaRdfJson;
129
- },
130
- size: function() {
131
- return metaRdfJson.length;
132
- }
133
- };*/
134
- //}
135
- });
136
- });
137
- }
138
- debug(...msgs) {
139
- msgs.unshift('declarations:');
140
- if (this.logMessages) {
141
- console.log.apply(null, msgs);
142
- }
143
- }
144
- log(...msgs) {
145
- msgs.unshift('declarations:');
146
- console.log.apply(null, msgs);
147
- }
148
- generateCombinedDeclaration(declarationFiles) {
149
- this.debug('generating combined declaration');
150
- var declarations = '';
151
- //this.debug("daCore: using config ",moduleConfig);
152
- //this.debug("Combining these files:"+Object.keys(declarationFiles).toString());
153
- //get current directory that webpack is run from (base of project), and replace backward slashes by forward ones to compare
154
- var basePath = process.cwd().replace(/\\/g, '/') + '/';
155
- this.debug('Base path:', colors_1.default.blue(basePath));
156
- var npmModuleName = this.modulePackageInfo.name;
157
- // let moduleName = npmModuleName.replace(/\@\w+\//, '');
158
- var importMap = {};
159
- for (var declarationFileName in declarationFiles) {
160
- //this.debug("Parsing "+declarationFileName);
161
- var declarationFile = declarationFiles[declarationFileName];
162
- var data = declarationFile.source.source();
163
- if (!data.split) {
164
- console.warn(typeof data, declarationFileName +
165
- ' - cannot split declaration contents. Not a string?');
166
- continue;
167
- }
168
- var lines = data.split('\n');
169
- var i = lines.length;
170
- while (i--) {
171
- var line = lines[i];
172
- //exclude empty lines
173
- var excludeLine = line == '';
174
- //if importing something, or re-exporting something
175
- if (/import ([a-z0-9A-Z_\-\*\{\}\s,]+)/.test(line) ||
176
- /export ([a-z0-9A-Z_-\{\}\s,\*]+) from/.test(line)) {
177
- var fileImports = line.indexOf('"') !== -1
178
- ? line.match(/\"([^\"]+)\"/)
179
- : line.match(/\'([^\']+)\'/);
180
- if (fileImports && fileImports.length > 1) {
181
- var importPath = fileImports[1];
182
- //if it is importing a relative path and it is a new one
183
- if ((importPath.substr(0, 2) == './' ||
184
- importPath.substr(0, 3) == '../') &&
185
- !importMap[importPath]) {
186
- //we will replace it with the local npm module later, calc and save the absolute path for now
187
- //we parse from builds, because now TS-LOADER gives paths relative to its output folder
188
- let parsed = path.parse('./builds/' + declarationFileName);
189
- let fileDirectory = parsed.dir;
190
- var absoluteImportPath = path.resolve(fileDirectory, importPath);
191
- // this.debug('declarationfilename '+declarationFileName);
192
- // this.debug('filedir '+fileDirectory);
193
- this.debug('import ' + colors_1.default.blue(importPath), ' -> ' + colors_1.default.green(absoluteImportPath));
194
- importMap[importPath] = absoluteImportPath;
195
- }
196
- }
197
- }
198
- //exclude re-exports
199
- //excludeLine = excludeLine || (/export ([a-z0-9A-Z_-\{\}\s,\*]+) from/).test(line);
200
- //exclude unnamed local imports like: import "./some.scss" or import "./someFile"t
201
- excludeLine =
202
- excludeLine || /import ["'][a-z0-9A-Z_\-.\/\\]+["']/.test(line);
203
- //if defined, check for excluded references
204
- if (!excludeLine &&
205
- this.excludedReferences &&
206
- line.indexOf('<reference') !== -1) {
207
- excludeLine = this.excludedReferences.some((reference) => line.indexOf(reference) !== -1);
208
- }
209
- if (excludeLine) {
210
- this.debug('Excluding line ' + i + ': ' + line);
211
- lines.splice(i, 1);
212
- }
213
- else {
214
- if (line.indexOf('declare ') !== -1) {
215
- lines[i] = line.replace('declare ', '');
216
- }
217
- //add tab
218
- lines[i] = lines[i];
219
- }
220
- }
221
- //TS Loader now uses paths relative to output dir. so here we remove a single ../ from the path (which is in there because /builds is the output dir and /lib is the relative path of the file)
222
- let fixedDeclarationPath = declarationFileName
223
- .replace(/\\/g, '/')
224
- .replace('../', '')
225
- .replace('.d.ts', '');
226
- var moduleDeclaration = npmModuleName + '/' + fixedDeclarationPath;
227
- //this.debug('basePath:'+basePath);
228
- declarations +=
229
- "declare module '" +
230
- moduleDeclaration +
231
- "' {\n\t" +
232
- lines.join('\n\t') +
233
- '\n}\n\n';
234
- this.debug('Defining module ' +
235
- colors_1.default.yellow(moduleDeclaration) +
236
- ' from ' +
237
- colors_1.default.blue(declarationFileName));
238
- }
239
- for (var relativeImportPath in importMap) {
240
- let absoluteImportPath = importMap[relativeImportPath];
241
- let npmImportModule = npmModuleName +
242
- '/' +
243
- absoluteImportPath
244
- .substr(basePath.length)
245
- .replace('.d.ts', '')
246
- .replace(/\\/g, '/');
247
- this.debug('Replacing ' +
248
- colors_1.default.blue(relativeImportPath) +
249
- ' with ' +
250
- colors_1.default.yellow(npmImportModule));
251
- //wrap in quotes to omit problems with replacing partials and having to fix order of replacements
252
- declarations = declarations.replace(new RegExp('(\'|")' + relativeImportPath + '(\'|")', 'g'), '"' + npmImportModule + '"');
253
- }
254
- let indexModulePath = this.modulePackageInfo.name + this.exportRoot + '/index';
255
- this.debug('Replacing index ' +
256
- colors_1.default.yellow(indexModulePath) +
257
- ' with ' +
258
- colors_1.default.yellow(this.modulePackageInfo.name));
259
- declarations = declarations.replace("'" + indexModulePath + "'", "'" + this.modulePackageInfo.name + "'");
260
- //replace alias
261
- if (this.options.alias) {
262
- for (let aliasKey in this.options.alias) {
263
- //declarations = declarations.replace(aliasKey,this.options.alias[aliasKey]);
264
- this.debug('Replacing alias ' +
265
- aliasKey +
266
- ' with ' +
267
- this.options.alias[aliasKey]);
268
- declarations = declarations.replace(new RegExp(aliasKey, 'g'), this.options.alias[aliasKey]);
269
- }
270
- }
271
- return declarations;
272
- }
273
- }
274
- exports.default = DeclarationPlugin;
275
- //# sourceMappingURL=declaration-plugin.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"declaration-plugin.js","sourceRoot":"","sources":["../../../src/plugins/declaration-plugin.ts"],"names":[],"mappings":"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"}