Merge pull request #1747 from blackflux/dev

[Gally]: master <- dev
blackflux · Aug 2, 2023 · 6f8dea3 · 6f8dea3
2 parents 81f1108 + a80fc28
commit 6f8dea3
Show file tree

Hide file tree

Showing 13 changed files with 14 additions and 10 deletions.
diff --git a/src/plugin/tasks/package/snippets/npm-default/merge-shallow.json.mustache b/src/plugin/tasks/package/snippets/npm-default/merge-shallow.json.mustache
@@ -2,7 +2,7 @@
   "scripts": {
     "clean": "rm -rf lib",
 {{#nccEnabled}}
-    "build": "cp -rf ./src ./lib && ncc build -m -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json{{#nccExclude}} && rsync -r node_modules/{{nccExclude}} lib/node_modules{{/nccExclude}}",
+    "build": "cp -rf ./src ./lib && ncc build -m -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json",
     "ncc-analyze": "yarn clean && cp -rf ./src ./lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && ncc build -m -s -o lib && npx source-map-explorer lib/index.js --only-mapped --html source.html && yarn clean",
 {{/nccEnabled}}
 {{^nccEnabled}}

diff --git a/src/plugin/tasks/package/snippets/serverless-react/merge-shallow.json.mustache b/src/plugin/tasks/package/snippets/serverless-react/merge-shallow.json.mustache
@@ -2,7 +2,7 @@
   "scripts": {
     "clean": "rm -rf lib build .webpack",
 {{#nccEnabled}}
-    "build": "ncc build src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/hangler.js{{#nccExclude}} && rsync -r node_modules/{{nccExclude}} lib/node_modules{{/nccExclude}}",
+    "build": "ncc build src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/hangler.js",
     "ncc-analyze": "yarn clean && ncc build -m -s src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && npx source-map-explorer lib/index.js --only-mapped --html source.html && yarn clean",
 {{/nccEnabled}}
 {{^nccEnabled}}

diff --git a/src/plugin/tasks/package/snippets/serverless/merge-shallow.json.mustache b/src/plugin/tasks/package/snippets/serverless/merge-shallow.json.mustache
@@ -2,7 +2,7 @@
   "scripts": {
     "clean": "rm -rf lib",
 {{#nccEnabled}}
-    "build": "ncc build src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/hangler.js{{#nccExclude}} && rsync -r node_modules/{{nccExclude}} lib/node_modules{{/nccExclude}}",
+    "build": "ncc build src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && mv lib/index.js lib/hangler.js",
     "ncc-analyze": "yarn clean && ncc build -m -s src/hangler.js -o lib{{#nccExclude}} -e {{nccExclude}}{{/nccExclude}} && npx source-map-explorer lib/index.js --only-mapped --html source.html && yarn clean",
 {{/nccEnabled}}
 {{^nccEnabled}}

diff --git a/src/plugin/tasks/serverless/snippets/serverless/.base/resolver.yml.mustache b/src/plugin/tasks/serverless/snippets/serverless/.base/resolver.yml.mustache
@@ -20,7 +20,8 @@ provider:
 package:
   patterns:
     - '!**'
-    - 'lib/**'
+    - 'lib/**'{{#nccExclude}}
+    - 'node_modules/{{nccExclude}}'{{/nccExclude}}
 {{/nccEnabled}}
 {{^nccEnabled}}
 package:

diff --git a/test/projects/assorted/@npm-closedsource/package.json b/test/projects/assorted/@npm-closedsource/package.json
@@ -32,7 +32,7 @@
   "keywords": [],
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@npm-opensource-os/package.json b/test/projects/assorted/@npm-opensource-os/package.json
@@ -29,7 +29,7 @@
   ],
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@npm-opensource/package.json b/test/projects/assorted/@npm-opensource/package.json
@@ -33,7 +33,7 @@
   "keywords": [],
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "cp -rf ./src ./lib && ncc build -m -o lib -e nccExclude && mv lib/index.js lib/index.min.js && cp src/index.js lib/index.js && rm lib/package.json",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@sls-closedsource-dynamodb/package.json b/test/projects/assorted/@sls-closedsource-dynamodb/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "ddba": "AWS_REGION=awsregion AWS_ACCESS_KEY_ID=awsAccessKeyId AWS_SECRET_ACCESS_KEY=awsSecretAccessKey DYNAMO_ENDPOINT=http://0.0.0.0:8000 dynamodb-admin",
     "clean": "rm -rf lib",
-    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@sls-closedsource-dynamodb/serverless/.base/resolver.yml b/test/projects/assorted/@sls-closedsource-dynamodb/serverless/.base/resolver.yml
@@ -18,5 +18,6 @@ package:
   patterns:
     - '!**'
     - lib/**
+    - node_modules/nccExclude
 <<<:
   - ${file(^/${opt:stack}.yml), service=projectName}
diff --git a/test/projects/assorted/@sls-closedsource-react/package.json b/test/projects/assorted/@sls-closedsource-react/package.json
@@ -29,7 +29,7 @@
   },
   "scripts": {
     "clean": "rm -rf lib build .webpack",
-    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "yarn run build-clean && c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@sls-closedsource-react/serverless/.base/resolver.yml b/test/projects/assorted/@sls-closedsource-react/serverless/.base/resolver.yml
@@ -18,5 +18,6 @@ package:
   patterns:
     - '!**'
     - lib/**
+    - node_modules/nccExclude
 <<<:
   - ${file(^/${opt:stack}.yml), service=projectName}
diff --git a/test/projects/assorted/@sls-closedsource/package.json b/test/projects/assorted/@sls-closedsource/package.json
@@ -30,7 +30,7 @@
   "keywords": [],
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js && rsync -r node_modules/nccExclude lib/node_modules",
+    "build": "ncc build src/hangler.js -o lib -e nccExclude && mv lib/index.js lib/hangler.js",
     "build-clean": "yarn run clean && yarn run build",
     "test-simple": "c8 mocha --experimental-loader=./test/hot.js \"./test/**/*.spec.js\"",
     "test": "yarn run clean && yarn run gardener && yarn run test-simple",

diff --git a/test/projects/assorted/@sls-closedsource/serverless/.base/resolver.yml b/test/projects/assorted/@sls-closedsource/serverless/.base/resolver.yml
@@ -18,5 +18,6 @@ package:
   patterns:
     - '!**'
     - lib/**
+    - node_modules/nccExclude
 <<<:
   - ${file(^/${opt:stack}.yml), service=projectName}