fix(angular): fixes sourcemap generation for the code built by ngc

Fixes #387, #382
stalniy · Sep 3, 2020 · 7715263 · 7715263
1 parent b2ad140
commit 7715263
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 26 deletions.
diff --git a/package.json b/package.json
@@ -23,6 +23,7 @@
     "husky": "^4.0.0",
     "lint-staged": "^10.0.10",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "typescript": "~3.8.0"
   },

diff --git a/packages/casl-ability/package.json b/packages/casl-ability/package.json
@@ -68,6 +68,7 @@
     "eslint-plugin-import": "^2.20.2",
     "jest": "^26.0.0",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "semantic-release": "17.1.1",
     "typescript": "~3.8.0"

diff --git a/packages/casl-angular/.eslintrc b/packages/casl-angular/.eslintrc
diff --git a/packages/casl-angular/package.json b/packages/casl-angular/package.json
@@ -5,7 +5,7 @@
   "main": "dist/umd/index.js",
   "module": "dist/es5m/index.js",
   "es2015": "dist/es6/index.js",
-  "typings": "dist/types/public_api.d.ts",
+  "typings": "dist/types/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/stalniy/casl.git"
@@ -20,7 +20,7 @@
     "build.es6": "TARGET=es2015 BUILD=es6 npm run rollup",
     "build.umd": "TARGET=es5 BUILD=umd npm run rollup",
     "build.types": "ngc -p tsconfig.types.json",
-    "rollup": "ngc --target $TARGET --outDir dist/$BUILD/tmp && LIB_MINIFY=false BUILD_TYPES=$BUILD USE_SRC_MAPS=1 rollup -c ../../rollup.config.js -i dist/$BUILD/tmp/index.js -n casl.ng -g @angular/core:ng.core,@casl/ability:casl,tslib:tslib,rxjs:rxjs",
+    "rollup": "ngc -p tsconfig.lib.json --target $TARGET --outDir dist/$BUILD/tmp && LIB_MINIFY=false BUILD_TYPES=$BUILD ES_TRANSFORM=false rollup -c ../../rollup.config.js -i dist/$BUILD/tmp/index.js -n casl.ng -g @angular/core:ng.core,@casl/ability:casl,tslib:tslib,rxjs:rxjs",
     "postrollup": "rm -rf dist/$BUILD/tmp",
     "test": "NODE_ENV=test jest --config ./jest.config.js",
     "lint": "eslint --ext .ts,.js src/ spec/",
@@ -79,6 +79,7 @@
     "jest": "^26.0.0",
     "jest-zone-patch": "0.0.10",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "rxjs": "^6.0.0",
     "semantic-release": "17.1.1",

diff --git a/packages/casl-angular/src/index.ts → packages/casl-angular/src/public.ts b/packages/casl-angular/src/index.ts → packages/casl-angular/src/public.ts
diff --git a/packages/casl-angular/tsconfig.json b/packages/casl-angular/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "inlineSources": true,
     "inlineSourceMap": true,
     "declaration": false,
     "module": "es2015",
@@ -16,15 +17,16 @@
       "dom"
     ]
   },
-  "files": [
-    "src/index.ts"
+  "include": [
+    "src/*",
+    "spec/*"
   ],
   "angularCompilerOptions": {
     "enableIvy": false,
     "skipMetadataEmit": true,
     "skipTemplateCodegen": true,
     "strictInjectionParameters": true,
-    "flatModuleOutFile": "public_api.js",
+    "flatModuleOutFile": "index.js",
     "flatModuleId": "@casl/angular"
   }
-}
+}
diff --git a/packages/casl-angular/tsconfig.lib.json b/packages/casl-angular/tsconfig.lib.json
@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "src/public.ts"
+  ]
+}
diff --git a/packages/casl-angular/tsconfig.types.json b/packages/casl-angular/tsconfig.types.json
@@ -1,15 +1,11 @@
 {
-  "extends": "./tsconfig.json",
+  "extends": "./tsconfig.lib.json",
   "compilerOptions": {
     "emitDeclarationOnly": true,
     "declaration": true,
     "outDir": "dist/types"
   },
   "angularCompilerOptions": {
     "skipMetadataEmit": false
-  },
-  "include": [
-    "src/*",
-    "spec/*"
-  ]
+  }
 }
diff --git a/packages/casl-aurelia/package.json b/packages/casl-aurelia/package.json
@@ -70,6 +70,7 @@
     "eslint-plugin-import": "^2.20.2",
     "jest": "^26.0.0",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "semantic-release": "17.1.1",
     "typescript": "~3.8.0"

diff --git a/packages/casl-mongoose/package.json b/packages/casl-mongoose/package.json
@@ -64,6 +64,7 @@
     "jest": "^26.0.0",
     "mongoose": "^5.0.14",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "semantic-release": "17.1.1",
     "typescript": "~3.8.0"

diff --git a/packages/casl-react/package.json b/packages/casl-react/package.json
@@ -69,6 +69,7 @@
     "react": "^16.3.0",
     "react-test-renderer": "^16.3.0",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "semantic-release": "17.1.1",
     "typescript": "~3.8.0"

diff --git a/packages/casl-vue/package.json b/packages/casl-vue/package.json
@@ -65,6 +65,7 @@
     "eslint-plugin-import": "^2.20.2",
     "jest": "^26.0.0",
     "rollup": "^2.10.9",
+    "rollup-plugin-sourcemaps": "^0.6.2",
     "rollup-plugin-terser": "^7.0.0",
     "semantic-release": "17.1.1",
     "typescript": "~3.8.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/rollup.config.js b/rollup.config.js
@@ -1,6 +1,7 @@
 import babel from '@rollup/plugin-babel';
 import resolve from '@rollup/plugin-node-resolve';
 import { terser } from 'rollup-plugin-terser';
+import sourcemaps from 'rollup-plugin-sourcemaps';
 
 function aggregate(configs, optionsOverrides) {
   let external = [];
@@ -58,15 +59,16 @@ function aggregate(configs, optionsOverrides) {
           mainFields: ['module', 'main', 'browser'],
           extensions: ['.js', '.mjs', '.ts'],
         }),
-        babel({
-          rootMode: 'upward',
-          extensions: ['.js', '.mjs', '.ts'],
-          inputSourceMap: !!process.env.USE_SRC_MAPS,
-          babelHelpers: 'bundled',
-          caller: {
-            output: config.type,
-          }
-        }),
+        process.env.ES_TRANSFORM === 'false'
+          ? sourcemaps()
+          : babel({
+              rootMode: 'upward',
+              extensions: ['.js', '.mjs', '.ts'],
+              babelHelpers: 'bundled',
+              caller: {
+                output: config.type,
+              }
+            }),
         ...(config.plugins || [])
       ]
     }));